From b0cefb05e005c445c67f528955cf81c313fb3cc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Tue, 12 Dec 2023 19:45:21 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96chat=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development.example                       |  1 +
 .../Apps/ChatAi/components/ChitChat/index.vue  | 14 ++++----------
 .../Apps/ChatAi/components/Sidebar/index.vue   | 18 +++++++++++++++---
 src/components/Apps/ChatAi/index.vue           |  2 +-
 src/components/Apps/DrawerPanel/index.vue      |  3 +++
 src/i18n/langs/en.json                         |  1 +
 src/i18n/langs/ja.json                         |  1 +
 src/i18n/langs/zh.json                         |  1 +
 vue.config.js                                  |  5 +++++
 9 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/.env.development.example b/.env.development.example
index b7ca77488..6ab370024 100644
--- a/.env.development.example
+++ b/.env.development.example
@@ -22,5 +22,6 @@ VUE_APP_LOGOUT_PATH = '/core/auth/logout/'
 # Dev server for core proxy
 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/index.vue b/src/components/Apps/ChatAi/components/ChitChat/index.vue
index c8d856eb0..7a57685be 100644
--- a/src/components/Apps/ChatAi/components/ChitChat/index.vue
+++ b/src/components/Apps/ChatAi/components/ChitChat/index.vue
@@ -90,9 +90,10 @@ export default {
   },
   methods: {
     initWebSocket() {
+      const api = '/kael/chat/system/'
       const protocol = window.location.protocol === 'https:' ? 'wss' : 'ws'
-      const path = `${protocol}://${window.location.host}/kael/chat/system/`
-      const localPath = process.env.VUE_APP_KAEL_WS + '/kael/chat/system/'
+      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
       createWebSocket(url, this.onWebSocketMessage)
     },
@@ -174,15 +175,8 @@ export default {
       }
     },
     onStopHandle() {
-      const { protocol, host } = window.location
-      const { NODE_ENV, VUE_APP_KAEL_WS } = process.env || {}
-      const api = '/kael/chat/system/interrupt_current_ask/'
-      const path = `${protocol}://${host}`
-      const index = VUE_APP_KAEL_WS.indexOf('//')
-      const localPath = protocol + VUE_APP_KAEL_WS.substring(index, VUE_APP_KAEL_WS.length) + api
-      const url = NODE_ENV === 'development' ? localPath : path
       this.$axios.post(
-        url,
+        '/kael/chat/system/interrupt_current_ask/',
         { id: this.currentConversationId || '' }
       ).finally(() => {
         removeLoadingMessageInChat()
diff --git a/src/components/Apps/ChatAi/components/Sidebar/index.vue b/src/components/Apps/ChatAi/components/Sidebar/index.vue
index 063be26d1..5a8d5ba4e 100644
--- a/src/components/Apps/ChatAi/components/Sidebar/index.vue
+++ b/src/components/Apps/ChatAi/components/Sidebar/index.vue
@@ -1,12 +1,16 @@
 <template>
   <div class="container">
     <div class="top">
-      <svg-icon icon-class="collapse" @click="onClose" />
+      <el-tooltip effect="dark" placement="left" :content="$tc('common.CollapseSidebar')">
+        <svg-icon icon-class="collapse" @click="onClose" />
+      </el-tooltip>
     </div>
     <el-tabs v-model="active" :tab-position="'right'" @tab-click="handleClick">
-      <el-tab-pane v-for="(item) in submenu" :key="item.name" :label="item.label" :name="item.name">
+      <el-tab-pane v-for="(item) in submenu" :key="item.name" :name="item.name">
         <span slot="label">
-          <svg-icon :icon-class="item.icon" />
+          <el-tooltip effect="dark" placement="left" :content="item.label">
+            <svg-icon :icon-class="item.icon" />
+          </el-tooltip>
         </span>
       </el-tab-pane>
     </el-tabs>
@@ -50,12 +54,20 @@ export default {
     font-size: 14px;
     padding: 14px 0;
     cursor: pointer;
+    >>> .svg-icon {
+      &:hover {
+        color: #7b8085;
+      }
+    }
   }
 }
 >>> .el-tabs {
   .el-tabs__item {
     padding: 0 13px;
     font-size: 15px;
+    :hover {
+      color: #7b8085;
+    }
   }
 }
 </style>
diff --git a/src/components/Apps/ChatAi/index.vue b/src/components/Apps/ChatAi/index.vue
index 9086ae7df..5e2a31dba 100644
--- a/src/components/Apps/ChatAi/index.vue
+++ b/src/components/Apps/ChatAi/index.vue
@@ -48,7 +48,7 @@ export default {
       submenu: [
         {
           name: 'chat',
-          label: 'chat',
+          label: this.$t('common.Chat'),
           icon: 'chat'
         }
       ]
diff --git a/src/components/Apps/DrawerPanel/index.vue b/src/components/Apps/DrawerPanel/index.vue
index 4bd743ed0..dfeb8c380 100644
--- a/src/components/Apps/DrawerPanel/index.vue
+++ b/src/components/Apps/DrawerPanel/index.vue
@@ -196,6 +196,9 @@ export default {
     // left: -52px !important;
     // width: 52px !important;
     background-color: rgba(182, 181, 186, .9);
+    img {
+      filter: grayscale(1);
+    }
   }
   i {
     font-size: 20px;
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index fbbcb491c..bc485651f 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -740,6 +740,7 @@
     "Reconnect": "Reconnect",
     "NewChat": "New Chat",
     "Chat": "Chat",
+    "CollapseSidebar": "Collapse the sidebar",
     "introduction": {
       "ConceptTitle": "🤔 Explain a complex concept",
       "ConceptContent": "Tell me something about the Big Bang so that I can explain it to my 5-year-old child",
diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json
index 0ed456e7b..3c6725e25 100644
--- a/src/i18n/langs/ja.json
+++ b/src/i18n/langs/ja.json
@@ -741,6 +741,7 @@
     "Reconnect": "再接続",
     "NewChat": "新しいチャット",
     "Chat": "チャット",
+    "CollapseSidebar": "サイドバーを閉じる",
     "introduction": {
       "ConceptTitle": "🤔 複雑な概念を説明する",
       "ConceptContent": "ビッグバンについて教えてください。5歳の子供に説明することができます",
diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json
index 11b4f2445..a2e0a9b5e 100644
--- a/src/i18n/langs/zh.json
+++ b/src/i18n/langs/zh.json
@@ -792,6 +792,7 @@
     "Reconnect": "重新连接",
     "NewChat": "新聊天",
     "Chat": "聊天",
+    "CollapseSidebar": "收起侧边栏",
     "introduction": {
       "ConceptTitle": "🤔 解释一个复杂的概念",
       "ConceptContent": "告诉我一些关于大爆炸的事情，这样我就可以向我 5 岁的孩子解释",
diff --git a/vue.config.js b/vue.config.js
index a095b188c..8fc61fd19 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -74,6 +74,11 @@ module.exports = {
         target: 'http://127.0.0.1:4200',
         changeOrigin: true
       },
+      '/kael/': {
+        target: process.env.VUE_APP_KAEL_HOST,
+        changeOrigin: true,
+        ws: true
+      },
       '^/(core|static|media)/': {
         target: process.env.VUE_APP_CORE_HOST,
         changeOrigin: true