From 84a1fbd64256af1957e3c2cab4a7e5fe367566ea Mon Sep 17 00:00:00 2001 From: purocean Date: Wed, 1 Sep 2021 22:32:41 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/server/convert.ts | 2 +- src/main/server/index.ts | 2 +- src/renderer/components/ExportPanel.vue | 262 +++++++++++++++++++++++ src/renderer/components/Preview.vue | 56 ++--- src/renderer/components/SettingPanel.vue | 2 +- src/renderer/components/Toast.vue | 2 +- src/renderer/context/document.ts | 8 + src/renderer/context/index.ts | 2 +- src/renderer/context/view.ts | 3 +- src/renderer/plugins/markdown-echarts.ts | 2 +- src/renderer/support/demo.ts | 11 - src/renderer/support/store.ts | 4 + src/renderer/views/Main.vue | 5 +- 13 files changed, 301 insertions(+), 60 deletions(-) create mode 100644 src/renderer/components/ExportPanel.vue diff --git a/src/main/server/convert.ts b/src/main/server/convert.ts index 88248a3c..6417bb8d 100644 --- a/src/main/server/convert.ts +++ b/src/main/server/convert.ts @@ -12,7 +12,7 @@ const convert = async (html: string, type: string) => { const path = os.tmpdir() + `/yn_convert_${new Date().getTime()}.${type}` return new Promise((resolve, reject) => { - const args = ['-f', 'html', '-o', path, '--reference-doc', docxTplPath] + const args = ['--self-contained', '-f', 'html', '-o', path, '--reference-doc', docxTplPath] console.log(binPath, args) const process = spawn(binPath, args) diff --git a/src/main/server/index.ts b/src/main/server/index.ts index 899a2719..e40be624 100644 --- a/src/main/server/index.ts +++ b/src/main/server/index.ts @@ -150,7 +150,7 @@ const convertFile = async (ctx: any, next: any) => { const html = ctx.request.body.html const type = ctx.request.body.type - ctx.type = mime.getType(`file.${type}`) + ctx.set('content-type', 'application/octet-stream') ctx.body = await convert(html, type) } else { await next() diff --git a/src/renderer/components/ExportPanel.vue b/src/renderer/components/ExportPanel.vue new file mode 100644 index 00000000..a7f7ecda --- /dev/null +++ b/src/renderer/components/ExportPanel.vue @@ -0,0 +1,262 @@ +