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';