askbot-dragon 1.3.22 → 1.3.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "askbot-dragon",
-  "version": "1.3.22",
+  "version": "1.3.23",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
@@ -15,7 +15,6 @@
     "install": "^0.13.0",
     "jquery": "^3.5.1",
     "lodash": "^4.17.21",
-    "pdfjs-dist": "^3.5.141",
     "uuid": "^8.3.2",
     "v-viewer": "^1.6.4",
     "vant": "^2.12.51",

package/public/index.html

@@ -27,10 +27,17 @@
     <link rel="stylesheet" href="https://static.guoranbot.com/vant/2.12/lib/index.css" /> -->
     
     <!-- pdf.js -->
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/pdf.js/3.5.141/pdf.min.js" integrity="sha512-BagCUdQjQ2Ncd42n5GGuXQn1qwkHL2jCSkxN5+ot9076d5wAI8bcciSooQaI3OG3YLj6L97dKAFaRvhSXVO0/Q==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+    <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/pdf.js/3.5.141/pdf.min.js" integrity="sha512-BagCUdQjQ2Ncd42n5GGuXQn1qwkHL2jCSkxN5+ot9076d5wAI8bcciSooQaI3OG3YLj6L97dKAFaRvhSXVO0/Q==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/pdf.js/3.5.141/pdf.worker.min.js" integrity="sha512-6UHd2tcWIvg5hIYHXb3lnNO61tWfriGen6KddwGYTSUUazWGYESTHDDxJFEQkCy1cSL//yXKc1gcL+51/DTLFQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/pdf.js/3.5.141/pdf_viewer.min.js" integrity="sha512-tYEGuMBQkCfSlBKJ3dNgS06wbb/MNE6nO2poZ1Y5brix8NajGcDcfEvuL38wJDOTkq0j5ojASNmrzv/8/wgGHQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/pdf.js/3.5.141/pdf_viewer.min.css" integrity="sha512-Jf9DLkegLgARLR151csVkPvcVt4cOUhslrSZwiTAe9mqFL/BbYRDmxCOioCtbHifEgjsBFbrVhOMQ3mYPDLrqQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/pdf.js/3.5.141/pdf_viewer.min.css" integrity="sha512-Jf9DLkegLgARLR151csVkPvcVt4cOUhslrSZwiTAe9mqFL/BbYRDmxCOioCtbHifEgjsBFbrVhOMQ3mYPDLrqQ==" crossorigin="anonymous" referrerpolicy="no-referrer" /> -->
+    
+    
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/pdf.js/2.1.266/pdf.min.js" integrity="sha512-1VjCQ9oENTPqqDCs6xQAk6ETB/jbCPvaOPI2z3Q+bWxTudBP7aTJZI3eB+mSbVvth0W2LQL1jePGkAWa79zr5Q==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/pdf.js/2.1.266/pdf.worker.min.js" integrity="sha512-14hvtl/LxmtX9F2tsqmOUveDlKql0bm7lR5ua+J+ddLuhoXCrOfG8aD/WJejCtLLvnjcEhX/XCuOyoTZv4Xq4A==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/pdf.js/2.1.266/pdf_viewer.js" integrity="sha512-/Kuwn901frjpfp2NMgB9S/LEtm+ilDzwVy/iS8MlY0BeIwkvtjGTxnjY8u+fn8QyDxS23OLJ+M2g++W/zsb0nw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/pdf.js/2.1.266/pdf_viewer.css" integrity="sha512-0LYOXoVuJYymEk9nBWqkOCflK2quQSJHaKavRoiaaq7LFM0ThLErV8uqE9vBuXAliN+8qbymsx0u5C9B/pHn7g==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+    
     <style>
       *{
         margin: 0;
@@ -45,4 +52,7 @@
     <div id="app"></div>
     <!-- built files will be auto injected -->
   </body>
+  <script>
+    console.log(window);
+  </script>
 </html>

package/src/components/pdfPosition.vue

@@ -5,12 +5,18 @@
 
 <script>
 import _ from 'lodash'
-import * as pdfjsLib from 'pdfjs-dist'
-pdfjsLib.GlobalWorkerOptions.workerSrc = 'pdfjs-dist/build/pdf.worker';
-import { TextLayerBuilder }  from "pdfjs-dist/web/pdf_viewer";
+// import * as pdfjsLib from 'pdfjs-dist'
+// pdfjsLib.GlobalWorkerOptions.workerSrc = 'pdfjs-dist/build/pdf.worker';
+// import { TextLayerBuilder }  from "pdfjs-dist/web/pdf_viewer";
 // EventBus pdf_viewer 支持绑定自定义事件，一版不做
-import 'pdfjs-dist/web/pdf_viewer.css'
+// import 'pdfjs-dist/web/pdf_viewer.css'
 
+const pdfjsLib = window['pdfjs-dist']
+if(pdfjsLib) {
+    pdfjsLib.GlobalWorkerOptions.workerSrc = window['pdfjsWorker'] 
+    // 'pdfjs-dist/build/pdf.worker';
+}
+const { TextLayerBuilder } = window['pdfjsViewer']
 export default {
     name: 'pdfView',
     props:['tagId'],
@@ -46,7 +52,7 @@ export default {
     },
     methods:{
         async loadPdfData(loadPage) {
-            pdfjsLib.GlobalWorkerOptions.workerSrc = require("pdfjs-dist/legacy/build/pdf.worker.entry.js");
+            // pdfjsLib.GlobalWorkerOptions.workerSrc = require("pdfjs-dist/legacy/build/pdf.worker.entry.js");
             // 拿到第一个分片
             const { startPage, url } = await this.fetchPdfFragment(loadPage);
             
@@ -162,14 +168,15 @@ export default {
                 textLayerDiv.setAttribute('class', 'textLayer');
                 // 将文本图层div添加至每页pdf的div中
                 // 创建新的TextLayerBuilder实例
+                // 这里因为版本问题跟pc端有些差异
+                pageDom.appendChild(textLayerDiv);
                 let textLayer = new TextLayerBuilder({
                     textLayerDiv:textLayerDiv,
                     pageIndex: pdfPage._pageIndex,
                     viewport: viewport,
                 });
-                textLayer.setTextContentSource(textContent);
-                textLayer.render(viewport)
-                pageDom.appendChild(textLayer.div);
+                textLayer.setTextContent(textContent);
+                textLayer.render()
             })
             page.dom = pageDom;
             if(pageIndex == this.identifyTextPostion.page) {