askbot-dragon 1.7.44-beta → 1.7.46-beta

package/package.json

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

package/public/index.html

@@ -26,7 +26,7 @@
     <!-- 项目图标 -->
     <link rel="stylesheet"  href="//at.alicdn.com/t/c/font_2913049_ee8dx548hg.css"/>
     <!-- iconfont图标 -->
-    <link rel="stylesheet"  href="//at.alicdn.com/t/c/font_2913049_mfmhkqumc7i.css"/>
+    <link rel="stylesheet"  href="//at.alicdn.com/t/c/font_2913049_eje81c90ujh.css"/>
     <script src="https://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
 <!-- aliyun-oss -->
     <script src="https://static.guoranbot.com/cdn-common/alyun-oss/aliyun-oss-sdk-6.17.1.min.js"></script>

package/src/components/AnswerDocknowledge.vue

@@ -353,6 +353,10 @@ export default {
                 // } else {
                 //   this.$refs.previewPdf.drawer = false;
                 // }
+                //该事件是为了打开新的弹框时关闭上一个弹框
+                window.parent.postMessage({
+                  data: "close_drawer"
+                }, "*");
                 this.title = item.from || item.name
                 this.folderName = item.folderName
                 this.folderUrl = item.folderUrl
@@ -422,7 +426,7 @@ export default {
                                 this.$refs.previewPdf.getBolb(item)
                             }
                             this.$refs.previewPdf.loadIframe(item)
-                            this.$refs.previewPdf.showSummary = true;
+                            this.$refs.previewPdf.showSummary = false;
                         })
                     }
                 })

package/src/components/preview/excelView.vue

