From d01e1182f0431455b5309a8c3716c7a3bfa9618d Mon Sep 17 00:00:00 2001
From: wangdan-fit2cloud <dan.wang@fit2cloud.com>
Date: Fri, 23 Feb 2024 17:55:55 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A0=B7=E5=BC=8F=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/src/assets/icon_robot.svg                      |  6 +-----
 ui/src/components/ai-chat/index.vue               |  5 +++--
 ui/src/components/back-button/index.vue           |  8 ++------
 ui/src/components/tags-input/index.vue            |  6 ++++++
 ui/src/styles/element-plus.scss                   | 12 ++++++++----
 .../component/APIKeyDialog.vue                    |  2 +-
 ui/src/views/application/CreateAndSetting.vue     | 15 ++-------------
 ui/src/views/chat/index.vue                       |  1 +
 .../setting/component/CreateMemberDialog.vue      |  6 ++++++
 .../views/setting/component/PermissionSetting.vue | 15 ++++++++++++---
 ui/src/views/setting/index.vue                    | 11 ++++++-----
 ui/src/views/setting/utils.ts                     |  6 +++++-
 12 files changed, 53 insertions(+), 40 deletions(-)

diff --git a/ui/src/assets/icon_robot.svg b/ui/src/assets/icon_robot.svg
index 7f4369b02..cca9ee604 100644
--- a/ui/src/assets/icon_robot.svg
+++ b/ui/src/assets/icon_robot.svg
@@ -1,5 +1 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.33333 1.33337H6.66667V3.33337H7.33333V4.66671H3.66667C2.93029 4.66671 2.33333 5.26366 2.33333 6.00004V13.3334C2.33333 14.0698 2.93029 14.6667 3.66667 14.6667H12.3333C13.0697 14.6667 13.6667 14.0698 13.6667 13.3334V6.00004C13.6667 5.26366 13.0697 4.66671 12.3333 4.66671H8.66667V3.33337H9.33333V1.33337ZM4.66667 8.66671H6.66667V10.6667H4.66667V8.66671ZM11.3333 8.66671V10.6667H9.33333V8.66671H11.3333Z" fill="white"/>
-<path d="M1.33333 8.00004H0V11.3334H1.33333V8.00004Z" fill="white"/>
-<path d="M14.6667 8.00004H16V11.3334H14.6667V8.00004Z" fill="white"/>
-</svg>
+<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 232.4409 232.4409"><defs><style>.cls-1{fill:#fff;}</style></defs><title>MaxKB</title><path class="cls-1" d="M128.4532,177H98.7785L87.78,187.9985a4.6069,4.6069,0,0,0,3.2576,7.8644h45.1569a4.6069,4.6069,0,0,0,3.2575-7.8644Z"/><path class="cls-1" d="M210.0008,90.7042h-5.85v41.1511h5.85a4.4537,4.4537,0,0,0,4.4537-4.4537V95.1579A4.4537,4.4537,0,0,0,210.0008,90.7042Z"/><path class="cls-1" d="M28.29,90.7042H22.44a4.4538,4.4538,0,0,0-4.4538,4.4537v32.2437a4.4538,4.4538,0,0,0,4.4538,4.4537h5.85Z"/><path class="cls-1" d="M138.8087,96.1512a8.33,8.33,0,0,0-8.33,8.33v5.9727a8.33,8.33,0,1,0,16.6607,0v-5.9727A8.33,8.33,0,0,0,138.8087,96.1512Z"/><path class="cls-1" d="M95.3622,96.1512a8.33,8.33,0,0,0-8.33,8.33v5.9727a8.33,8.33,0,1,0,16.6607,0v-5.9727A8.33,8.33,0,0,0,95.3622,96.1512Z"/><path class="cls-1" d="M166.8344,48.8968H65.6064A33.7544,33.7544,0,0,0,31.89,82.6131v57.07A33.7548,33.7548,0,0,0,65.6064,173.4h101.228a33.7549,33.7549,0,0,0,33.7168-33.7168v-57.07A33.7545,33.7545,0,0,0,166.8344,48.8968Zm2.831,90.4457a6.0733,6.0733,0,0,1-6.0732,6.0733H114.2168a43.5922,43.5922,0,0,0-21.3313,5.5757l-16.5647,9.2946v-14.87h-7.472a6.0733,6.0733,0,0,1-6.0733-6.0733v-60.5a6.0733,6.0733,0,0,1,6.0733-6.0733h94.7434a6.0733,6.0733,0,0,1,6.0732,6.0733Z"/></svg>
\ No newline at end of file
diff --git a/ui/src/components/ai-chat/index.vue b/ui/src/components/ai-chat/index.vue
index d9d0582cd..fd1d66395 100644
--- a/ui/src/components/ai-chat/index.vue
+++ b/ui/src/components/ai-chat/index.vue
@@ -5,7 +5,7 @@
         <div class="item-content mb-16">
           <div class="avatar">
             <AppAvatar class="avatar-gradient">
