askbot-dragon 1.7.38-beta → 1.7.40-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "askbot-dragon",
-  "version": "1.7.38-beta",
+  "version": "1.7.40-beta",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",

package/src/components/AnswerDocknowledge.vue

@@ -398,7 +398,9 @@ export default {
                         }
                         this.$refs.previewPdf.fileType = type
                         this.$refs.previewPdf.tagIds = item.tagIds;
-                        this.$refs.previewPdf.getLocationInfo();
+                        if (item.tagIds && item.tagIds.length > 0){
+                          this.$refs.previewPdf.getLocationInfo();
+                        }
                         this.$refs.previewPdf.isMessageRecord = this.isMessageRecord ? true : false;
                         let index = url.indexOf("?");
                         let newFileInOssPath = url;
@@ -411,7 +413,7 @@ export default {
                         } else {
                             this.$refs.previewPdf.fileName = '';
                         }
-                        if (item.tagIds && item.tagIds.length != 0) {
+                        if (item.tagIds && item.tagIds.length != 0 && this.$refs.previewPdf.newFileType !== 'PPT') {
                             this.$refs.previewPdf.loading = false
                             return
                         }

package/src/components/preview/docView.vue

@@ -55,7 +55,7 @@ export default {
           item.original_paragraph.forEach(items => {
             let dom = document.getElementById(items.paragraph_id);
             if (this.fileSuffix === 'txt'){
-              const paragraphs = this.$el.querySelectorAll(`[data-paragraph-id="${items.paragraph_id}"]`);
+              const paragraphs = this.$el.querySelectorAll(`[paragraph-id="${items.paragraph_id}"]`);
               paragraphs.forEach(paragraph => {
                 paragraph.style.background = this.colors[colorIndex]
               })
@@ -69,21 +69,21 @@ export default {
             dom.style.marginBottom = '8px';
           }
         }
+        if (item.tableId){
+          let dom = document.getElementById(item.tableId);
+          if (dom){
+            dom.style.backgroundColor = this.colors[colorIndex]
+          }
+        }
       })
+      this.$parent.scrollToParagraph('first')
     },
   },
   watch:{
     html_result:{
       handler(){
         if (this.html_result){
-          if (this.fileSuffix === 'txt'){
-            this.html = this.html_result
-            this.$nextTick(() => {
-              this.setColor()
-            })
-          } else {
-            this.getHtml();
-          }
+          this.getHtml();
         }
       },
       immediate:true

package/src/components/preview/excelView.vue

@@ -62,7 +62,8 @@ export default {
       rowDataList:[],
       headerArray:[],
       currentPage:1,
-      pageSize:20
+      pageSize:20,
+      colors: ['#E3EBFF', '#FFF5DC', '#FFE8D8','#D6F3EA','#FFF1C3'],
     }
   },
   props:{
@@ -116,20 +117,33 @@ export default {
         }
         this.rowDataList.push(obj);
       }
-      setTimeout(() => {
-        let dom = document.getElementById('659164be-19bd-4fd7-a47d-b04c3dbbfa6f');
-        if (dom){
-          dom.style.backgroundColor = 'red'
-        }
-      },1000)
+      this.$nextTick(() => {
+        this.setRowColor();
+      })
     },
     getRowKey(row){
       return row.id
     },
