askbot-dragon 1.7.44-beta → 1.7.45-beta

package/package.json

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

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

package/src/components/preview/pdfView.vue

@@ -1,18 +1,27 @@
 <template>
   <div class="pdfViewPage" id="pdfViewPage">
     <!-- 按钮容器 -->
-    <div class="button-container" v-if="false">
+    <div class="button-container">
+      <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">-->
@@ -64,6 +73,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() {
@@ -170,7 +181,7 @@ export default {
       await this.initPdf();
       this.initObserver();
     },
-    initObserver() {
+    initObserver(type) {
       if (this.observer) {
         this.observer.disconnect();
       }
@@ -203,15 +214,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 +264,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 +471,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 +484,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 +600,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() {
@@ -656,9 +670,9 @@ export default {
   display: flex;
   flex-direction: column;
   gap: 10px;
-  height: 100%;
+  height: calc(100% - 30px);
   overflow-y: auto;
-  overflow-x: hidden;
+  overflow-x: auto;
   margin: 0 auto;
   position: relative;
   border-radius: 10px;
@@ -679,10 +693,12 @@ export default {
   position: relative;
   display: flex;
   justify-content: center;
+  width: 100%;
 }
 
 .canvas-wrapper {
   position: relative;
+  width: 100%;
 }
 
 /* 在loading时覆盖canvas显示加载动画 */
@@ -716,10 +732,39 @@ canvas {
 
 .button-container {
   display: flex;
-  flex-wrap: wrap;
-  gap: 10px;
-  margin: 10px 0;
   justify-content: center;
+  .change_scale {
+    width: 100%;
+    //height: 50px;
+    //position: absolute;
+    //top: 50px;
+    margin-bottom: 10px;
+    left: 0;
+    background: #ffffff;
+    display: flex;
+    align-items: center;
+    //padding: 0 10px;
+    box-sizing: border-box;
+
+    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 {