askbot-dragon 1.6.70 → 1.6.71

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "askbot-dragon",
-  "version": "1.6.70",
+  "version": "1.6.71",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",

package/src/components/preview/docView.vue

@@ -68,8 +68,8 @@ export default {
                       drawer.style.overflowX = 'hidden';
                     }
                     this.$nextTick(() => {
-                      this.setColor();
                       setTimeout(() => {
+                        this.setColor();
                         if (this.textWatermarkStr){
                           newInitWaterMark('docHtml',this.textWatermarkStr)
                         }
@@ -84,11 +84,13 @@ export default {
 
     },
     setColor(){
+      console.debug('split_paragraphs 87',this.fileSuffix,this.split_paragraphs)
       this.split_paragraphs.forEach((item,index) => {
         const colorIndex = index % this.colors.length;
         if (item.original_paragraph){
           item.original_paragraph.forEach(items => {
             let dom = document.getElementById(items.paragraph_id);
+            console.debug('dom 93',dom,this.fileSuffix)
             if (this.fileSuffix === 'TXT' || this.fileSuffix === 'MD'){
               const paragraphs = this.$el.querySelectorAll(`[paragraph-id="${items.paragraph_id}"]`);
               paragraphs.forEach(paragraph => {
@@ -141,8 +143,8 @@ export default {
           drawer.style.overflowX = 'hidden';
         }
         this.$nextTick(() => {
-          this.setColor();
           setTimeout(() => {
+            this.setColor();
             if (this.textWatermarkStr){
               newInitWaterMark('docHtml',this.textWatermarkStr)
             }
@@ -172,8 +174,8 @@ export default {
                 drawer.style.overflowX = 'hidden';
               }
               this.$nextTick(() => {
-                this.setColor();
                 setTimeout(() => {
+                  this.setColor();
                   if (this.textWatermarkStr){
                     newInitWaterMark('docHtml',this.textWatermarkStr)
                   }
@@ -193,8 +195,8 @@ export default {
               drawer.style.overflowX = 'hidden';
             }
             this.$nextTick(() => {
-              this.setColor();
               setTimeout(() => {
+                this.setColor();
                 if (this.textWatermarkStr){
                   newInitWaterMark('docHtml',this.textWatermarkStr)
                 }

package/src/components/preview/newPositionPreview.vue

@@ -196,6 +196,7 @@ export default {
             }
 
           }
+          console.debug('scrollToParagraph',dom,paragraphs,type)
           if (dom){
             dom.scrollIntoView({ behavior: 'smooth' });
           }

package/src/components/previewPdf.vue

@@ -232,6 +232,14 @@ export default {
     isLining:{
       type: Boolean,
       default: false
+    },
+    processEnvUrl:{
+      type: String,
+      default: ''
+    },
+    isProduction:{
+      type: Boolean,
+      default: false
     }
   },
   components: {
@@ -284,11 +292,19 @@ export default {
       }
     },
     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='
+        let url = ""
+        if (this.isProduction){
+          url = "https://kkfileview.askbot.cn/onlinePreview?url="
+        } else {
+          url = "https://test.open.askbot.cn/kkfileview/onlinePreview?url="
+        }
+        if (this.processEnvUrl){
+          url = this.processEnvUrl
+        }
         if(process.env.VUE_APP_SOURCE == 'lining_test') {
             url = 'https://wxgw.lining.com/askbot/kkfileview/onlinePreview?url='
         }
+        console.debug('VUE_APP_ENV', process.env.VUE_APP_ENV,process.env.VUE_APP_SOURCE,url)
       // if(this.url != '') {
       //     if(/[\u4E00-\u9FA5]+/g.test(this.url)) {
       //         url += btoa(encodeURIComponent(this.url))