askbot-dragon 1.7.74-beta → 1.7.75-beta

package/package.json

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

package/src/components/markDownText.vue

@@ -22,13 +22,12 @@
             :plugins="plugins"
         >
         </vue-markdown> -->
+        <!-- v-show="hasContent"  -->
         <div 
-            v-show="hasContent" 
             class="mark_down"
             v-html="markParseText"
             ref="markDown"
             @click="clickMarkDown">
-
         </div>
         <!-- <div v-show="!hasThinkValue && !hasContent" class="blinking-cursor"></div> -->
         <div v-if="showPreview">
@@ -41,16 +40,17 @@
 <script>
 /* eslint-disable */
 import VueMarkdown from 'vue-markdown';
-import ImgView from "./imgView";
+import ImgView from "@/components/imgView";
 // import Typed from "typed.js";
 import hljs from 'highlight.js';
 import 'highlight.js/styles/default.css';
-const marked = require("marked")
 import { v4 as uuidv4 } from "uuid";
+const marked = require("marked")
 export default {
     name: "markDownText",
     data() {
         return {
+            eventSource: null,
             plugins: [
 
             ],
@@ -124,7 +124,7 @@ export default {
             let str = this.chainThinkValue;
             str = str.replaceAll("\\n", "\n")
             str = str.replaceAll("\n", "<br>")
-            return str
+            return this.parseCode(str)
         }
     },
     components: {
@@ -169,6 +169,24 @@ export default {
         })
     },
     methods: {
+        closeMessageStream() {
+            this.eventSource.close();
+            setTimeout(() => {
+                let str = this.typedContent + this.generatingString
+                this.$set(this, "typedContent", str)
+                this.generatingString = "";
+                let str2 = this.filterText(this.chainThinkValue + this.generatingThinkString)
+                this.$set(this, "chainThinkValue", str2)
+                this.generatingThinkString = "";
+                this.closeTimeOut()
+                clearInterval(this.thinkTimer)
+                this.thinkTimer = null
+                this.thinkEnd = true
+                this.removeLoadingNode()
+                this.$emit("streamCallback", this.typedContent)
+                this.$emit("sseOtherInfo", this.msgId, "start", "");
+            }, 200);
+        },
         filterTime(time) {
             if (time < 60) {
                 return time + " 秒";
@@ -249,9 +267,10 @@ export default {
         },
         scrollMarkdown() {
             !this.isManualScroll && this.$nextTick(() => {
-                const element = document.getElementById('el_id_markdown_' + this.msgId);
-                if (element) {
-                    element.scrollIntoView({ behavior: 'smooth', block: 'start' });
+                let container = document.getElementById("list");
+                if (container) {
+                    let scrollHeight = container.scrollHeight;
+                    container.scrollTop = scrollHeight;
                 }
             });
         },
@@ -260,7 +279,9 @@ export default {
             if(this.retryUrl == ""){
                 this.$emit("sseOtherInfo", this.msgId, "init", "");
             }
-            const eventSource = new EventSource(url);
+            this.$emit("answerDocKnowledgeFn");
+            this.eventSource = new EventSource(url);
+            this.$emit("streamStatus", true, this.msgId);
             this.$set(this, 'showThink', true);
             this.signSetFlag = false;
             this.thinkEnd = false
@@ -277,7 +298,7 @@ export default {
             let hasN = false; // 标记是否有 n
             const thinkStartRegex = /<think>/;
             const thinkEndRegex = /<\/think>/
-            eventSource.onmessage = (event) => {
+            this.eventSource.onmessage = (event) => {
                 const data = JSON.parse(event.data);
                 if (event.lastEventId === 'finish') { // 不能删除 finish
                     console.log("finish+++++");
@@ -320,11 +341,14 @@ export default {
                                 this.thinkEnd = true
                             }
                             this.$emit("streamCallback", this.typedContent)
+                            this.$emit("streamStatus", false, this.msgId);
                             this.appendCopyBtn()
+                            this.removeLoadingNode()
+                            this.$emit("sseOtherInfo", this.msgId, "start", "");
                         }
 
                     }, 100);
-                    eventSource.close();
+                    this.eventSource.close();
                     // 重试地址不为空，说明需要重试
                     console.log("需要重试 this.retryUrl: ", this.retryUrl);
                     if (this.retryUrl != "") {
@@ -342,27 +366,32 @@ export default {
                     recommendItems = data;
                 } else if (event.lastEventId === 'retry') {
                     this.retryUrl = data.content;
+                }  else if (event.lastEventId === 'source') {
+                    this.$emit("changedHeadStatusValue", this.msgId, data);
                 }  else {
                     // console.log("start event.lastEventId: ", event.lastEventId);
                     // 设置当前知识答案id，用于loading取消和展示
                     this.$emit("sseOtherInfo", this.msgId, "start", "");
-
-                    // // 前置结束的校验，如果校验到闭合标签，标记为 false ，数据不再添加到 chainThinkValue 字段
-
-                    // 后置开始标签的校验，如果校验到结束后，又校验到开始，则开启数据添加到 chainThinkValue 字段
-                    // 最终根据规则是以最后一个 </think> 标识当前深度思考结束，开始正常添加数据到 typedContent
-                    if (thinkStartRegex.test(data.content)) {
-                        if (this.thinkCount == 0) {
-                            this.thinkCount = 0
-                        } else {
-                            this.thinkCount += 1;
-                        }
+                    if(thinkStartRegex.test(data.content) && thinkEndRegex.test(data.content)) {
                         this.hasThinkValue = true;
-                        // this.streamThinkValueAddFlag = true;
-                    }
-                    if (thinkEndRegex.test(data.content)) {
-                        this.thinkCount -= 1;
-                        // this.streamThinkValueAddFlag = false;
+                        this.thinkCount = 0
+                        this.ThinkTime()
+                    } else {
+                        // 最终根据规则是以最后一个 </think> 标识当前深度思考结束，开始正常添加数据到 typedContent
+                        if (thinkStartRegex.test(data.content)) {
+                            if (this.thinkCount == 0) {
+                                this.thinkCount = 0
+                            } else {
+                                this.thinkCount += 1;
+                            }
+                            this.hasThinkValue = true;
+                            this.ThinkTime()
+                            // this.streamThinkValueAddFlag = true;
+                        }
+                        if (thinkEndRegex.test(data.content)) {
+                            this.thinkCount -= 1;
+                            // this.streamThinkValueAddFlag = false;
+                        }
                     }
                     // 字符串中存在特定字符，本次接收消息暂不展示
                     if (backslashOrNRegex.test(data.content) && !this.hasThinkValue) {
@@ -394,15 +423,26 @@ export default {
                             isFirstStr = false;
                             this.timer = 0;
                             this.openTimeOutSetVal()
-                            this.$emit("answerDocKnowledgeFn");
                         }
                     }
                 }
             };
-            eventSource.onerror = function (err) {
-                console.error('EventSource failed:', err);
-                this.typedContent += '\nError receiving data from server.\n';
-                eventSource.close();
+            this.eventSource.onerror =  (err) => {
+                this.typedContent += `\n${this.$t("dragonCommon.eventSourceError")}\n`;
+                this.closeTimeOut()
+                this.$emit("streamStatus", false, this.msgId);
+                this.$emit("streamErrorCallBack", this.msgId);
+                this.$emit("streamCallback", this.typedContent)
+                if(this.eventSource) {
+                    try {
+                        this.eventSource.close();
+                    } catch (e) {
+                        console.error('EventSource close failed:', e);
+                    }
+                }
+                setTimeout(() => {
+                    this.removeLoadingNode()
+                }, 200);
             };
         },
         openTimeOutSetVal() {
@@ -524,8 +564,28 @@ export default {
                 block.setAttribute('target', '_blank');
                 block.setAttribute('rel', 'noopener noreferrer');
             });
+            let node = this.getLastNode(doc)
+            if (node && !this.isHistory) {
+                let loading = document.createElement('span')
+                loading.classList.add("loading-circle")
+                loading.id = "loading-circle"
+                this.removeLoadingNode()
+                node.appendChild(loading)
+            }
             return doc.documentElement.outerHTML
         },
+        removeLoadingNode() {
+            let old = document.getElementById("loading-circle")
+            if(old) old.remove()
+        },
+        getLastNode(node) {
+            let filterList = ["STRONG", "BR", "SPAN", "I", "EM", "B", "A"]
+            if(node.lastElementChild && !filterList.includes(node.lastElementChild.tagName)) {
+                return this.getLastNode(node.lastElementChild)
+            } else {
+                return node
+            }
+        },
         appendCopyBtn() {
             let doc = this.$refs.markDown.$el ? this.$refs.markDown.$el : this.$refs.markDown
             let codeList = doc.querySelectorAll('pre code')
@@ -623,6 +683,11 @@ export default {
             // 移除临时的 textarea
             document.body.removeChild(textArea);
         },
+    },
+    beforeDestroy() {
+        if (this.eventSource) {
+            this.eventSource.close();
+        }
     }
 };
 </script>
@@ -845,4 +910,31 @@ export default {
         min-width: 100px;
     }
 }
+
+/* 圆圈的样式 */
+/deep/.loading-circle {
+    width: 8px;
+    height: 8px;
+    display: inline-block;
+    border-radius: 50%;
+    background-color: #366aff;
+    animation: loading 2s infinite ease-in-out;
+    margin: 0 8px;
+    /* 动画控制 */
+}
+
+/* 放大缩小的动画 */
+@keyframes loading {
+
+    0%,
+    100% {
+        transform: scale(1);
+        /* 原始大小 */
+    }
+
+    50% {
+        transform: scale(1.5);
+        /* 放大 */
+    }
+}
 </style>