askbot-dragon 1.3.63 → 1.3.65

package/package.json

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

package/src/components/AnswerDocknowledge.vue

@@ -165,11 +165,14 @@ export default {
               url: url
             },"*");
           } else {
-            if (isMobile()) {
-              this.$refs.previewPdf.previewShowPopup = false;
-            } else {
-              this.$refs.previewPdf.drawer = false;
-            }
+            // if (isMobile()) {
+            //   this.$refs.previewPdf.drawer = true;
+            //   this.$refs.previewPdf.previewShowPopup = false;
+            // } else {
+            //   this.$refs.previewPdf.drawer = false;
+            // }
+            this.$refs.previewPdf.previewShowPopup = false;
+            this.$refs.previewPdf.drawer = false;
             let index = url.lastIndexOf('?')
             let type = ''
             let httpUrl = '/knowledge-api/knowledge/getTemporaryCertificate'
@@ -190,8 +193,10 @@ export default {
               if(res.data.code == '0') {
                 this.previewHref = res.data.data;
                 if (isMobile()){
+                  this.$refs.previewPdf.drawer = true;
                   this.$refs.previewPdf.previewShowPopup = true;
                 } else {
+                  this.$refs.previewPdf.previewShowPopup = false;
                   this.$refs.previewPdf.drawer = true;
                 }
                 this.$refs.previewPdf.fileType = type
@@ -210,7 +215,6 @@ export default {
               }
             })
           }
-
         },
         fileType (url) {
             const fileType = url.substring(url.lastIndexOf('.'));

package/src/components/pdfPosition.vue

@@ -61,7 +61,15 @@ export default {
             currentPage: 0,
             changetoolbar: false,
             allTr:[],
-            preViewType: 'pdf'
+            preViewType: 'pdf',
+            displacement:{
+                pageX:0,
+                pageY:0,
+                moveable:false,
+                pageX2:0,
+                pageY2:0,
+                originScale:1,
+            }
         }
     },
     // methods:{
@@ -528,16 +536,14 @@ export default {
                             }
                         }
                     }
-                    // }, 0)
                 }
                 textLayer.setTextContent(textContent);
                 textLayer.render()
-                // pageDom.appendChild(textLayer.div);
+                pageDom.appendChild(textLayer.textLayerDiv);
                 page.dom = pageDom;
                 this.contentView.appendChild(pageDom);
                 if (this.changetoolbar) {
                     setTimeout(() => {
-                        console.log('========');
                         this.renderHighlights()
                         this.changetoolbar = false
                     }, 100)
@@ -549,16 +555,18 @@ export default {
                             for (let n = 0; n < loadNum; n++) {
                                 this.loadPdfData(pageNo + n)
                             }
+                        } else {
+                            this.renderHighlights()
                         }
                         if (this.$refs.pdfView.scrollTop == Math.floor((pageNo - 1) * (this.pageSize.height + this.PAGE_INTVERVAL))) {
                             this.fisrtLoad = false
                         } else {
                             this.$refs.pdfView.scrollTop = `${((pageNo - 1) * (this.pageSize.height + this.PAGE_INTVERVAL))}`
                         }
+                        this.openTouch()
                     }, 100)
                 }
             })
-
         },
         // 监听容器的滚动事件，触发 scrollPdf 方法
         // 这里加了防抖保证不会一次产生过多请求
