From d932c1bfba7cc4b7aa82d2451c9e8ea74381de69 Mon Sep 17 00:00:00 2001 From: liyulin <501351981@qq.com> Date: Sat, 6 May 2023 17:33:13 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9Apdf=E6=9C=80=E5=A4=A7=E5=AE=BD?= =?UTF-8?q?=E5=BA=A6=E4=B8=BA=E5=B1=8F=E5=B9=95=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/packages/pdf/package.json | 2 +- core/packages/pdf/src/main.vue | 9 +- core/src/components/DocxDemo.vue | 6 +- core/src/components/ExcelDemo.vue | 5 +- core/src/components/PdfDemo.vue | 5 +- examples/dist/assets/DocxDemo-9d640dc1.css | 1 + examples/dist/assets/DocxDemo-c38c66fb.js | 96 ++++++++++++++ examples/dist/assets/ExcelDemo-5e8b3cbd.js | 99 ++++++++++++++ examples/dist/assets/PdfDemo-16e8034b.js | 1 + .../dist/assets/PreviewWrapper-de766263.js | 1 + examples/dist/assets/index-17d88db8.js | 121 ++++++++++++++++++ examples/dist/index.html | 2 +- 12 files changed, 341 insertions(+), 7 deletions(-) create mode 100644 examples/dist/assets/DocxDemo-9d640dc1.css create mode 100644 examples/dist/assets/DocxDemo-c38c66fb.js create mode 100644 examples/dist/assets/ExcelDemo-5e8b3cbd.js create mode 100644 examples/dist/assets/PdfDemo-16e8034b.js create mode 100644 examples/dist/assets/PreviewWrapper-de766263.js create mode 100644 examples/dist/assets/index-17d88db8.js diff --git a/core/packages/pdf/package.json b/core/packages/pdf/package.json index 99c8f98..6a1e7ff 100644 --- a/core/packages/pdf/package.json +++ b/core/packages/pdf/package.json @@ -1,6 +1,6 @@ { "name": "@vue-office/pdf", - "version": "1.1.1", + "version": "1.1.2", "description": "", "main": "lib/index.js", "files": [ diff --git a/core/packages/pdf/src/main.vue b/core/packages/pdf/src/main.vue index 3122d1c..ec5ef96 100644 --- a/core/packages/pdf/src/main.vue +++ b/core/packages/pdf/src/main.vue @@ -80,8 +80,13 @@ export default defineComponent({ let domHeight = Math.floor(viewport.height); if (props.options.width) { let scale = props.options.width / domWidth; - domWidth = props.options.width; - domHeight = domHeight * scale; + domWidth = Math.floor(props.options.width); + domHeight = Math.floor(domHeight * scale); + } + if(domWidth > document.documentElement.clientWidth){ + let scale = document.documentElement.clientWidth / domWidth; + domWidth = Math.floor(document.documentElement.clientWidth); + domHeight = Math.floor(domHeight * scale); } canvas.style.width = domWidth + 'px'; diff --git a/core/src/components/DocxDemo.vue b/core/src/components/DocxDemo.vue index b3c0b69..fb2d223 100644 --- a/core/src/components/DocxDemo.vue +++ b/core/src/components/DocxDemo.vue @@ -9,13 +9,17 @@ function onError(e){ console.log('出差',e); useLoading.hideLoading(); } + +const defaultSrc = location.origin + + (location.pathname + '/').replace('//', '/') + + 'static/test-files/test.docx';