-              <img src="@/assets/icon_robot.svg" style="width: 54%" alt="" />
+              <img src="@/assets/icon_robot.svg" style="width: 75%" alt="" />
             </AppAvatar>
           </div>
 
@@ -50,7 +50,7 @@
           <div class="item-content mb-16 lighter">
             <div class="avatar">
               <AppAvatar class="avatar-gradient">
-                <img src="@/assets/icon_robot.svg" style="width: 54%" alt="" />
+                <img src="@/assets/icon_robot.svg" style="width: 75%" alt="" />
               </AppAvatar>
             </div>
             <div class="content">
@@ -614,6 +614,7 @@ watch(
   }
   .dialog-card {
     border: none;
+    border-radius: 8px;
   }
 }
 </style>
diff --git a/ui/src/components/back-button/index.vue b/ui/src/components/back-button/index.vue
index 336d369da..0a0ea69bb 100644
--- a/ui/src/components/back-button/index.vue
+++ b/ui/src/components/back-button/index.vue
@@ -1,6 +1,6 @@
 <template>
   <el-button class="back-button cursor mr-4" text @click="jump">
-    <el-icon>
+    <el-icon :size="20">
       <Back />
     </el-icon>
   </el-button>
@@ -28,8 +28,4 @@ function jump() {
 }
 </script>
 