@@ -573,48 +581,10 @@ export default {
             const pageIndex = scrollTop > 0 ?
                 Math.ceil((scrollTop + (height / 2)) / (that.pageSize.height + that.PAGE_INTVERVAL)) :
                 1;
-            // 当前页码在gpt识别列表内
-            // let pdfResloute = this.cachePdf[this.currentPage]
-            // debugger
-            // let pdfResloute = this.cachePdf.find(cache => {
-            //     return cache.page == pageIndex
-            // })
-            // if (pdfResloute) {
-            //     this.identifyTextPostion.extractInfo = pdfResloute.extractInfo
-            //     this.identifyTextPostion.currentPageAllLine = []
-            //     this.cachePdf.forEach(item => {
-            //         if (item.page == pdfResloute.page) {
-            //             this.identifyTextPostion.currentPageAllLine.push({
-            //                 lines: [...item.extractInfo.lines],
-            //                 page: item.page
-            //             })
-            //         }
-            //     })
-            //     this.identifyTextPostion.left = pdfResloute.extractInfo.location[0]
-            //     this.identifyTextPostion.top = pdfResloute.extractInfo.location[1]
-            //     this.identifyTextPostion.width = pdfResloute.extractInfo.location[2]
-            //     this.identifyTextPostion.height = pdfResloute.extractInfo.location[3]
-            //     this.identifyTextPostion.page = pdfResloute.page
-            //     this.identifyTextPostion.pageHeight = pdfResloute.pageHeight
-            //     this.identifyTextPostion.pageWidth = pdfResloute.pageWidth
-            // }
+            
             pageIndex - 1 != 0 && that.loadPdfData(pageIndex - 1)
             that.loadPdfData(pageIndex)
             pageIndex + 1 <= that.totalPageCount && that.loadPdfData(pageIndex + 1)
-            // if (height - (that.pageSize.height + that.PAGE_INTVERVAL) > (that.pageSize.height + that.PAGE_INTVERVAL)) {
-            //     let loadNum = Math.ceil(height / (that.pageSize.height + that.PAGE_INTVERVAL))
-            //     if (loadNum > 2 && pageIndex > 1) {
-            //         that.loadPdfData(pageIndex - 1)
-            //         that.loadPdfData(pageIndex)
-            //         that.loadPdfData(pageIndex + 1)
-            //     } else {
-            //         for (let n = 0; n < loadNum; n++) {
-            //             that.loadPdfData(pageIndex + n)
-            //         }
-            //     }
-            // } else {
-            //     that.loadPdfData(pageIndex)
-            // }
         }, 200),
         directScrolling (e, that) {
             if (this.fisrtLoad) {
@@ -627,35 +597,9 @@ export default {
             const pageIndex = scrollTop > 0 ?
                 Math.ceil((scrollTop + (height / 2)) / (that.pageSize.height + that.PAGE_INTVERVAL)) :
                 1;
-            // // 当前页码在gpt识别列表内
-            // let pdfResloute = this.cachePdf[this.currentPage]
-            // if (pdfResloute) {
-            //     this.identifyTextPostion.extractInfo = pdfResloute.extractInfo
-            //     this.identifyTextPostion.currentPageAllLine = []
-            //     this.cachePdf.forEach(item => {
-            //         if (item.page == pdfResloute.page) {
-            //             this.identifyTextPostion.currentPageAllLine.push({
-            //                 lines: [...item.extractInfo.lines],
-            //                 page: item.page
-            //             })
-            //         }
-            //     })
-            //     this.identifyTextPostion.left = pdfResloute.extractInfo.location[0]
-            //     this.identifyTextPostion.top = pdfResloute.extractInfo.location[1]
-            //     this.identifyTextPostion.width = pdfResloute.extractInfo.location[2]
-            //     this.identifyTextPostion.height = pdfResloute.extractInfo.location[3]
-            //     this.identifyTextPostion.page = pdfResloute.page
-            //     this.identifyTextPostion.pageHeight = pdfResloute.pageHeight
-            //     this.identifyTextPostion.pageWidth = pdfResloute.pageWidth
-            // }
             this.loadPdfData(pageIndex)
         },
         pdfScroll (e) {
-            // if (this.changetoolbar) {
-            //     this.directScrolling(e, this)
-            // } else {
-            //     this.debounceScrollPdf(e, this)
-            // }
             if(this.preViewType !== 'pdf') {
                 return
             }
@@ -789,18 +733,11 @@ export default {
             this.identifyTextPostion.page = pdfResloute.page
             this.identifyTextPostion.pageHeight = pdfResloute.pageHeight
             this.identifyTextPostion.pageWidth = pdfResloute.pageWidth
-            // console.log( Math.floor((pdfResloute.page - 1) * (this.pageSize.height + this.PAGE_INTVERVAL)) + (this.pageSize.height + this.PAGE_INTVERVAL * 2) ,this.$refs.pdfView.scrollHeight);
-            // debugger
-            // if(this.$refs.pdfView.scrollTop == Math.floor((pdfResloute.page - 1) * (this.pageSize.height + this.PAGE_INTVERVAL)) ||
-            //     Math.floor((pdfResloute.page - 1) * (this.pageSize.height + this.PAGE_INTVERVAL)) + (this.pageSize.height + this.PAGE_INTVERVAL) >= this.$refs.pdfView.scrollHeight) {
-            //     this.renderHighlights()
-            // } else {
             // 在当前段落在最后一页pdf时，根据计算的高度并不能触发滚动，在此执行重新渲染方法，非次情况会执行两次，待优化
             this.$nextTick(() => {
                 this.renderHighlights()
             })
             this.$refs.pdfView.scrollTop = `${((pdfResloute.page - 1) * (this.pageSize.height + this.PAGE_INTVERVAL))}`
-            // }
         },
         scrollToExcalTop(currentPage) {
             for (let index = 0; index < this.allTr.length; index++) {
@@ -873,6 +810,89 @@ export default {
                     })
                 }
             })
+        },
+        openTouch() {
+            // this.$nextTick()将回调延迟到下次 DOM 更新循环之后执行
+            let that = this;
+            this.$nextTick(() => {
+                // 获取放大或缩小的区域DOM
+                let matrix_box = this.contentView
+                matrix_box.addEventListener("touchstart", function (event) {
+                    let touches = event.touches;
+                    let events = touches[0];
+                    let events2 = touches[1];
+
+                    // event.preventDefault();
+
+                    // 第一个触摸点的坐标
+                    that.displacement.pageX = events.pageX;
+                    that.displacement.pageY = events.pageY;
+
+                    that.displacement.moveable = true;
+
+                    if (events2) {
+                        that.displacement.pageX2 = events2.pageX;
+                        that.displacement.pageY2 = events2.pageY;
+                    }
+
+                    that.displacement.originScale = this.scale || 1;
+                    // console.log(that.displacement);
+                });
+                document.addEventListener("touchmove", function (event) {
+                    if (!that.displacement.moveable) {
+                        return;
+                    }
+                    // event.preventDefault();
+                    let touches = event.touches;
+                    let events = touches[0];
+                    let events2 = touches[1];
+                    // 双指移动
+                    if (events2) {
+                        // 第2个指头坐标在touchmove时候获取
+                        if (!that.displacement.pageX2) {
+                            that.displacement.pageX2 = events2.pageX;
+                        }
+                        if (!that.displacement.pageY2) {
+                            that.displacement.pageY2 = events2.pageY;
+                        }
+                        // 双指缩放比例计算
+                        let zoom =
+                            that.getDistance(
+                                {
+                                    x: events.pageX,
+                                    y: events.pageY
+                                },
+                                {
+                                    x: events2.pageX,
+                                    y: events2.pageY
+                                }
+                            ) /
+                            that.getDistance(
+                                {
+                                    x: that.displacement.pageX,
+                                    y: that.displacement.pageY
+                                },
+                                {
+                                    x: that.displacement.pageX2,
+                                    y: that.displacement.pageY2
+                                }
+                            );
+                        // 应用在元素上的缩放比例
+                        let newScale = that.displacement.originScale * zoom;
+                        // 最大缩放比例限制
+                        if (newScale > 1) {
+                            newScale = 1;
+                        }
+                        // 记住使用的缩放值
+                        that.displacement.scale = newScale;
+                        // 图像应用缩放效果
+                        // console.log(newScale);
+                        matrix_box.style.transform = "scale(" + newScale + ")";
+                        // 设置旋转元素的基点位置
+                        matrix_box.style.transformOrigin = "0px 0px 0px";
+                    }
+                });
+            });
         }
     },
     computed:{
@@ -948,14 +968,8 @@ export default {
             immediate:true
         }
     },
