diff --git a/core/package.json b/core/package.json index 0ae7a38..1b1365c 100644 --- a/core/package.json +++ b/core/package.json @@ -7,7 +7,8 @@ "build": "node script/bak-vue.js && vite build", "lib": "node script/bak-vue.js bak && lerna run build", "lib:js-excel": "node script/bak-vue.js bak && lerna run build --scope @js-preview/excel", - "lib:vue-excel": "node script/bak-vue.js bak && lerna run build --scope @vue-office/excel" + "lib:vue-excel": "node script/bak-vue.js bak && lerna run build --scope @vue-office/excel", + "lib:vue-pdf": "node script/bak-vue.js bak && lerna run build --scope @vue-office/pdf" }, "dependencies": { "@babel/preset-env": "^7.22.5", diff --git a/core/packages/vue-excel/package.json b/core/packages/vue-excel/package.json index c289d0e..215f703 100644 --- a/core/packages/vue-excel/package.json +++ b/core/packages/vue-excel/package.json @@ -1,6 +1,6 @@ { "name": "@vue-office/excel", - "version": "1.2.5", + "version": "1.2.7", "description": "", "main": "lib/index.js", "files": [ diff --git a/core/packages/vue-excel/src/main.vue b/core/packages/vue-excel/src/main.vue index 652fe6c..4fd032f 100644 --- a/core/packages/vue-excel/src/main.vue +++ b/core/packages/vue-excel/src/main.vue @@ -63,7 +63,7 @@ export default defineComponent({ _worksheets:[] }; clearCache(); - xs.loadData({}); + xs && xs.loadData({}); emit('error', e); }); } @@ -76,7 +76,7 @@ export default defineComponent({ observer.observe(rootRef.value, observerConfig); observerCallback(rootRef); - window.xs = xs = new Spreadsheet(rootRef.value, { + xs = new Spreadsheet(rootRef.value, { mode: 'read', showToolbar: false, showContextmenu: props.options.showContextmenu || false, diff --git a/core/packages/vue-pdf/package.json b/core/packages/vue-pdf/package.json index 304decf..5a70182 100644 --- a/core/packages/vue-pdf/package.json +++ b/core/packages/vue-pdf/package.json @@ -1,6 +1,6 @@ { "name": "@vue-office/pdf", - "version": "1.2.0", + "version": "1.2.6", "description": "", "main": "lib/index.js", "files": [ diff --git a/core/packages/vue-pdf/src/main.vue b/core/packages/vue-pdf/src/main.vue index 0d8cad6..5a41b9f 100644 --- a/core/packages/vue-pdf/src/main.vue +++ b/core/packages/vue-pdf/src/main.vue @@ -34,7 +34,11 @@ export default defineComponent({ function installPdfScript() { return loadScript(pdfJsLibSrc).then(() => { - window.pdfjsLib.GlobalWorkerOptions.workerSrc = PdfJsWorkerSrc; + if(window.pdfjsLib){ + window.pdfjsLib.GlobalWorkerOptions.workerSrc = PdfJsWorkerSrc; + }else{ + return Promise.reject('window.pdfjsLib未找到'); + } }); } @@ -119,12 +123,16 @@ export default defineComponent({ onMounted(() => { if (props.src) { - checkPdfLib().then(init); + checkPdfLib().then(init).catch(e=>{ + console.warn(e); + }); } }); watch(() => props.src, () => { - checkPdfLib().then(init); + checkPdfLib().then(init).catch(e=>{ + console.warn(e); + }); }); function download(fileName){ pdfDocument && pdfDocument._transport && pdfDocument._transport.getData().then(fileData=>{