askbot-dragon 1.7.75-beta → 1.7.77-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "askbot-dragon",
-  "version": "1.7.75-beta",
+  "version": "1.7.77-beta",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
@@ -10,9 +10,8 @@
     "vue-markdown": "^2.2.4"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "~4.5.0",
-    "@vue/cli-plugin-eslint": "~4.5.0",
-    "@vue/cli-service": "~4.5.0",
+    "marked": "^4.0.0",
+    "highlight.js": "^11.11.1",
     "audio-loader": "^1.0.3",
     "core-js": "^3.6.5",
     "install": "^0.13.0",
@@ -26,7 +25,9 @@
     "vue-resource": "^1.5.1",
     "vue-video-player": "^5.0.2",
     "weixin-js-sdk": "^1.6.0",
-    "marked": "^12.0.0",
+    "@vue/cli-plugin-babel": "~4.5.0",
+    "@vue/cli-plugin-eslint": "~4.5.0",
+    "@vue/cli-service": "~4.5.0",
     "babel-eslint": "^10.1.0",
     "element-ui": "^2.15.10",
     "eslint": "^6.7.2",

package/src/assets/js/common.js

@@ -216,7 +216,11 @@ function newInitWaterMark(elId, textValue) {
             mask_div.style.position = "absolute";
             //奇偶行错开，这样水印就不对齐，显的不呆板
             mask_div.style.left = x + 20 + "px";
-            mask_div.appendChild(document.createTextNode(defaultSettings.watermark_txt));
+            if(defaultSettings.watermark_txt.startsWith('weWo')){
+                mask_div.innerHTML = `<ww-open-data type="userName" openid="${defaultSettings.watermark_txt}"></ww-open-data>`
+            } else {
+                mask_div.appendChild(document.createTextNode(defaultSettings.watermark_txt));
+            }
 
             mask_div.style.top = y + 10 + "px";
 

package/src/components/AiGuide.vue

@@ -253,7 +253,7 @@ export default {
             }
             return arr;
         },
