askbot-dragon 88.1.3 → 88.1.5

package/package.json

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

package/src/assets/js/obsBrowser.js

@@ -8,8 +8,8 @@ if (localStorage.getItem('VUE_APP_SOURCE' == 'libang_production')) {
     accessKeyId = "XsVgbg1mDU/xiVxPeNsaIwGmhF+jSZ0ep79YuqOjHk8=";
     accessKeySecret = "nBcMSflABN+A5bsaoaeVVI8FeYRaVXkCVZl2m/aC89Q/0uuWEP1f47W/i1jvNXBF";
 } else {
-    accessKeyId = "6c8a/rXhOM4z0ph78Q09j0J2N+7CKuLA+tt34PvscOI=";
-    accessKeySecret = "dzvV5NBuufJDAckKgGjXbKcLiMhZ67Eoi/4Jt0M7cpYnuPWbL5k/oD0O0U4dRnCI";
+    accessKeyId = "ErivR+YlsAryJl+gJmBKLpQFRW/hRre9JeS+VpbixTY=";
+    accessKeySecret = "qAHB0qmrOyTOiaOch8GyweGTmCx06QVtYOupvb1lUL0prxDuGBMt85VHCjg5/aU8";
 }
 
 async function getDecryptedKeys() {

package/src/components/markDownText.vue

@@ -14,16 +14,16 @@
             <div class="think_content" :class="showThink ? '' : 'hide_think'" v-html="parseThinkVal">
             </div>
         </div>
-        <!-- <vue-markdown 
-            class="mark_down" 
-            :source="typedContent" 
-            :ref="'markdown' + msgId" 
+        <!-- <vue-markdown
+            class="mark_down"
+            :source="typedContent"
+            :ref="'markdown' + msgId"
             @click.native="clickMarkDown"
             :plugins="plugins"
         >
         </vue-markdown> -->
         <!-- v-show="hasContent"  -->
-        <div 
+        <div
             class="mark_down"
             v-html="markParseText"
             ref="markDown"
@@ -39,8 +39,8 @@
 
 <script>
 /* eslint-disable */
-import VueMarkdown from 'vue-markdown';
-import ImgView from "./imgView";
+// import VueMarkdown from 'vue-markdown';
+import ImgView from "./imgView.vue";
 // import Typed from "typed.js";
 import hljs from 'highlight.js';
 import 'highlight.js/styles/default.css';
@@ -128,8 +128,7 @@ export default {
         }
     },
     components: {
-        ImgView,
-        VueMarkdown
+        ImgView
     },
     mounted() {
         this.$nextTick(() => {
@@ -182,7 +181,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 +283,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 +344,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 +369,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 {
@@ -534,7 +553,7 @@ export default {
                 this.imgList.splice(index, 1);
                 this.imgList.unshift(previewImageUrl);
             }
-           
+
         },
         closeViewer() {
             this.showPreview = false;
@@ -591,7 +610,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')