-
-    mounted() {
-        // 在 pdf_view 下创建 所有canvs的容器
-        // this.contentView = document.createElement('div')
-        // // 从后端获取到当前分片后所有的pdf页码，初始化数组，数组下{} 对应每页pdf文件
-        // this.initPages(8);
-        // // 定位功能，加载对应页码位置
-        // this.loadPdfData(1)
+    mounted () {
+       
     }
 }
 </script>

package/src/components/previewPdf.vue

@@ -1,5 +1,5 @@
 <template>
-    <van-popup v-model="previewShowPopup" position="bottom" :style="{ height: '90%', background:'#FFFFFF'}" v-if="previewShowPopup">
+    <!-- <van-popup v-model="previewShowPopup" position="bottom" :style="{ height: '90%', background:'#FFFFFF'}" v-if="previewShowPopup">
       <div class="footer">
         <span>查看详情</span>
             <section @click="close">
@@ -32,14 +32,17 @@
         <div class="loading_img" v-show="loading">
             <img src="https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com/cdn-common/images/loading.gif" alt="">
         </div>
-    </van-popup>
+    </van-popup> -->
   <el-drawer
       title="我是标题"
       :visible.sync="drawer"
-      v-else-if="drawer"
       :with-header="false"
-      size="65%"
+      :append-to-body="true"
+      :destroy-on-close="true"
+      :direction="previewShowPopup ? 'btt' : 'ltr'"
+      :size="previewShowPopup ? '90%' : '65%'"
   >
+    <!-- v-else-if="drawer" -->
     <div class="drawer-footer">
       <span>查看详情</span>
       <section @click="close">