askbot-dragon 1.3.81 → 1.3.83

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "askbot-dragon",
-  "version": "1.3.81",
+  "version": "1.3.83",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",

package/public/index.html

@@ -38,7 +38,7 @@
     <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" />
     <!-- hammer.js -->
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/hammer.js/2.0.8/hammer.min.js" integrity="sha512-UXumZrZNiOwnTcZSHLOfcTs0aos2MzBWHXOHOuB0J/R44QB0dwY5JgfbvljXcklVf65Gc4El6RjZ+lnwd2az2g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+    <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/hammer.js/2.0.8/hammer.min.js" integrity="sha512-UXumZrZNiOwnTcZSHLOfcTs0aos2MzBWHXOHOuB0J/R44QB0dwY5JgfbvljXcklVf65Gc4El6RjZ+lnwd2az2g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script> -->
     <style>
       *{
         margin: 0;

package/src/components/pdfPosition.vue

@@ -21,7 +21,7 @@ if(pdfjsLib) {
     // 'pdfjs-dist/build/pdf.worker';
 }
 const { TextLayerBuilder } = window['pdfjs-dist/web/pdf_viewer']
-import { zoomElement } from '../assets/js/hammer'
+// import { zoomElement } from '../assets/js/hammer'
 export default {
     name: 'pdfView',
     props:['tagIds'],
@@ -77,8 +77,9 @@ export default {
     methods: {
         getpdfResloutePage (pdfResloute) {
             // 根据当前页面宽度设置缩放比例
-            this.scale = this.$refs.pdfView.clientWidth / pdfResloute.pageWidth
-            // this.scale = 1
+            // this.scale = Math.round(this.$refs.pdfView.clientWidth / pdfResloute.pageWidth * 100) / 100
+            // console.log(this.scale,'this.scale');
+            this.scale = 1
             // 从后端获取到当前分片后所有的pdf页码，初始化数组，数组下{} 对应每页pdf文件
             this.pdfUrl = pdfResloute.publicPageFileUrl.substring(0, pdfResloute.publicPageFileUrl.lastIndexOf('/') + 1)
             this.initPages(pdfResloute.total)
@@ -174,7 +175,7 @@ export default {
             this.pageSize = pageSize
             // 创建内容绘制区，并设置大小
             this.contentView.style.width = `${pageSize.width}px`;
-            this.contentView.style.height = `${(this.totalPageCount * (pageSize.height + this.PAGE_INTVERVAL)) + this.PAGE_INTVERVAL}px`;
+            this.contentView.style.height = `${(this.totalPageCount * (pageSize.height + this.PAGE_INTVERVAL)) * (this.$refs.pdfView.clientWidth / pageSize.width) + this.PAGE_INTVERVAL}px`;
             this.contentView.style.margin = '0 auto 0'
             this.contentView.style.position = 'relative'
             // contentView.style.overflowY = 'auto'
@@ -262,6 +263,8 @@ export default {
                 pageDom.appendChild(textLayer.textLayerDiv);
                 page.dom = pageDom;
                 this.contentView.appendChild(pageDom);
+                this.contentView.style.transform = `scale(${this.$refs.pdfView.clientWidth / this.pageSize.width}, ${this.$refs.pdfView.clientWidth / this.pageSize.width})`
+
                 if (this.changetoolbar) {
                     setTimeout(() => {
                         this.renderHighlights()
@@ -283,7 +286,7 @@ export default {
                         } else {
                             this.$refs.pdfView.scrollTop = `${((pageNo - 1) * (this.pageSize.height + this.PAGE_INTVERVAL))}`
                         }
-                        zoomElement(this.contentView)
+                        // zoomElement(this.contentView)
                     }, 100)
                 }
             })