askbot-dragon 1.7.35-beta → 1.7.36-beta

package/package.json

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

package/src/components/AnswerDocknowledge.vue

@@ -361,26 +361,21 @@ export default {
                 this.$refs.previewPdf.previewShowPopup = false;
                 this.$refs.previewPdf.drawer = false;
                 this.previewOssPath = url;
-                // let index = url.lastIndexOf('?')
+                let index = url.lastIndexOf('?')
                 let type = ''
                 let httpUrl = '/knowledge-api/knowledge/getTemporaryCertificate'
-                // if (index !== -1) {
-                //     url = url.substring(0, index)
-                //     type = this.fileType(url)
-                // } else {
-                //     type = this.fileType(url)
-                // }
-                // if (type === '' || type === 'OTHER' || type == 'IMAGE') {
-                //     httpUrl = httpUrl += '?needEncrypt=true'
-                // } else {
-                //     httpUrl = httpUrl += '?needEncrypt=false'
-                // }
-                type = this.getFileType(url)
-                if (type === 'VIDEO' || type === 'PDF' || type === 'EXCEL' || type === 'TXT' || type === 'DOC') {
-                  httpUrl += '?needEncrypt=false'
+                if (index !== -1) {
+                    url = url.substring(0, index)
+                    type = this.fileType(url)
                 } else {
-                  httpUrl += '?needEncrypt=true'
+                    type = this.fileType(url)
                 }
+                if (type === '' || type === 'OTHER' || type == 'IMAGE') {
+                    httpUrl = httpUrl += '?needEncrypt=true'
+                } else {
+                    httpUrl = httpUrl += '?needEncrypt=false'
+                }
+                this.$refs.previewPdf.getOssPath(url);
                 this.$http.post(httpUrl, {
                     "fileInOssPath": url
                 }).then(res => {
@@ -449,31 +444,6 @@ export default {
                 return 'OTHER'
             }
         },
-        getFileType(url){
-          let index = url.lastIndexOf('?')
-          let newFileInOssPath =  url.substring(0, url.indexOf("?"))
-          if (index == -1){
-            newFileInOssPath = url
-          }
-          const fileType = newFileInOssPath.substring(newFileInOssPath.lastIndexOf('.'));
-          if (fileType === '.mp4' || fileType === '.MP4' || fileType === '.MOV' || fileType === '.MOVC' || fileType === '.mov' || fileType === '.movc') {
-            return 'VIDEO'
-          } else if (fileType === '.html') {
-            return 'HTML'
-          } else if (fileType === '.png' || fileType === '.jpg' || fileType === '.jpeg' || fileType === '.PNG' || fileType === '.JPG' || fileType === '.JPEG') {
-            return 'IMAGE'
-          } else if (fileType === '.docx'){
-            return 'DOC'
-          } else if (fileType === '.ppt' || fileType === '.pptx'){
-            return 'PPT'
-          } else if (fileType === '.pdf'){
-            return 'PDF'
-          } else if (fileType === '.txt'){
-            return 'TXT'
-          } else {
-            return 'OTHER'
-          }
-        },
         srcContentTypeIMG (item) {
             let url = item.url || '';
             const type = url.substring(url.lastIndexOf('.'));

package/src/components/preview/pdfView.vue

@@ -598,6 +598,7 @@ export default {
   async mounted() {
     window.addEventListener("resize", this.onResize);
     this.pdfFile = this.ossPath;
+    console.log('ossPath',this.ossPath)
     // this.clearPages();
     // this.loadPdf();
   },
@@ -619,6 +620,14 @@ export default {
       },
       immediate:true,
       deep:true
+    },
+    ossPath:{
+      handler(val){
+        if (val){
+          this.pdfFile = this.ossPath;
+        }
+      },
+      immediate:true
     }
   }
 };

package/src/components/previewPdf.vue

@@ -95,7 +95,7 @@
         <pdfPosition :tagIds="tagIds" :isMessageRecord="isMessageRecord" :textWatermarkStr="textWatermarkStr">
         </pdfPosition>
       </div>
-      <new-position-preview v-else-if="newVersion" :knowledgeId="knowledgeId" :tagIds="tagIds" :url="url"></new-position-preview>
+      <new-position-preview v-else-if="newVersion" :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>
@@ -150,7 +150,8 @@ export default {
           isDownload: false,
           textWatermarkStr:"",
         copy:'',
-      newVersion:''}
+      newVersion:'',
+      previewHref:""}
     },
     mounted() {
       window.addEventListener('message',this.handleIframeMessage,false);
@@ -475,9 +476,52 @@ export default {
     clickFloder() {
       this.$emit('previewClickFloder')
     },
+    getOssPath(url){
+      let httpUrl = '/knowledge-api/knowledge/getTemporaryCertificate';
+      let type = this.getFileType(url)
+      if (type === 'VIDEO' || type === 'PDF' || type === 'EXCEL' || type === 'TXT' || type === 'DOC') {
+        httpUrl += '?needEncrypt=false'
+      } else {
+        httpUrl += '?needEncrypt=true'
+      }
+      this.$http.post(httpUrl, {
+        "fileInOssPath": url
+      }).then(res => {
+        console.log('getOssPath',res)
+        if (res.data.code == '0'){
+          this.previewHref = res.data.data;
+        }
+      })
+    },
+    getFileType(url){
+      let index = url.lastIndexOf('?')
+      let newFileInOssPath =  url.substring(0, url.indexOf("?"))
+      if (index == -1){
+        newFileInOssPath = url
+      }
+      const fileType = newFileInOssPath.substring(newFileInOssPath.lastIndexOf('.'));
+      if (fileType === '.mp4' || fileType === '.MP4' || fileType === '.MOV' || fileType === '.MOVC' || fileType === '.mov' || fileType === '.movc') {
+        return 'VIDEO'
+      } else if (fileType === '.html') {
+        return 'HTML'
+      } else if (fileType === '.png' || fileType === '.jpg' || fileType === '.jpeg' || fileType === '.PNG' || fileType === '.JPG' || fileType === '.JPEG') {
+        return 'IMAGE'
+      } else if (fileType === '.docx'){
+        return 'DOC'
+      } else if (fileType === '.ppt' || fileType === '.pptx'){
+        return 'PPT'
+      } else if (fileType === '.pdf'){
+        return 'PDF'
+      } else if (fileType === '.txt'){
+        return 'TXT'
+      } else {
+        return 'OTHER'
+      }
+    },
     //判断是否使用新定位组件
     getLocationInfo(){
       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;