From 09640319224a3495ed338aa3c38bda6660f24bd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Wed, 13 Dec 2023 15:59:57 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96chat=20=E5=81=9C?=
 =?UTF-8?q?=E6=AD=A2=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development.example                      |  1 -
 .../components/ChitChat/ChatMessage.vue       |  2 +-
 .../components/ChitChat/MessageText.vue       |  6 ++--
 .../Apps/ChatAi/components/ChitChat/index.vue | 32 +++++++++++--------
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/.env.development.example b/.env.development.example
index 6ab370024..409d8e846 100644
--- a/.env.development.example
+++ b/.env.development.example
@@ -23,5 +23,4 @@ VUE_APP_LOGOUT_PATH = '/core/auth/logout/'
 VUE_APP_CORE_HOST = 'http://localhost:8080'
 VUE_APP_CORE_WS = 'ws://localhost:8080'
 VUE_APP_KAEL_HOST = 'http://localhost:8083'
-VUE_APP_KAEL_WS = 'ws://localhost:8083'
 VUE_APP_ENV = 'development'
diff --git a/src/components/Apps/ChatAi/components/ChitChat/ChatMessage.vue b/src/components/Apps/ChatAi/components/ChitChat/ChatMessage.vue
index 3c9d0ec98..762655f33 100644
--- a/src/components/Apps/ChatAi/components/ChitChat/ChatMessage.vue
+++ b/src/components/Apps/ChatAi/components/ChitChat/ChatMessage.vue
@@ -14,7 +14,7 @@
           <span v-if="isSystemError" class="error">
             {{ item.message.content }}
           </span>
-          <span v-else class="text">
+          <span v-else class="chat-text">
             <MessageText :message="item.message" />
           </span>
         </div>
diff --git a/src/components/Apps/ChatAi/components/ChitChat/MessageText.vue b/src/components/Apps/ChatAi/components/ChitChat/MessageText.vue
index e829601a0..01cacc41e 100644
--- a/src/components/Apps/ChatAi/components/ChitChat/MessageText.vue
+++ b/src/components/Apps/ChatAi/components/ChitChat/MessageText.vue
@@ -34,13 +34,13 @@ export default {
   computed: {
     text() {
       const value = this.message?.content || ''
-      if (value) {
-        return this.markdown.render(value)
+      if (value && this.markdown) {
+        return this.markdown?.render(value)
       }
       return value
     }
   },
-  created() {
+  mounted() {
     this.init()
   },
   updated() {
diff --git a/src/components/Apps/ChatAi/components/ChitChat/index.vue b/src/components/Apps/ChatAi/components/ChitChat/index.vue
index 7a57685be..43f825bcd 100644
--- a/src/components/Apps/ChatAi/components/ChitChat/index.vue
+++ b/src/components/Apps/ChatAi/components/ChitChat/index.vue
@@ -14,6 +14,8 @@
         </div>
       </div>
       <ChatMessage v-for="(item, index) in activeChat.chats" :key="index" :item="item" />
+    </div>
+    <div class="input-box">
       <el-button
         v-if="isLoading && socket && socket.readyState === 1"
         round
@@ -22,8 +24,6 @@
         icon="fa fa-stop-circle-o"
         @click="onStopHandle"
       >{{ $tc('common.Stop') }}</el-button>
-    </div>
-    <div class="input-box">
       <ChatInput @send="onSendHandle" />
     </div>
   </div>
@@ -90,11 +90,13 @@ export default {
   },
   methods: {
     initWebSocket() {
+      const { NODE_ENV, VUE_APP_KAEL_HOST } = process.env
       const api = '/kael/chat/system/'
       const protocol = window.location.protocol === 'https:' ? 'wss' : 'ws'
       const path = `${protocol}://${window.location.host}${api}`
-      const localPath = process.env.VUE_APP_KAEL_WS + api
-      const url = process.env.NODE_ENV === 'development' ? localPath : path
+      const index = VUE_APP_KAEL_HOST.indexOf('://')
+      const localPath = protocol + VUE_APP_KAEL_HOST.substring(index, VUE_APP_KAEL_HOST.length) + api
+      const url = NODE_ENV === 'development' ? localPath : path
       createWebSocket(url, this.onWebSocketMessage)
     },
     initChatMessage() {
@@ -176,7 +178,7 @@ export default {
     },
     onStopHandle() {
       this.$axios.post(
-        '/kael/chat/system/interrupt_current_ask/',
+        '/kael/chat/interrupt_current_ask/',
         { id: this.currentConversationId || '' }
       ).finally(() => {
         removeLoadingMessageInChat()
@@ -223,21 +225,23 @@ export default {
     padding: 0 15px;
     overflow-y: auto;
     user-select: text;
-    .stop {
-      position: absolute;
-      bottom: 6px;
-      left: 50%;
-      transform: translateX(-50%);
-      >>> i {
-        margin-right: 4px;
-      }
-    }
   }
   .input-box {
+    position: relative;
     height: 154px;
     padding: 0 15px;
     margin-bottom: 15px;
     border-top: 1px solid #ececec;
   }
+  .stop {
+    position: absolute;
+    top: -36px;
+    left: 50%;
+    z-index: 11;
+    transform: translateX(-50%);
+    >>> i {
+      margin-right: 4px;
+    }
+  }
 }
 </style>