-        sendAiGuideInfo (recommendType, cell) {
+        sendAiGuideInfo(recommendType, cell) {
             console.log("组件-312-3", recommendType, cell);
             this.$emit('sendAiGuide', recommendType, cell);
         },

package/src/components/formTemplate.vue

@@ -2078,14 +2078,24 @@ export default {
 
         }
         let isRequired = true;
-        if (this.mainId == '3e83057a1bd74b79b86859ad619fdbbb' || this.mainId == 'ab0f90737c8b4f2d85ba2157e4473110' || this.mainId == '86dc09da570948d2b4841122d732f373') {
+        if (this.mainId == '3e83057a1bd74b79b86859ad619fdbbb' || 
+            this.mainId == 'ab0f90737c8b4f2d85ba2157e4473110' || 
+            this.mainId == '86dc09da570948d2b4841122d732f373' ||
+            this.mainId == 'e93c327548c94b15a4b2b71bc613ef38' // 银轮主体 id
+        ) {
           isRequired = false
         }
         /*针对蒙牛企业在对话中系统名称字段暂时不做校验*/
+        /* 2025.0228 补充银轮主体相同逻辑 */
         if (this.formShow.form.formFieldRelation[i].display &&
           (this.formShow.form.formFieldRelation[i].required || this.isRequiredFn(this.formShow.form.formFieldRelation[i].formField)) &&
           this.formShow.form.formFieldRelation[i].fieldId !== 'workorder_name' &&
-          ((!isRequired && this.formShow.form.formFieldRelation[i].fieldId !== '0feca81fce97465da537248c066e4db8' && this.formShow.form.formFieldRelation[i].fieldId !== '1d8bd21485834773a6d18eae60013000') || isRequired) &&
+          (
+            (!isRequired && 
+                this.formShow.form.formFieldRelation[i].fieldId !== '0feca81fce97465da537248c066e4db8' && 
+                this.formShow.form.formFieldRelation[i].fieldId !== '1d8bd21485834773a6d18eae60013000' &&
+                this.formShow.form.formFieldRelation[i].fieldId !== '0ca7253561bb480cac9e57664e52158b'
+            ) || isRequired) &&
           this.formShow.form.formFieldRelation[i].formField.type !== 'EXPLANATION') {
           let value = "";
           let bool = {}

package/src/components/markDownText.vue

@@ -182,7 +182,9 @@ export default {
                 clearInterval(this.thinkTimer)
                 this.thinkTimer = null
                 this.thinkEnd = true
-                this.removeLoadingNode()
+                setTimeout(() => {
+                    this.removeLoadingNode()
+                }, 200)
                 this.$emit("streamCallback", this.typedContent)
                 this.$emit("sseOtherInfo", this.msgId, "start", "");
             }, 200);
@@ -282,7 +284,7 @@ export default {
             this.$emit("answerDocKnowledgeFn");
             this.eventSource = new EventSource(url);
             this.$emit("streamStatus", true, this.msgId);
-            this.$set(this, 'showThink', true);
+            // this.$set(this, 'showThink', true);
             this.signSetFlag = false;
             this.thinkEnd = false
             let tempString = "";
@@ -343,7 +345,9 @@ export default {
                             this.$emit("streamCallback", this.typedContent)
                             this.$emit("streamStatus", false, this.msgId);
                             this.appendCopyBtn()
-                            this.removeLoadingNode()
+                            setTimeout(() => {
+                                this.removeLoadingNode()
+                            }, 200);
                             this.$emit("sseOtherInfo", this.msgId, "start", "");
                         }
 
@@ -366,6 +370,22 @@ export default {
                     recommendItems = data;
                 } else if (event.lastEventId === 'retry') {
                     this.retryUrl = data.content;
+                } else if (event.lastEventId === 'generated_image') {
+                    let imgs = JSON.parse(data.content);
+                    let imgsStr = "";
+                    for (let i = 0; i < imgs.length; i++) {
+                        imgsStr += `![](${imgs[i].oss_url})`;
+                    }
+                    this.$set(this, "typedContent", this.typedContent + imgsStr);
+
+                    // 模拟图片推送
+                    // let imgs = JSON.parse('[{"oss_url":"https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com/generated-img/generated_img_865652a94b374337b2ac703466cdea94.png"}]');
+                    // let imgsStr = "";
+                    // for (let i = 0; i < imgs.length; i++) {
+                    //     imgsStr += `![](${imgs[i].oss_url})`;
+                    // }
+                    // this.$set(this, "typedContent", this.typedContent + imgsStr);
+
                 }  else if (event.lastEventId === 'source') {
                     this.$emit("changedHeadStatusValue", this.msgId, data);
                 }  else {
@@ -591,7 +611,7 @@ export default {
             let codeList = doc.querySelectorAll('pre code')
             codeList.forEach(ele =>{
                 let list = ele.getElementsByClassName("code_copy_btn")
-                if(list.length == 0 && ele.classList.contains("hljs")) {
+                if(list.length == 0 && ele.classList.contains("hljs") && !ele.classList.contains("hljs-undefined")) {
                     let text = ele.innerText
                     let btnId = uuidv4();
                     let copy = document.createElement('div')

package/src/components/preview/excelView.vue

@@ -163,9 +163,17 @@ export default {
             newDom.forEach(doms => {
               doms.style.backgroundColor = this.colors[0];
             })
-            newDom[0].scrollIntoView({ behavior: "smooth"})
+            const bodyWrapper = this.$refs.table.$el.querySelector('.el-table__body-wrapper');
+            const targetRow = this.$refs.table.$el.querySelector('.setBgClass' + rowId); // 获取目标行元素
+            const targetHeight = targetRow.offsetTop; // 目标行的高度（从上到下的距离）
+            bodyWrapper.scroll({
+              top:targetHeight,
+              behavior:"smooth"
+            }); // 滚动到目标行位置
+
+            // newDom[0].scrollIntoView({ behavior: "smooth"})
           }
-        },500)
+        },800)
       });
     },
     handleCurrentChange(val){

package/src/components/previewPdf.vue

@@ -177,132 +177,130 @@ export default {
       currentPage: 0
     }
   },
-    mounted() {
-      this.$i18n.locale = sessionStorage.getItem("systemLanguage") || 'cn';
-      window.addEventListener('message', this.handleIframeMessage, false);
-      this.isPcFun();
-    },
-    props: {
+  mounted () {
+    this.$i18n.locale = sessionStorage.getItem("systemLanguage") || 'cn';
+    window.addEventListener('message', this.handleIframeMessage, false);
+    this.isPcFun();
+  },
+  props: {
       url: {
-        type: String,
-        required: true,
+          type: String,
+          required: true,
       },
       officePreviewType: {
-        type: String,
-        default: ''
+          type: String,
+          default: ''
       },
       isMessageRecord: {
-        type: Boolean,
-        default: false,
+          type: Boolean,
+          default: false,
       },
       sourceFileType: {
-        type: String,
-        default: '',
+          type: String,
+          default: '',
       },
       title: {
-        type: String,
-        default: ''
+          type: String,
+          default: ''
       },
       isHasChat: {
-        type: Boolean,
-        default: false
+          type: Boolean,
+          default: false
       },
       knowledgeId: {
-        type: String,
-        default: '',
+          type: String,
+          default: '',
       },
       previewOssPath: {
-        type: String,
-        default: '',
+          type: String,
+          default: '',
       },
       folderName: {
-        type: String,
-        default: '',
+          type: String,
+          default: '',
       },
       folderUrl: {
-        type: String,
-        default: '',
+          type: String,
+          default: '',
       },
       isLiBang: {
-        type: Boolean,
-        default: false
+          type: Boolean,
+          default: false
       },
       formKnowledgeManagement: {
-        type: Boolean,
-        default: false
-      }
-    },
+          type: Boolean,
+          default: false
+      },
+      mainId: {
+          type: String,
+          default: ''
+      },
+      userId: {
+          type: String,
+          default: ''
+      },
+  },
     components: {
-      NewPositionPreview,
-      IntelligentSummary,
-      pdfPosition
+        NewPositionPreview,
+        IntelligentSummary,
+        pdfPosition
     },
-    watch: {
-      drawer(value) {
-        if (value) {
-          this.$emit('open')
-          this.$nextTick(() => {
-            if (this.tagIds && this.tagIds.length != 0) {
-              zoomElement(document.getElementById('pdf_container_view'))
-            }
-          })
-        } else {
-          this.$emit('close')
-        }
-        setTimeout(() => {
-          let previewIframe = document.getElementsByClassName('preview_iframe')
-          Array.from(previewIframe).forEach(item => {
-            item.onload = () => {
-              console.debug('previewIframe 106', previewIframe, this.drawer)
-              item.style.backgroundImage = 'none'
-            }
-          })
+  watch: {
+    drawer (value) {
+      if (value) {
+        this.$emit('open')
+        this.$nextTick(() => {
+          zoomElement(document.getElementById('drawer_content_pre'))
         })
-      },
-      showSummary: {
-        handler(val) {
-          // 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();
-          }
-        }
-      },
-      knowledgeId: {
-        handler(val) {
-          if (val) {
-            this.getTextWatermark();
-          }
-        }
+      } else {
+        this.$emit('close')
       }
     },
-    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='
-        // if(this.url != '') {
-        //     if(/[\u4E00-\u9FA5]+/g.test(this.url)) {
-        //         url += btoa(encodeURIComponent(this.url))
-        //     } else {
-        //         url += btoa(this.url)
+    showSummary: {
+      handler (val) {
+        // if (!val){
+        //   this.$nextTick(() => {
+        //     let preCon = document.querySelector('.pdf_view');
+        //     if (preCon){
+        //       preCon.style.height = 'calc(100% - ' + 50 + 'px)'
         //     }
+        //   })
+        // } else {
+        //   this.getSummarySuccess();
         // }
-        url = url + this.url
+        if (val) {
+          this.getSummarySuccess();
+        }
+      }
+    },
+    knowledgeId: {
+      handler (val) {
+        if (val) {
+          this.getTextWatermark();
+        }
+      }
+    }
+  },
+  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='
+      // if(this.url != '') {
+      //     if(/[\u4E00-\u9FA5]+/g.test(this.url)) {
+      //         url += btoa(encodeURIComponent(this.url))
+      //     } else {
+      //         url += btoa(this.url)
+      //     }
+      // }
+      url = url + this.url
+      if (this.sourceFileType == '.ppt' || this.sourceFileType == '.pptx' || this.sourceFileType == '.pdf') {
         url += '&officePreviewType=pdf'
         if (this.watermark) {
           url = this.watermark.textWatermarkValue ? (url += '&textWatermarkValue=' + this.watermark.textWatermarkValue) : url
@@ -343,7 +341,14 @@ export default {
             iframe.onload = () => {
               this.loading = false;
               document.getElementById('drawer_content_pre').style.backgroundImage = 'none'
-            }
+            window.postMessage({
+                type: "wx_bind",
+                data: {
+                    mainId: sessionStorage.getItem('_mainId'),
+                    userId: sessionStorage.getItem('_currentUserId'),
+                    test: process.env.VUE_APP_ENV !== 'production'
+                }
+            }, '*')}
           }
           // let time = setInterval(() =>{
           //