+    setRowColor(){
+      this.tableChunkData.forEach((item,index) => {
+        const colorIndex = index % this.colors.length;
+        let id = item.tableChunkId;
+        let dom = document.getElementsByClassName('setBgClass' + id);
+        console.log('dom',dom)
+        if (dom && dom.length > 0){
+          dom.forEach(doms => {
+            doms.style.backgroundColor = this.colors[colorIndex];
+          })
+        }
+      })
+      if (this.tableChunkData.length > 0){
+        this.scrollToRow(this.tableChunkData[0].tableChunkId)
+      }
+    },
     tableRowClassName({ row }){
       let id = this.tableChunkData.filter(item => item.tableChunkId == row.id);
       if (id && id.length > 0){
-        return 'setBgClass'
+        return 'setBgClass' + id[0].tableChunkId
       }
     },
     scrollToRow(rowId) {
@@ -142,6 +156,9 @@ export default {
     },
     handleCurrentChange(val){
       this.currentPage = val;
+      this.$nextTick(() => {
+        this.setRowColor();
+      })
     }
   },
   mounted() {
@@ -154,7 +171,7 @@ export default {
 .excelView{
   height: 100%;
   /deep/.setBgClass{
-    background-color: #366aff!important;
+    background-color: #E3EBFF!important;
   }
 }
 </style>

package/src/components/preview/newPositionPreview.vue

@@ -79,11 +79,12 @@ export default {
                 this.splitParagraph.push(res.data.data[i].paragraphChunkInfo.splitParagraph)
               }
               if (res.data.data[i].paragraphChunkInfo && res.data.data[i].paragraphChunkInfo.tableChunkData){
-                this.tableChunkData = this.tableChunkData.push(res.data.data[i].paragraphChunkInfo.tableChunkData)
+                this.tableChunkData.push(res.data.data[i].paragraphChunkInfo.tableChunkData)
               }
             }
           }
         }
+        this.splitParagraph = this.splitParagraph.concat(this.tableChunkData);
         this.getParseInfo();
       })
     },
@@ -120,7 +121,7 @@ export default {
       this.currentPage++;
       this.scrollToParagraph()
     },
