From 8a1c55c731ce5583731b9afbadb950da495300e4 Mon Sep 17 00:00:00 2001
From: RockYang <yangjian102621@gmail.com>
Date: Mon, 22 Apr 2024 11:18:55 +0800
Subject: [PATCH] allow users to select a chatApp to chat in chat app list page

---
 CHANGELOG.md                     |  5 ++++-
 web/src/assets/css/chat-app.styl |  1 +
 web/src/views/ChatApps.vue       | 20 +++++++++++---------
 web/src/views/ChatPlus.vue       |  6 ++++--
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5dee4d0..b5956693 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,8 +3,11 @@
 ## v4.0.4
 
 * Bug修复：修复统一千问第二句不回复的问题
-* 功能优化：MJ 和 SD 任务正在执行时不更新已完成任务列表
+* 功能优化：MJ 和 SD 任务正在执行时不更新已完成任务列表，加快页面渲染速度
 * 功能新增：Dalle AI 绘画功能实现
+* Bug修复：修复思维导图格式乱码问题
+* 功能新增：支持从应用列表直接和某个应用对话
+* 功能优化：优化算力日志的页面和首页的UI
 
 ## v4.0.3
 
diff --git a/web/src/assets/css/chat-app.styl b/web/src/assets/css/chat-app.styl
index daafa42c..a5bc9a8a 100644
--- a/web/src/assets/css/chat-app.styl
+++ b/web/src/assets/css/chat-app.styl
@@ -47,6 +47,7 @@
 
           .opt {
             position: relative;
+            width 100%
             top -5px
           }
         }
diff --git a/web/src/views/ChatApps.vue b/web/src/views/ChatApps.vue
index 59e06bc2..e0225094 100644
--- a/web/src/views/ChatApps.vue
+++ b/web/src/views/ChatApps.vue
@@ -12,14 +12,10 @@
               <div class="title">
                 <span class="name">{{ scope.item.name }}</span>
                 <div class="opt">
-
-                  <el-button v-if="hasRole(scope.item.key)" size="small" type="danger"
-                             @click="updateRole(scope.item,'remove')">
-                    <el-icon>
-                      <Delete/>
-                    </el-icon>
-                    <span>移除应用</span>
-                  </el-button>
+                  <div v-if="hasRole(scope.item.key)">
+                    <el-button size="small" type="success" @click="useRole(scope.item.id)">使用</el-button>
+                    <el-button size="small" type="danger" @click="updateRole(scope.item,'remove')">移除</el-button>
+                  </div>
                   <el-button v-else size="small"
                              style="--el-color-primary:#009999"
                              @click="updateRole(scope.item, 'add')">
@@ -47,10 +43,11 @@ import {onMounted, ref} from "vue"
 import {ElMessage} from "element-plus";
 import {httpGet, httpPost} from "@/utils/http";
 import ItemList from "@/components/ItemList.vue";
-import {Delete, Plus} from "@element-plus/icons-vue";
+import {Plus} from "@element-plus/icons-vue";
 import LoginDialog from "@/components/LoginDialog.vue";
 import {checkSession} from "@/action/session";
 import {arrayContains, removeArrayItem, substr} from "@/utils/libs";
+import {useRouter} from "vue-router";
 
 const listBoxHeight = window.innerHeight - 97
 const list = ref([])
@@ -111,6 +108,11 @@ const updateRole = (row, opt) => {
 const hasRole = (roleKey) => {
   return arrayContains(roles.value, roleKey, (v1, v2) => v1 === v2)
 }
+
+const router = useRouter()
+const useRole = (roleId) => {
+  router.push({name: "chat", params: {role_id: roleId}})
+}
 </script>
 
 <style lang="stylus">
diff --git a/web/src/views/ChatPlus.vue b/web/src/views/ChatPlus.vue
index f4d85f56..58481265 100644
--- a/web/src/views/ChatPlus.vue
+++ b/web/src/views/ChatPlus.vue
@@ -295,9 +295,9 @@ const leftBoxHeight = ref(0);
 const loading = ref(true);
 const loginUser = ref(null);
 const roles = ref([]);
+const router = useRouter();
 const roleId = ref(0)
 const newChatItem = ref(null);
-const router = useRouter();
 const showConfigDialog = ref(false);
 const showLoginDialog = ref(false)
 const isLogin = ref(false)
@@ -328,6 +328,7 @@ httpGet("/api/config/get?key=notice").then(res => {
       showNotice.value = true
     }
   } catch (e) {
+    console.warn(e)
   }
 
 }).catch(e => {
@@ -376,7 +377,8 @@ const initData = () => {
         // 加载角色列表
         httpGet(`/api/role/list`).then((res) => {
           roles.value = res.data;
-          roleId.value = roles.value[0]['id'];
+          console.log()
+          roleId.value = parseInt(router.currentRoute.value.params["role_id"]) ?? roles.value[0]['id'];
           newChat();
         }).catch((e) => {
           ElMessage.error('获取聊天角色失败: ' + e.messages)