askbot-dragon 1.6.59-beta → 1.6.62-beta

package/package.json

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

package/src/components/pdfPosition.vue

@@ -1,9 +1,5 @@
 <template>
-    <div class="pdf_view" id="pdf_view" :style="{
-        marginTop: isPC ? '50px' : '',
-        marginBottom: tagIds.length > 1 ? '60px' : '0px',
-        height: setHeight
-    }">
+    <div class="pdf_view" id="pdf_view">
         <div class="change_scale" v-if="isPC">
             <section @click="changeScale('reduce')">
                 <i class="el-icon-minus"></i>
@@ -30,8 +26,11 @@
         </div>
     </div>
 </template>
-
 <script>
+// :style="{
+//     marginBottom: tagIds.length > 1 ? '60px' : '0px',
+//     height: setHeight
+// }"
 import _ from 'lodash'
 import { newInitWaterMark } from "../assets/js/common";
 // import * as pdfjsLib from 'pdfjs-dist'
@@ -1275,7 +1274,8 @@ export default {
 <style lang="less" scoped>
 .pdf_view {
     width: 100%;
-    height: calc(100% - 110px);
+    // height: calc(100% - 110px);
+    height: 100%;
     overflow: auto;
     //overflow-y: scroll;
     background-color: #f5f7fb;

package/src/components/previewPdf.vue

@@ -45,7 +45,7 @@
       :with-header="false"
       :append-to-body="true"
       :destroy-on-close="true"
-      :model="false"
+      :modal="false"
       :direction="previewShowPopup ? 'btt' : 'rtl'"
       :size="previewShowPopup ? '90%' : '65%'"
       custom-class="pdf-preview-drawer"
@@ -90,9 +90,9 @@
           @getSummarySuccess="getSummarySuccess"
           :style="{marginTop:tagIds && tagIds.length != 0 && isPc ? '50px' : ''}"
       ></intelligent-summary>
-      <template v-if="tagIds && tagIds.length != 0 && drawer">
-        <pdfPosition :tagIds="tagIds" :isMessageRecord="isMessageRecord" :fileName="fileName" :textWatermarkStr="textWatermarkStr"  ref="pdfPosition"></pdfPosition>
-      </template>
+      <div class="pdf_positon" :style="pdfStyle" v-if="tagIds && tagIds.length != 0 && drawer">
+        <pdfPosition :tagIds="tagIds" :isMessageRecord="isMessageRecord" :textWatermarkStr="textWatermarkStr"></pdfPosition>
+      </div>
       <template v-else>
         <div v-if="fileType == 'VIDEO'" style="width: 100%;">
           <video :src="url" controls width="100%;" height="98%"></video>
@@ -175,7 +175,7 @@ export default {
         },
         isHasChat:{
             type:Boolean,
-          default:false
+          default:true
         },
         knowledgeId:{
           type: String,
@@ -214,14 +214,17 @@ export default {
       },
       showSummary:{
         handler(val){
-          if (!val){
-            this.$nextTick(() => {
-              let preCon = document.querySelector('.pdf_view');
-              if (preCon){
-                preCon.style.height = 'calc(100% - ' + 50 + 'px)'
-              }
-            })
-          } else {
+          // if (!val){
+          //   this.$nextTick(() => {
+          //     let preCon = document.querySelector('.pdf_view');
+          //     if (preCon){
+          //       preCon.style.height = 'calc(100% - ' + 50 + 'px)'
+          //     }
+          //   })
+          // } else {
+          //   this.getSummarySuccess();
+          // }
+          if(val) {
             this.getSummarySuccess();
           }
         }
@@ -235,6 +238,13 @@ export default {
       }
     },
     computed:{
+        pdfStyle() {
+          return {
+            paddingTop: this.isPc ? '30px' : '0', // 30px 是 加上外层的 20 流出 50的上边距展示 放大缩小操作栏
+            paddingBottom: this.tagIds > 1 ? '60px' : '0',
+            height: '100%'
+          }
+        },
         previewUrl() {
             console.debug('VUE_APP_ENV',process.env.VUE_APP_ENV)
             let url = process.env.VUE_APP_ENV === 'production' ? 'https://kkfileview.askbot.cn/onlinePreview?url=' : 'https://test.open.askbot.cn/kkfileview/onlinePreview?url='
@@ -304,7 +314,7 @@ export default {
             }).then(res =>{
                 if (res.data.code == 0) {
                     this.fileText = res.data.data
-                    this.loading = false 
+                    this.loading = false
 				}
             })
         },
@@ -335,17 +345,20 @@ export default {
       },
       getSummarySuccess(){
         this.$nextTick(() => {
-          if (this.tagIds.length > 0){
-            let intelligentSummary = document.getElementById('intelligentSummary');
-            let preCon = document.querySelector('.pdf_view')
-            if (intelligentSummary){
-              let height = intelligentSummary.offsetHeight + (this.isPc ? 100 : 50 );
-              if (preCon){
-                preCon.style.height = 'calc(100% - ' + height + 'px)'
-              }
-              console.log('height',height,preCon)
-            }
-          }
+          // if (this.tagIds.length > 0){
+          //   let intelligentSummary = document.getElementById('intelligentSummary');
+          //   let preCon = document.querySelector('.pdf_view')
+          //   if (intelligentSummary){
+          //     let height = intelligentSummary.offsetHeight + (this.isPc ? 100 : 50 );
+          //     if (preCon){
+          //       preCon.style.height = 'calc(100% - ' + height + 'px)'
+          //     }
+          //     console.log('height',height,preCon)
+          //   }
+          // }
+          let intelligentSummary = document.getElementById('intelligentSummary');
+          let height = intelligentSummary.offsetHeight
+          this.pdfStyle.height = 'calc(100% - ' + height + 'px)'
         })
       },
       getTextWatermark(){
@@ -462,6 +475,10 @@ export default {
     border-right: none;
     text-align: center;
   }
+  .pdf_positon {
+    width: 100%;
+    box-sizing: border-box;
+  }
 }
 .onload_btn {
   width: 80px;
@@ -632,7 +649,7 @@ export default {
   }
 }
 
-@media screen and (min-width: 1350px) {
+@media screen and (min-width: 1200px) {
 /* 这里是针对pc设备的css样式设置 */
   .el-drawer__wrapper {
     width: 55%;
@@ -651,4 +668,4 @@ export default {
     background: #FFF;
   }
 }
-</style>
+</style>

package/src/components/welcomeKnowledgeFile.vue

@@ -41,6 +41,8 @@
                     officePreviewType="pdf"
                     @previewToDialog="previewToDialog"
                     @recommendQues="recommendQues"
+                    @close="close"
+                    @open="open"
                     :isHasChat="isHasChat"
                     :knowledgeId="previewKnowledgeId"
         ></previewPdf>
@@ -198,20 +200,26 @@ export default {
                 }
             })
         },
-      previewToDialog(flag){
-        if (!flag){
-          this.$refs.previewPdf.previewKnowledgeId = ""
-        } else {
-          this.$refs.previewPdf.previewKnowledgeId = this.previewKnowledgeId
-        }
-        this.$emit('previewToDialog',flag,this.previewKnowledgeId,this.previewKnowledge)
-      },
-      clearKnowledgeId(){
-        this.previewKnowledgeId = "";
-      },
-      recommendQues(item,knowledgeId){
-        this.$emit('recommendQues',item,knowledgeId)
-      }
+        previewToDialog(flag){
+            if (!flag){
+            this.$refs.previewPdf.previewKnowledgeId = ""
+            } else {
+            this.$refs.previewPdf.previewKnowledgeId = this.previewKnowledgeId
+            }
+            this.$emit('previewToDialog',flag,this.previewKnowledgeId,this.previewKnowledge)
+        },
+        clearKnowledgeId(){
+            this.previewKnowledgeId = "";
+        },
+        recommendQues(item,knowledgeId){
+            this.$emit('recommendQues',item,knowledgeId)
+        },
+        open() {
+            this.$emit('openPreviewDialog')
+        },
+        close() {
+            this.$emit('closePreviewDialog')
+        },
     }
 };
 </script>