askbot-dragon 1.3.91 → 1.3.93

package/package.json

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

package/src/components/AnswerDocknowledge.vue

@@ -131,7 +131,7 @@ export default {
             }
         }
     },
-    props: ['msg','isAskLightning'],
+    props: ['msg','isAskLightning', 'isMessageRecord'],
     beforeMounted() {
 
     },
@@ -218,6 +218,9 @@ export default {
                 }
                 this.$refs.previewPdf.fileType = type
                 this.$refs.previewPdf.tagIds = item.tagIds
+                this.$refs.previewPdf.isMessageRecord = this.isMessageRecord ? true : false 
+                // this.$refs.previewPdf.tagIds = ["6463435ae607ba08d55fd46b"]
+    
                 if(item.tagIds && item.tagIds.length != 0) {
                   this.$refs.previewPdf.loading = false
                   return
@@ -234,7 +237,7 @@ export default {
         },
         fileType (url) {
             const fileType = url.substring(url.lastIndexOf('.'));
-            if (fileType === '.mp4' || fileType === '.MP4') {
+            if (fileType === '.mp4' || fileType === '.MP4' || fileType === '.MOV' || fileType === '.MOVC' || fileType === '.mov' || fileType === '.movc' || fileType === '.mav' || fileType === '.MAV' || fileType == '.mp3' || fileType == '.MP3') {
                 return 'VIDEO'
             } else if (fileType === '.html') {
                 return 'HTML'

package/src/components/pdfPosition.vue

@@ -24,7 +24,7 @@ const { TextLayerBuilder } = window['pdfjs-dist/web/pdf_viewer']
 // import { zoomElement } from '../assets/js/hammer'
 export default {
     name: 'pdfView',
-    props:['tagIds'],
+    props:['tagIds','isMessageRecord'],
     data() {
         return {
             url: '',
@@ -80,7 +80,11 @@ export default {
             // 根据当前页面宽度设置缩放比例
             // this.scale = Math.round(this.$refs.pdfView.clientWidth / pdfResloute.pageWidth * 100) / 100
             // console.log(this.scale,'this.scale');
-            this.scale = 1
+            if(this.isMessageRecord) {
+                this.scale = Math.round(this.$refs.pdfView.clientWidth / pdfResloute.pageWidth * 100) / 100
+            } else {
+                this.scale = 1
+            }
             // 从后端获取到当前分片后所有的pdf页码，初始化数组，数组下{} 对应每页pdf文件
             this.pdfUrl = pdfResloute.publicPageFileUrl.substring(0, pdfResloute.publicPageFileUrl.lastIndexOf('/') + 1)
             this.initPages(pdfResloute.total)
@@ -175,7 +179,7 @@ export default {
             }
             this.pageSize = pageSize
             // 创建内容绘制区，并设置大小
-            if(this.$refs.pdfView.clientWidth / this.pageSize.width >= 1) {
+            if(this.$refs.pdfView.clientWidth / this.pageSize.width >= 1 || this.isMessageRecord) {
                 this.contentView.style.width = `${pageSize.width }px`;
                 this.contentView.style.height = `${(this.totalPageCount * (pageSize.height + this.PAGE_INTVERVAL))  + this.PAGE_INTVERVAL}px`;
             } else {
@@ -296,12 +300,15 @@ export default {
                                 this.fisrtLoad = false
                             } else {
                                 this.$refs.pdfView.scrollTop = `${((pageNo - 1) * (this.pageSize.height + this.PAGE_INTVERVAL) * this.transformSalce)}`
+                                this.renderHighlights()
                             }
                         } else {
                             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.renderHighlights()
+
                             }
                         }
                         // zoomElement(this.contentView)
@@ -487,12 +494,14 @@ export default {
         scrollToExcalTop(currentPage) {
             for (let index = 0; index < this.allTr.length; index++) {
                 if(index == currentPage) {
-                    this.allTr[index].children.forEach(item =>{
+                    Array.from(this.allTr[index].children).forEach(item =>{
                         item.style.background = 'rgba(255, 136, 0, 0.6)'
                     })
-                    this.$refs.pdfView.scrollTop = this.allTr[index].offsetTop
+                    // this.$refs.pdfView.scrollTop = this.allTr[index].offsetTop
+                    this.$refs.pdfView.scrollTop = this.allTr[index].getBoundingClientRect().top
+                    
                 } else {
-                    this.allTr[index].children.forEach(item =>{
+                    Array.from(this.allTr[index].children).forEach(item =>{
                         item.style.background = 'rgba(54, 106, 255, 0.6)'
                     })
                 }
@@ -711,13 +720,14 @@ export default {
                                     }).then(res => {
                                         // 使用原声请求方式 axios会带有不需要的请求头 
                                         let xhr = new XMLHttpRequest();
-                                        xhr.open('GET', res.data, true);
+                                        xhr.open('GET', res.data || res.bodyText , true);
                                         // 定义请求完成的处理函数，请求前也可以增加加载框/禁用下载按钮逻辑
                                         xhr.onload = ({ currentTarget }) => {
                                             // 请求完成
                                             if (currentTarget.status === 200) {   // 返回200
                                                 this.contentView.innerHTML = currentTarget.response
                                                 this.contentView.style.padding = '10px'
+                                                // this.contentView.style.position = 'relative'
                                                 this.$refs.pdfView.style.backgroundColor = '#FFFFFF'
                                                 this.$refs.pdfView.appendChild(this.contentView)
                                                 let allTr = Array.from(this.$refs.pdfView.getElementsByTagName('tr'))

package/src/components/previewPdf.vue

@@ -41,6 +41,7 @@
       :destroy-on-close="true"
       :direction="previewShowPopup ? 'btt' : 'rtl'"
       :size="previewShowPopup ? '90%' : '65%'"
+      custom-class="pdf-preview-drawer"
   >
     <!-- v-else-if="drawer" -->
     <div class="drawer-footer">
@@ -50,7 +51,7 @@
       </section>
     </div>
     <template v-if="tagIds && tagIds.length != 0 && drawer">
-      <pdfPosition :tagIds="tagIds"></pdfPosition>
+      <pdfPosition :tagIds="tagIds" :isMessageRecord="isMessageRecord"></pdfPosition>
     </template>
     <template v-else>
       <div v-if="fileType == 'VIDEO'" style="width: 100%;height:calc(100% - 60px)">
@@ -104,6 +105,10 @@ export default {
         officePreviewType:{
             type: String,
             default: ''
+        },
+        isMessageRecord:{
+          type: Boolean,
+          default:false,
         }
     },
     components:{
@@ -138,21 +143,23 @@ export default {
     },
     methods :{
         close() {
+          setTimeout(() =>{
             this.previewShowPopup = false;
-            this.drawer = false;
+            this.fileType = ''
+          }, 300)
+          this.drawer = false;
         },
         loadIframe() {
-            let iframe = document.getElementsByClassName('preview_iframe')[0]
-            console.log(iframe,'iframeiframe');
-            if(iframe) {
-                // this.loading = true
-                iframe.onload = () =>{
-                  console.log('1111111');
-                  this.loading = false 
-                }
-            }
             if(this.fileType == 'VIDEO' || this.fileType == 'WECHAT' || (this.tagIds && this.tagIds.length != 0)) {
                 this.loading = false
+            } else {
+              let time = setInterval(() =>{
+                let iframe = document.getElementsByClassName('preview_iframe')[0]
+                if(iframe) {
+                    this.loading = false 
+                    clearInterval(time)
+                }
+              }, 500)
             }
         },
         getBolb() {