@toolspack/ttd-pdfjs 0.0.5 → 0.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toolspack/ttd-pdfjs",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "private": false,
   "main": "lib/ttd-pdfjs.umd.min.js",
   "scripts": {
@@ -13,7 +13,7 @@
     "babel-cli": "^6.26.0",
     "babel-laoder": "0.0.1-security",
     "babel-polyfill": "^6.26.0",
-    "core-js": "^3.6.5",
+    "core-js": "^3.34.0",
     "element-ui": "^2.15.14",
     "less": "^3.8.1",
     "less-loader": "^4.1.0",

package/src/App.vue

@@ -55,7 +55,7 @@ export default {
     },
     handelProgress(event, file, fileList) {
       this.progressCurrent = event.percent
-      console.log('progress', event, file, fileList)
+      // console.log('progress', event, file, fileList)
     },
     tips(words = []) {
       if (Array.isArray(words) && words.length > 0) {
@@ -77,6 +77,7 @@ export default {
         //   url: file.url,
         //   fileMD5: file.fileMD5
         // }
+        console.log('upload: ', list[0])
         this.url = list[0].url
       } else {
         console.log(msg || '上传失败!')

package/src/packages/pdfjs/PdfView216.vue

@@ -26,22 +26,45 @@
 </template>
 <script>
 
+import { Message } from 'element-ui';
 import SwitchPage from './SwitchPage.vue'
 
+function getChromeVersion() {
+  const arr = navigator.userAgent.split(' ');
+  let chromeVersion = '';
+  for (let i = 0; i < arr.length; i++) {
+    if (/chrome/i.test(arr[i])) chromeVersion = arr[i]
+  }
+  if (chromeVersion) {
+    return Number(chromeVersion.split('/')[1].split('.')[0]);
+  }
+  return false;
+}
+let version = ''
+if (getChromeVersion()) {
+  version = getChromeVersion();
+  if (version < 98) {
+    Message({
+      message: `您使用的谷歌浏览器版本过低【version:${version}】，为了更好地体验请将浏览器升级到最新版本！`,
+      type: 'error',
+      duration: 3000,
+    })
+  }
+}
+
+// const PDFJS = require('pdfjs-dist/legacy/build/pdf.js')
 const PDFJS = require('pdfjs-dist')
 
 const defautScale = 1.0
 
-PDFJS.GlobalWorkerOptions.workerSrc = require('pdfjs-dist/legacy/build/pdf.worker.min.js')
+// PDFJS.GlobalWorkerOptions.workerSrc = require('pdfjs-dist/legacy/build/pdf.worker.min.js')
+PDFJS.GlobalWorkerOptions.workerSrc = require('pdfjs-dist/build/pdf.worker.min.js')
 // https://unpkg.com/pdfjs-dist@2.16.105/cmaps/
+// const cMapUrl = 'https://cdn.jsdelivr.net/npm/pdfjs-dist@3.11.174/cmaps/'
 // 使用代理的cmaps，会导致加载很慢，改用本地
 
 const cMapUrl = 'https://wsp.totodi.com/staticfiles_web/web/pdfjs/cmaps/'
 
-// const cMapUrl = 'https://cdn.jsdelivr.net/npm/pdfjs-dist@3.11.174/cmaps/'
-
-// const cMapUrl = 'https://petx.totodi.com/jz/pdfjs/cmaps'
-
 export default {
   components: { SwitchPage },
   props: {
@@ -133,7 +156,7 @@ export default {
           canvasContext: canvas.getContext('2d'),
           viewport,
         }
-        const renderTask = page.render(renderContext)
+        const renderTask = await page.render(renderContext)
 
         // Wait for rendering to finish
         await renderTask.promise
@@ -176,12 +199,13 @@ export default {
     },
     closepdf() {
       // 关闭PDF
-      console.log('closepdf - begin')
       if (this.pdfDoc) {
         if (this.viewport) {
           const { canvas } = this.$refs
-          const cxt = canvas.getContext('2d')
-          cxt.clearRect(0, 0, this.viewport.width, this.viewport.height);
+          if (canvas) {
+            const cxt = canvas.getContext('2d')
+            cxt.clearRect(0, 0, this.viewport.width, this.viewport.height);
+          }
         }
         this.viewport = null
         this.pdfDoc.destroy();
@@ -212,7 +236,6 @@ export default {
       console.log('----PdfView---', url)
       let pdfDoc_
       try {
-        console.log('888--')
         // const pdfData = await fetch(
         //   new URL(url, window.location).href,
         // );
@@ -224,7 +247,6 @@ export default {
           cMapPacked: true,
         }).promise
       } catch (error) {
-        console.log('999999--')
         console.error(error)
 
         const pdfData = await fetch(
@@ -239,13 +261,11 @@ export default {
       // 初始化pdf
       if (this.pdfDoc) {
         console.log('pdfDocument is ready  destroy,,')
-        this.closepdf();
+        await this.closepdf();
         this.pdfDoc = null
-        console.log('pdfDocument is  destroy')
       }
       this.pdfDoc = pdfDoc_
       this.page_count = pdfDoc_.numPages
-      console.log('this.page_count', this.page_count)
       this.$emit('numPages', pdfDoc_.numPages)
       this.renderPage(this.pageNum)
       this.emitPage(this.pageNum)
@@ -286,9 +306,7 @@ export default {
             this.initPage = true
             this.loadUrl(val)
             if (this.pdfDoc) {
-              console.log('wtach 3333')
               this.closepdf();
-              console.log('wtach 444')
             }
           }
           if (this.showPages) {