@@ -131,7 +131,9 @@ export default {
         let dom = document.getElementsByClassName('setBgClass' + id);
         console.log('dom',dom)
         if (dom && dom.length > 0){
-          dom.forEach(doms => {
+          let newDom = Array.from(dom)
+          console.log('newDom',newDom)
+          newDom.forEach(doms => {
             doms.style.backgroundColor = this.colors[colorIndex];
           })
         }

package/src/components/preview/newPositionPreview.vue

@@ -14,7 +14,7 @@
                   :excelRowList="excelRowList"
                   :tableChunkData="tableChunkData"
       ></excel-view>
-      <pdf-view v-else-if="fileType === 'PDF'" ref="pdfView" :split_paragraphs="splitParagraph" :ossPath="url"></pdf-view>
+      <pdf-view v-else-if="fileType === 'PDF'" ref="pdfView" :split_paragraphs="splitParagraph" :ossPath="url" :isPC="isPC"></pdf-view>
     </div>
     <template v-if="splitParagraph.length > 1 && fileType !== 'XLS' && fileType !== 'XLSX'">
       <div class="btn_footer" v-if="!isPC">
@@ -104,10 +104,14 @@ export default {
           }
           this.fileType = res.data.data.fileType
         }
-        if (this.fileType === 'XLS' || this.fileType === 'XLSX'){
-          let dom = document.getElementById('drawer_content_pre');
-          dom.style.height = 'calc(100% - 90px)'
-        }
+        this.$nextTick(() => {
+          if (this.fileType === 'XLS' || this.fileType === 'XLSX'){
+            let dom = document.getElementById('drawer_content_pre');
+            if (dom){
+              dom.style.height = 'calc(100% - 90px)'
+            }
+          }
+        })
       })
     },
     currentChange (value) {
@@ -140,10 +144,14 @@ export default {
       } else if (this.fileType == 'DOC' || this.fileType == 'DOCX' || this.fileType == 'TXT'){
         if (this.splitParagraph[this.currentPage] && this.splitParagraph[this.currentPage].original_paragraph){
           const id = this.splitParagraph[this.currentPage].original_paragraph[0].paragraph_id;
-          const dom = document.getElementById(id);
+          let dom = document.getElementById(id);
+          const paragraphs = this.$el.querySelectorAll(`[paragraph-id="${this.splitParagraph[this.currentPage].original_paragraph[0].paragraph_id}"]`);
           if (dom){
             dom.scrollIntoView({ behavior: 'smooth' });
           }
+          if (paragraphs && paragraphs.length > 0){
+            paragraphs[0].scrollIntoView({ behavior: 'smooth' })
+          }
           if (type === 'first'){
             if (dom){
               dom.classList.add('animation')
@@ -151,6 +159,12 @@ export default {
                 dom.classList.remove('animation')
               }, 3000)
             }
+            if (paragraphs && paragraphs.length > 0){
+              paragraphs[0].classList.add('animation')
+              setTimeout(() => {
+                paragraphs[0].classList.remove('animation')
+              }, 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;
@@ -162,6 +176,13 @@ export default {
                   dom.classList.remove('animation')
                 }, 3000)
               }
+              if (paragraphs && paragraphs.length > 0){
+                paragraphs[0].scrollIntoView({ behavior: 'smooth' });
+                paragraphs[0].classList.add('animation')
+                setTimeout(() => {
+                  paragraphs[0].classList.remove('animation')
+                }, 3000)
+              }
             }
           }
         } else if (this.splitParagraph[this.currentPage] && this.splitParagraph[this.currentPage].tableId){

package/src/components/preview/pdfView.vue

@@ -2,17 +2,26 @@
   <div class="pdfViewPage" id="pdfViewPage">
     <!-- 按钮容器 -->
     <div class="button-container" v-if="false">
+      <div class="change_scale">
+        <section @click="zoomOut">
+          <i class="el-icon-minus"></i>
+        </section>
+        <el-divider direction="vertical"></el-divider>
+        <section @click="zoomIn">
+          <i class="el-icon-plus"></i>
+        </section>
+      </div>
       <!-- 文件上传 -->
-      <label for="file-upload" class="file-upload-label">
-        上传 PDF 文件
-        <input
-            id="file-upload"
-            type="file"
-            accept="application/pdf"
-            @change="handleFileUpload"
-            class="file-input"
-        />
-      </label>
+<!--      <label for="file-upload" class="file-upload-label">-->
+<!--        上传 PDF 文件-->
+<!--        <input-->
+<!--            id="file-upload"-->
+<!--            type="file"-->
+<!--            accept="application/pdf"-->
+<!--            @change="handleFileUpload"-->
+<!--            class="file-input"-->
+<!--        />-->
+<!--      </label>-->
 
       <!--        &lt;!&ndash; 跳转按钮（已有高亮） &ndash;&gt;-->
       <!--        <button @click="jumpToHighlight" class="action-button">-->
@@ -53,6 +62,11 @@
         </div>
       </div>
     </div>
+
+    <div class="change_scale">
+      <i class="iconfont guoran-suoxiao1" @click="zoomOut"></i>
+      <i class="iconfont guoran-fangda1" @click="zoomIn"></i>
+    </div>
   </div>
 </template>
 
@@ -64,6 +78,8 @@ if(pdfjsLib) {
   pdfjsLib.GlobalWorkerOptions.workerSrc = window['pdfjs-dist/build/pdf.worker']
 }
 const { TextLayerBuilder } = window['pdfjs-dist/web/pdf_viewer']
+
+import Vue from 'vue';
 export default {
   name: "PdfViewer",
   data() {
@@ -101,6 +117,10 @@ export default {
     ossPath:{
       type:String,
       default:""
+    },
+    isPC:{
+      type:Boolean,
+      default:true
     }
   },
   methods: {
@@ -170,7 +190,7 @@ export default {
       await this.initPdf();
       this.initObserver();
     },
-    initObserver() {
+    initObserver(type) {
       if (this.observer) {
         this.observer.disconnect();
       }
@@ -203,15 +223,17 @@ export default {
             }
           });
         },300)
-        setTimeout(async () => {
-          let currentPage = this.split_paragraphs[0];
-          let page = 1;
-          if (currentPage){
-            page = currentPage.original_paragraph[0].page
-          }
-          await this.loadPage(page);
-          this.jumpToHighlight(0);
-        },1300)
+        if (type !== 'changeScale' && type !== 'onResize'){
+          setTimeout(async () => {
+            let currentPage = this.split_paragraphs[0];
+            let page = 1;
+            if (currentPage){
+              page = currentPage.original_paragraph[0].page
+            }
+            await this.loadPage(page);
+            this.jumpToHighlight(0);
+          },1300)
+        }
       });
     },
     async loadPage(number){
@@ -251,8 +273,9 @@ export default {
       // await renderTask.promise;
       let hasDoc = document.getElementById('textLayer' + pageNumber)
       if (hasDoc){
-        await renderTask.promise;
-        return
+        hasDoc.parentNode.removeChild(hasDoc);
+        // await renderTask.promise;
+        // return
       }
       await renderTask.promise.then(() => {
         return page.getTextContent()
@@ -457,7 +480,8 @@ export default {
       this.reloadAllPages(currentScroll);
     },
     reloadAllPages(scrollPosition) {
-      this.pages.forEach((p) => {
+      const pages = Vue.observable(this.pages)
+      pages.forEach((p) => {
         p.loaded = false;
         this.$set(p,'loading',false)
         if (p.canvas) {
@@ -469,7 +493,7 @@ export default {
       const container = this.$refs.pdfContainer;
       this.$nextTick(() => {
         container.scrollTop = scrollPosition;
-        this.initObserver();
+        this.initObserver('changeScale');
         container.scrollTop = container.scrollTop + 1;
         container.scrollTop = container.scrollTop - 1;
       });
@@ -585,28 +609,27 @@ export default {
       this.scrollToHighlight(this.searchHighlights[this.currentSearchIndex]);
     },
     onResize() {
-      this.clearPages();
-      this.loadPdf();
-      // clearTimeout(this.resizeTimeout);
-      // this.resizeTimeout = setTimeout(() => {
-      //   if (this.renderInProgress) return;
-      //   const container = this.$refs.pdfContainer;
-      //   const currentScroll = container.scrollTop;
-      //   this.pages.forEach((p) => {
-      //     p.loaded = false;
-      //     this.$set(p,'loading',false)
-      //     if (p.canvas) {
-      //       const ctx = p.canvas.getContext('2d');
-      //       ctx.clearRect(0,0,p.canvas.width,p.canvas.height);
-      //     }
-      //   });
-      //   this.$nextTick(() => {
-      //     container.scrollTop = currentScroll;
-      //     this.initObserver();
-      //     container.scrollTop = container.scrollTop + 1;
-      //     container.scrollTop = container.scrollTop - 1;
-      //   });
-      // }, 300);
+      clearTimeout(this.resizeTimeout);
+      this.resizeTimeout = setTimeout(() => {
+        if (this.renderInProgress) return;
+        const container = this.$refs.pdfContainer;
+        const currentScroll = container.scrollTop;
+        const pages = Vue.observable(this.pages)
+        pages.forEach((p) => {
+          p.loaded = false;
+          this.$set(p,'loading',false)
+          if (p.canvas) {
+            const ctx = p.canvas.getContext('2d');
+            ctx.clearRect(0,0,p.canvas.width,p.canvas.height);
+          }
+        });
+        this.$nextTick(() => {
+          container.scrollTop = currentScroll;
+          this.initObserver('onResize');
+          container.scrollTop = container.scrollTop + 1;
+          container.scrollTop = container.scrollTop - 1;
+        });
+      }, 300);
     },
   },
   async mounted() {
@@ -658,7 +681,7 @@ export default {
   gap: 10px;
   height: 100%;
   overflow-y: auto;
-  overflow-x: hidden;
+  overflow-x: auto;
   margin: 0 auto;
   position: relative;
   border-radius: 10px;
@@ -679,10 +702,12 @@ export default {
   position: relative;
   display: flex;
   justify-content: center;
+  width: 100%;
 }
 
 .canvas-wrapper {
   position: relative;
+  width: 100%;
 }
 
 /* 在loading时覆盖canvas显示加载动画 */
@@ -716,12 +741,51 @@ canvas {
 
 .button-container {
   display: flex;
-  flex-wrap: wrap;
-  gap: 10px;
-  margin: 10px 0;
   justify-content: center;
 }
+.change_scale {
+  height: 80px;
+  //padding: 10px;
+  width: 32px;
+  border-top-left-radius: 20px;
+  border-bottom-left-radius: 20px;
+  position: absolute;
+  right: 0;
+  top: calc(50% - 40px);
+  //top: 50px;
+  //margin-bottom: 10px;
+  //left: 0;
+  background: #ffffff;
+  border: 1px solid #A1B9FF;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: space-evenly;
+  //padding: 0 10px;
+  box-sizing: border-box;
+  i{
+    color: #366aff;
+    font-size: 20px;
+  }
+  section {
+    cursor: pointer;
+    width: 30px;
+    height: 30px;
+    margin-right: 5px;
+    border-radius: 5px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    i {
+      font-weight: 900;
+    }
+  }
 
+  section:hover {
+    background: rgba(221, 222, 223, 1);
+  }
+}
 .search-nav {
   display: flex;
   align-items: center;

package/src/components/previewPdf.vue

@@ -9,28 +9,38 @@
     :modal="formKnowledgeManagement ? true : false" :direction="previewShowPopup ? 'btt' : 'rtl'" :size="previewShowPopup ? '90%' : '65%'"
     custom-class="pdf-preview-drawer" v-if="drawer">
     <!-- v-else-if="drawer" -->
-    <div class="drawer-header" :class="isLiBang ? 'libang_head' : ''" v-if="!isPc">
-      <div class="header-btn btn_position">
-        <div class="onload_btn" v-if="isDownload" @click="downLoad">
-          下载
-        </div>
-        <div class="summaryBtn" :class="showSummary ? 'summaryActiveBtn' : ''" @click="summaryFun" v-if="isHasChat">
-          <i class="iconfont guoran-tongyichicun-write-29-jiqiren"></i>
-          <span>智能摘要</span>
-        </div>
-        <template v-if="isHasChat">
-          <div class="chat" @click="previewToDialog(true)" v-if="!previewKnowledgeId">
-            <i class="iconfont guoran-wendapingjia"></i>
-            聊一聊
-          </div>
-          <div class="chat chat_active" @click="previewToDialog(false)" v-else>
-            <i class="iconfont guoran-wendapingjia"></i>
-            聊一聊
+    <div class="drawer-header" :class="(isDownload || isHasChat) && isLiBang ? 'has_btn_libang_head' : (isLiBang ? 'libang_head' : (isDownload || isHasChat ? 'has_btn_head' : ''))" v-if="!isPc">
+      <div class="header_title">
+        <template v-if="isDownload || isHasChat">
+          <div class="top-header">
+            <div class="header-btn">
+              <div class="onload_btn" v-if="isDownload" @click="downLoad">
+                下载
+              </div>
+              <div class="summaryBtn" :class="showSummary ? 'summaryActiveBtn' : ''" @click="summaryFun" v-if="isHasChat">
+                <i class="iconfont guoran-tongyichicun-write-29-jiqiren"></i>
+                <span>智能摘要</span>
+              </div>
+              <template v-if="isHasChat">
+                <div class="chat" @click="previewToDialog(true)" v-if="!previewKnowledgeId">
+                  <i class="iconfont guoran-wendapingjia"></i>
+                  聊一聊
+                </div>
+                <div class="chat chat_active" @click="previewToDialog(false)" v-else>
+                  <i class="iconfont guoran-wendapingjia"></i>
+                  聊一聊
+                </div>
+              </template>
+            </div>
+            <section @click="close">
+              <i class="iconfont guoran-shanchu"></i>
+            </section>
           </div>
+          <span class="title_left">
+            {{ title ? title : "查看详情" }}
+          </span>
         </template>
-      </div>
-      <div class="header_title">
-        <div class="header_close">
+        <div class="header_close" v-else>
           <span class="title_left">
             {{ title ? title : '查看详情' }}
           </span>
@@ -116,7 +126,7 @@
         <template v-else>
           <iframe class="preview_iframe_kk" :src="previewUrl" style="border:none;"
             :style="{ height: iframeHeight }"></iframe>
-          <template v-if="(newFileType === 'PPT' && pageChunkData.length > 1)">
+          <template v-if="!loading && (newFileType === 'PPT' && pageChunkData.length > 1)">
             <div class="btn_footer" v-if="!isPc">
               <div class="prev" @click="prev">上一段</div>
               <div class="next" @click="next">下一段</div>
@@ -557,6 +567,7 @@ export default {
       this.newVersion = "";
       this.$http.get('/knowledge-api/knowledge/knowledge-part-location-info/list?ids=' + this.tagIds.join(',')).then(res => {
         console.log('getLocationInfo',res)
+        this.pageChunkData = [];
         if (res.data.code == 0){
           if (res.data.data && res.data.data.length > 0 && res.data.data[0].extractVersion == 'v3'){
             this.newVersion = true;
@@ -570,7 +581,7 @@ export default {
             }
             if (this.pageChunkData.length > 1){
               let iframe = document.getElementsByClassName('preview_iframe_kk')
-              if (iframe){
+              if (iframe && iframe.length > 0){
                 iframe[0].style.paddingBottom = '50px'
               }
             }
@@ -878,7 +889,12 @@ export default {
 .libang_head {
   height: 64px !important;
 }
-
+.has_btn_libang_head{
+  height: 85px!important;
+}
+.has_btn_head{
+  height: 60px!important;
+}
 .drawer-header {
   width: 100%;
   height: 50px;
@@ -972,6 +988,12 @@ justify-content: space-between;
         margin-right: 8px;
       }
     }
+    .top-header{
+      display: flex;
+      align-items: center;
+      justify-content: flex-end;
+      margin-bottom: 6px;
+    }
     .header_floder {
       display: flex;
       align-items: center;