-<style lang="scss">
-.back-button {
-  font-size: 20px;
-}
-</style>
+<style lang="scss"></style>
diff --git a/ui/src/components/tags-input/index.vue b/ui/src/components/tags-input/index.vue
index 1c0d99e21..77a375535 100644
--- a/ui/src/components/tags-input/index.vue
+++ b/ui/src/components/tags-input/index.vue
@@ -100,6 +100,12 @@ function removeTag(index: number) {
   min-height: 70px;
   border: 1px solid var(--el-border-color);
   border-radius: var(--el-border-radius-base);
+  &:hover {
+    border: 1px solid var(--el-color-primary);
+  }
+  &:focus-within {
+    border: 1px solid var(--el-color-primary);
+  }
   :deep(.el-autocomplete) {
     width: 100%;
   }
diff --git a/ui/src/styles/element-plus.scss b/ui/src/styles/element-plus.scss
index 9651c00a7..cafdbff7a 100644
--- a/ui/src/styles/element-plus.scss
+++ b/ui/src/styles/element-plus.scss
@@ -60,8 +60,9 @@
   --el-dialog-padding-primary: 24px;
   --el-dialog-content-font-size: 14px;
   .dialog-sub-title {
-    color: var(--app-text-color);
+    color: var(--app-text-color-secondary);
     margin: 5px 0;
+    font-weight: 400;
   }
   .el-dialog__body {
     color: var(--app-text-color);
@@ -226,9 +227,6 @@
 
 .el-input__inner {
   font-size: 14px;
-  // &::placeholder {
-  //   color: #8f959e;
-  // }
 }
 
 .el-input__wrapper {
@@ -253,9 +251,15 @@
 .el-select {
   min-width: 200px;
 }
+.el-select__caret {
+  color: var(--app-text-color-secondary);
+}
 .el-tabs__header {
   margin: 0 0 12px;
 }
+.el-tabs__item {
+  padding: 0 14px;
+}
 
 .el-drawer {
   .el-drawer__header {
diff --git a/ui/src/views/applicaiton-overview/component/APIKeyDialog.vue b/ui/src/views/applicaiton-overview/component/APIKeyDialog.vue
index 0057c6b0a..d95bcaa34 100644
--- a/ui/src/views/applicaiton-overview/component/APIKeyDialog.vue
+++ b/ui/src/views/applicaiton-overview/component/APIKeyDialog.vue
@@ -12,7 +12,7 @@
           </el-button>
         </template>
       </el-table-column>
-      <el-table-column label="状态" width="100">
+      <el-table-column label="状态" width="60">
         <template #default="{ row }">
           <div @click.stop>
             <el-switch size="small" v-model="row.is_active" @change="changeState($event, row)" />
diff --git a/ui/src/views/application/CreateAndSetting.vue b/ui/src/views/application/CreateAndSetting.vue
index 0f76e6694..ee00b8956 100644
--- a/ui/src/views/application/CreateAndSetting.vue
+++ b/ui/src/views/application/CreateAndSetting.vue
@@ -241,13 +241,13 @@
               <el-form-item @click.prevent>
                 <template #label>
                   <div class="flex align-center">
-                    <span>问题优化</span>
+                    <span class="mr-4">问题优化</span>
                     <el-tooltip
                       effect="dark"
                       content="根据历史聊天优化完善当前问题，更利于匹配知识点。"
                       placement="right"
                     >
-                      <el-icon style="font-size: 16px">
+                      <el-icon :size="16">
                         <Warning />
                       </el-icon>
                     </el-tooltip>
@@ -334,27 +334,16 @@ const {
 } = route as any
 
 const defaultPrompt = `已知信息：
-
 {data}
-
 回答要求：
-
 - 请简洁和专业的来回答用户的问题。
-
 - 如果你不知道答案，请回答“没有在知识库中查找到相关信息，建议咨询相关技术支持或参考官方文档进行操作”。
-
 - 避免提及你是从已知信息中获得的知识。
-
 - 请保证答案与已知信息中描述的一致。
-
 - 请使用 Markdown 语法优化答案的格式。
-
 - 已知信息中的图片、链接地址和脚本语言请直接返回。
-
 - 请使用与问题相同的语言来回答。
-
 问题：
-
 {question}
 `
 const createModelRef = ref<InstanceType<typeof CreateModelDialog>>()
diff --git a/ui/src/views/chat/index.vue b/ui/src/views/chat/index.vue
index 6cc11f7a2..6dde80f90 100644
--- a/ui/src/views/chat/index.vue
+++ b/ui/src/views/chat/index.vue
@@ -55,6 +55,7 @@ onMounted(() => {
     height: var(--app-header-height);
     line-height: var(--app-header-height);
     box-sizing: border-box;
+    border-bottom: 1px solid rgba(31, 35, 41, 0.15);
   }
   &__main {
     padding-top: calc(var(--app-header-height) + 24px);
diff --git a/ui/src/views/setting/component/CreateMemberDialog.vue b/ui/src/views/setting/component/CreateMemberDialog.vue
index 61c926ef0..edcb7e56b 100644
--- a/ui/src/views/setting/component/CreateMemberDialog.vue
+++ b/ui/src/views/setting/component/CreateMemberDialog.vue
@@ -5,6 +5,7 @@
     :close-on-click-modal="false"
     :destroy-on-close="true"
     width="600"
+    class="member-dialog"
   >
     <template #header="{ titleId, titleClass }">
       <h4 :id="titleId" :class="titleClass">添加成员</h4>
@@ -142,6 +143,11 @@ onMounted(() => {})
 defineExpose({ open, close })
 </script>
 <style lang="scss" scope>
+.member-dialog {
+  .el-dialog__header {
+    padding-bottom: 19px;
+  }
+}
 .custom-select-multiple {
   width: 200%;
   .el-input {
diff --git a/ui/src/views/setting/component/PermissionSetting.vue b/ui/src/views/setting/component/PermissionSetting.vue
index 43e3b463f..efa40f84f 100644
--- a/ui/src/views/setting/component/PermissionSetting.vue
+++ b/ui/src/views/setting/component/PermissionSetting.vue
@@ -34,7 +34,11 @@
         />
       </template> -->
         <template #default="{ row }">
-          <el-checkbox v-model="row.operate[MANAGE]" @change="checkedOperateChange(MANAGE, row)" />
+          <el-checkbox
+            :disabled="props.manage"
+            v-model="row.operate[MANAGE]"
+            @change="checkedOperateChange(MANAGE, row)"
+          />
         </template>
       </el-table-column>
       <el-table-column label="使用" align="center" width="60">
@@ -46,7 +50,11 @@
         />
       </template> -->
         <template #default="{ row }">
-          <el-checkbox v-model="row.operate[USE]" @change="checkedOperateChange(USE, row)" />
+          <el-checkbox
+            :disabled="props.manage"
+            v-model="row.operate[USE]"
+            @change="checkedOperateChange(USE, row)"
+          />
         </template>
       </el-table-column>
     </el-table>
@@ -63,7 +71,8 @@ const props = defineProps({
   },
   id: String,
   type: String,
-  tableHeight: Number
+  tableHeight: Number,
+  manage: Boolean
 })
 
 const isDataset = computed(() => props.type === DATASET)
diff --git a/ui/src/views/setting/index.vue b/ui/src/views/setting/index.vue
index 302bbef80..fd5529b9c 100644
--- a/ui/src/views/setting/index.vue
+++ b/ui/src/views/setting/index.vue
@@ -55,6 +55,7 @@
                 :data="item.data"
                 :type="item.value"
                 :tableHeight="tableHeight"
+                :manage="isManage(currentType)"
               ></PermissionSetting>
             </el-tab-pane>
           </el-tabs>
@@ -76,7 +77,7 @@ import type { TeamMember } from '@/api/type/team'
 import CreateMemberDialog from './component/CreateMemberDialog.vue'
 import PermissionSetting from './component/PermissionSetting.vue'
 import { MsgSuccess, MsgConfirm } from '@/utils/message'
-import { DATASET, APPLICATION } from './utils'
+import { DATASET, APPLICATION, isManage } from './utils'
 
 const CreateMemberRef = ref<InstanceType<typeof CreateMemberDialog>>()
 const loading = ref(false)
@@ -84,6 +85,8 @@ const rLoading = ref(false)
 const memberList = ref<TeamMember[]>([]) // 全部成员
 const filterMember = ref<TeamMember[]>([]) // 搜索过滤后列表
 const currentUser = ref<String>('')
+const currentType = ref<String>('')
+
 const filterText = ref('')
 
 const activeName = ref(DATASET)
@@ -176,12 +179,9 @@ function deleteMember(row: TeamMember) {
     .catch(() => {})
 }
 
-function isManage(type: String) {
-  return type === 'manage'
-}
-
 function clickMemberHandle(item: any) {
   currentUser.value = item.id
+  currentType.value = item.type
   MemberPermissions(item.id)
 }
 function addMember() {
@@ -197,6 +197,7 @@ function getMember(id?: string) {
 
       const user = (id && memberList.value.find((p) => p.user_id === id)) || null
       currentUser.value = user ? user.id : memberList.value[0].id
+      currentType.value = user ? user.type : memberList.value[0].type
       MemberPermissions(currentUser.value)
       loading.value = false
     })
diff --git a/ui/src/views/setting/utils.ts b/ui/src/views/setting/utils.ts
index 149b250d8..358151cf1 100644
--- a/ui/src/views/setting/utils.ts
+++ b/ui/src/views/setting/utils.ts
@@ -1,4 +1,8 @@
 export const MANAGE = 'MANAGE'
 export const USE = 'USE'
 export const DATASET = 'DATASET'
-export const APPLICATION = 'APPLICATION'
\ No newline at end of file
+export const APPLICATION = 'APPLICATION'
+
+export function isManage(type: String) {
+  return type === 'manage'
+}