-    scrollToParagraph(){
+    scrollToParagraph(type){
       if (this.fileType == 'PDF') {
         this.$refs.pdfView.jumpToHighlight(this.currentPage)
       } else if (this.fileType == 'DOC' || this.fileType == 'DOCX' || this.fileType == 'TXT'){
@@ -130,16 +131,31 @@ export default {
           if (dom){
             dom.scrollIntoView({ behavior: 'smooth' });
           }
-          for (let i=0;i<this.splitParagraph[this.currentPage].original_paragraph.length;i++){
-            const id = this.splitParagraph[this.currentPage].original_paragraph[i].paragraph_id;
-            const dom = document.getElementById(id);
+          if (type === 'first'){
             if (dom){
-              dom.scrollIntoView({ behavior: 'smooth' });
               dom.classList.add('animation')
               setTimeout(() => {
                 dom.classList.remove('animation')
-              }, 4000)
+              }, 3000)
             }
+          } else {
+            for (let i=0;i<this.splitParagraph[this.currentPage].original_paragraph.length;i++){
+              const id = this.splitParagraph[this.currentPage].original_paragraph[i].paragraph_id;
+              const dom = document.getElementById(id);
+              if (dom){
+                dom.scrollIntoView({ behavior: 'smooth' });
+                dom.classList.add('animation')
+                setTimeout(() => {
+                  dom.classList.remove('animation')
+                }, 3000)
+              }
+            }
+          }
+        } else if (this.splitParagraph[this.currentPage] && this.splitParagraph[this.currentPage].tableId){
+          const id = this.splitParagraph[this.currentPage].tableId;
+          const dom = document.getElementById(id);
+          if (dom){
+            dom.scrollIntoView({ behavior: 'smooth' });
           }
         }
       }

package/src/components/preview/pdfView.vue

@@ -107,14 +107,16 @@ export default {
     setHighlights(arr){
       this.highlights = [];
       for (let i =0;i<arr.length;i++){
-        for (let j=0;j<arr[i].original_paragraph.length;j++){
-          let item = arr[i].original_paragraph[j];
-          let obj = {
-            position:item.position,
-            pageNumber: i+1,
-            page:item.page
+        if (arr[i].original_paragraph){
+          for (let j=0;j<arr[i].original_paragraph.length;j++){
+            let item = arr[i].original_paragraph[j];
+            let obj = {
+              position:item.position,
+              pageNumber: i+1,
+              page:item.page
+            }
+            this.highlights.push(obj);
           }
-          this.highlights.push(obj);
         }
       }
     },
@@ -173,13 +175,13 @@ export default {
         this.observer.disconnect();
       }
       this.observer = new IntersectionObserver(
-          (entries) => {
-            entries.forEach((entry) => {
+           (entries) => {
+             entries.forEach( (entry) => {
               if (entry.isIntersecting) {
                 const index = Number(entry.target.getAttribute('data-index'));
                 const page = this.pages[index];
                 if (!page.loaded && !page.loading) {
-                  this.renderPage(page.pageNumber);
+                   this.renderPage(page.pageNumber);
                 }
                 this.updateCurrentPage();
               }
@@ -201,6 +203,9 @@ export default {
             }
           });
         },300)
+        setTimeout(() => {
+          this.jumpToHighlight(0);
+        },1300)
       });
     },
     async loadPage(number){
@@ -359,7 +364,10 @@ export default {
       }
     },
     jumpToHighlight(currentPage) {
-      const highlight = this.split_paragraphs[currentPage].original_paragraph[0];
+      let highlight = null;
+      if (this.split_paragraphs[currentPage].original_paragraph){
+        highlight = this.split_paragraphs[currentPage].original_paragraph[0];
+      }
       if (!highlight) return;
       this.scrollToHighlight(highlight);
     },

package/src/components/previewPdf.vue

@@ -91,11 +91,11 @@
           :formKnowledgeManagement="formKnowledgeManagement"
         @closeSummary="closeSummary" @recommendQues="recommendQues"
         @getSummarySuccess="getSummarySuccess"></intelligent-summary>
-      <div class="pdf_positon" :style="pdfStyle" v-if="tagIds && tagIds.length != 0 && drawer && newVersion === false">
+      <div class="pdf_positon" :style="pdfStyle" v-if="tagIds && tagIds.length != 0 && drawer && newVersion === false && newFileType !== 'PPT'">
         <pdfPosition :tagIds="tagIds" :isMessageRecord="isMessageRecord" :textWatermarkStr="textWatermarkStr">
         </pdfPosition>
       </div>
-      <new-position-preview v-else-if="newVersion" :knowledgeId="knowledgeId" :tagIds="tagIds" :url="previewHref"></new-position-preview>
+      <new-position-preview ref="newPositionPreview" v-else-if="tagIds && tagIds.length!= 0 && newVersion && newFileType !== 'PPT'" :knowledgeId="knowledgeId" :tagIds="tagIds" :url="previewHref"></new-position-preview>
       <template v-else>
         <div v-if="fileType == 'VIDEO'" style="width: 100%;height: 100%">
           <video :src="url" controls width="100%;" height="98%"></video>
@@ -151,7 +151,9 @@ export default {
           textWatermarkStr:"",
         copy:'',
       newVersion:'',
-      previewHref:""}
+      previewHref:"",
+      newFileType:""
+    }
     },
     mounted() {
       window.addEventListener('message',this.handleIframeMessage,false);
@@ -310,7 +312,7 @@ export default {
     },
     loadIframe () {
 
-      if (this.fileType == 'VIDEO' || this.fileType == 'WECHAT' || (this.tagIds && this.tagIds.length != 0)) {
+      if (this.fileType == 'VIDEO' || this.fileType == 'WECHAT' || (this.tagIds && this.tagIds.length != 0  && this.newFileType !== 'PPT')) {
         this.loading = false
       } else {
         let iframe = document.getElementsByClassName('preview_iframe')[0] || document.getElementsByClassName('preview_iframe_kk')[0];
@@ -479,6 +481,7 @@ export default {
     getOssPath(url){
       let httpUrl = '/knowledge-api/knowledge/getTemporaryCertificate';
       let type = this.getFileType(url)
+      this.newFileType = type;
       if (type === 'VIDEO' || type === 'PDF' || type === 'EXCEL' || type === 'TXT' || type === 'DOC') {
         httpUrl += '?needEncrypt=false'
       } else {
@@ -520,12 +523,15 @@ export default {
     },
     //判断是否使用新定位组件
     getLocationInfo(){
+      this.newVersion = "";
       this.$http.get('/knowledge-api/knowledge/knowledge-part-location-info/list?ids=' + this.tagIds.join(',')).then(res => {
         console.log('getLocationInfo',res)
         if (res.data.code == 0){
           if (res.data.data && res.data.data.length > 0 && res.data.data[0].extractVersion == 'v3'){
             this.newVersion = true;
-            this.loading = false;
+            if (this.newFileType !== 'PPT'){
+              this.loading = false;
+            }
           } else {
             this.newVersion = false;
           }