From d7fb585bcefb731174ba26907391fe0df4837e88 Mon Sep 17 00:00:00 2001
From: wangdan-fit2cloud <dan.wang@fit2cloud.com>
Date: Mon, 22 Jul 2024 18:38:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=B2=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E7=9F=A5=E8=AF=86=E5=BA=93=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/top-bar/avatar/AboutDialog.vue |  6 ++-
 ui/src/router/modules/setting.ts              |  4 +-
 ui/src/styles/element-plus.scss               |  2 +-
 .../component/AddDatasetDialog.vue            | 51 ++++++++++++++-----
 ui/src/views/dataset/component/BaseForm.vue   |  4 +-
 .../dataset/component/CreateDatasetDialog.vue |  6 +--
 ui/src/views/template/component/ModelCard.vue |  4 +-
 7 files changed, 54 insertions(+), 23 deletions(-)

diff --git a/ui/src/layout/components/top-bar/avatar/AboutDialog.vue b/ui/src/layout/components/top-bar/avatar/AboutDialog.vue
index fc8bd380a..e92eaa928 100644
--- a/ui/src/layout/components/top-bar/avatar/AboutDialog.vue
+++ b/ui/src/layout/components/top-bar/avatar/AboutDialog.vue
@@ -39,7 +39,10 @@
         <span class="label">备注</span><span>{{ licenseInfo?.remark || '-' }}</span>
       </div>
 
-      <div class="mt-16 flex align-center" v-if="user.isXPack">
+      <div
+        class="mt-16 flex align-center"
+        v-hasPermission="new ComplexPermission(['ADMIN'], ['x-pack'], 'OR')"
+      >
         <el-upload
           ref="uploadRef"
           action="#"
@@ -59,6 +62,7 @@
 import { ref, computed } from 'vue'
 import licenseApi from '@/api/license'
 import { fromNowDate } from '@/utils/time'
+import { ComplexPermission } from '@/utils/permission/type'
 import useStore from '@/stores'
 const { user } = useStore()
 const isDefaultTheme = computed(() => {
diff --git a/ui/src/router/modules/setting.ts b/ui/src/router/modules/setting.ts
index 357c133de..719aef797 100644
--- a/ui/src/router/modules/setting.ts
+++ b/ui/src/router/modules/setting.ts
@@ -4,7 +4,7 @@ import { Role, ComplexPermission } from '@/utils/permission/type'
 const settingRouter = {
   path: '/setting',
   name: 'setting',
-  meta: { icon: 'Setting', title: '系统管理', permission: 'SETTING:READ' },
+  meta: { icon: 'Setting', title: '系统设置', permission: 'SETTING:READ' },
   redirect: () => {
     if (hasPermission(new Role('ADMIN'), 'AND')) {
       return '/user'
@@ -59,7 +59,7 @@ const settingRouter = {
       meta: {
         icon: 'app-setting',
         iconActive: 'app-setting-active',
-        title: '系统管理',
+        title: '系统设置',
         activeMenu: '/setting',
         parentPath: '/setting',
         parentName: 'setting',
diff --git a/ui/src/styles/element-plus.scss b/ui/src/styles/element-plus.scss
index feea925b9..54fb881cc 100644
--- a/ui/src/styles/element-plus.scss
+++ b/ui/src/styles/element-plus.scss
@@ -222,7 +222,7 @@
   margin-right: calc(var(--app-base-px) + 4px);
 }
 .el-slider__input {
-  width: 60px;
+  width: 72px;
 }
 
 .input-with-select {
diff --git a/ui/src/views/application/component/AddDatasetDialog.vue b/ui/src/views/application/component/AddDatasetDialog.vue
index e66e73b79..ead180f0f 100644
--- a/ui/src/views/application/component/AddDatasetDialog.vue
+++ b/ui/src/views/application/component/AddDatasetDialog.vue
@@ -5,6 +5,7 @@
     width="600"
     append-to-body
     class="addDataset-dialog"
+    align-center
   >
     <template #header="{ titleId, titleClass }">
       <div class="flex-between mb-8">
@@ -23,19 +24,23 @@
         所选知识库必须使用相同的 Embedding 模型
       </el-text>
     </template>
-    <el-row :gutter="12" v-loading="loading">
-      <el-col :span="12" v-for="(item, index) in filterData" :key="index" class="mb-16">
-        <CardCheckbox value-field="id" :data="item" v-model="checkList" @change="changeHandle">
-          <span class="ellipsis">
-            {{ item.name }}
-          </span>
-        </CardCheckbox>
-      </el-col>
-    </el-row>
+    <el-scrollbar>
+      <div class="max-height">
+        <el-row :gutter="12" v-loading="loading">
+          <el-col :span="12" v-for="(item, index) in filterData" :key="index" class="mb-16">
+            <CardCheckbox value-field="id" :data="item" v-model="checkList" @change="changeHandle">
+              <span class="ellipsis">
+                {{ item.name }}
+              </span>
+            </CardCheckbox>
+          </el-col>
+        </el-row>
+      </div>
+    </el-scrollbar>
     <template #footer>
       <div class="flex-between">
-        <div>
-          <el-text type="info" class="color-secondary" v-if="checkList.length > 0">
+        <div class="flex">
+          <el-text type="info" class="color-secondary mr-8" v-if="checkList.length > 0">
             已选 {{ checkList.length }} 个知识库
           </el-text>
           <el-button link type="primary" v-if="checkList.length > 0" @click="clearCheck">
@@ -87,6 +92,8 @@ function changeHandle() {
     currentEmbedding.value = props.data.filter(
       (v) => v.id === checkList.value[0]
     )[0].embedding_mode_id
+  } else if (checkList.value.length === 0) {
+    currentEmbedding.value = ''
   }
 }
 function clearCheck() {
@@ -96,6 +103,12 @@ function clearCheck() {
 
 const open = (checked: any) => {
   checkList.value = checked
+  if (checkList.value.length > 0) {
+    currentEmbedding.value = props.data.filter(
+      (v) => v.id === checkList.value[0]
+    )[0].embedding_mode_id
+  }
+
   dialogVisible.value = true
 }
 const submitHandle = () => {
@@ -111,11 +124,25 @@ defineExpose({ open })
 </script>
 <style lang="scss" scope>
 .addDataset-dialog {
+  padding: 0;
+  .el-dialog__header {
+    padding: 24px 24px 8px 24px;
+  }
+  .el-dialog__body {
+    padding: 8px !important;
+  }
+  .el-dialog__footer {
+    padding: 8px 24px 24px 24px;
+  }
   .el-dialog__header.show-close {
-    padding-right: 15px;
+    padding-right: 34px;
   }
   .el-dialog__headerbtn {
     top: 13px;
   }
+  .max-height {
+    max-height: calc(100vh - 260px);
+    padding: 0 16px;
+  }
 }
 </style>
diff --git a/ui/src/views/dataset/component/BaseForm.vue b/ui/src/views/dataset/component/BaseForm.vue
index a8c659500..faaf1c4c7 100644
--- a/ui/src/views/dataset/component/BaseForm.vue
+++ b/ui/src/views/dataset/component/BaseForm.vue
@@ -27,10 +27,10 @@
         @blur="form.desc = form.desc.trim()"
       />
     </el-form-item>
-    <el-form-item label="Embedding模型" prop="embedding_mode_id">
+    <el-form-item label="向量模型" prop="embedding_mode_id">
       <el-select
         v-model="form.embedding_mode_id"
-        placeholder="请选择Embedding模型"
+        placeholder="请选择向量模型"
         class="w-full"
         popper-class="select-model"
         :clearable="true"
diff --git a/ui/src/views/dataset/component/CreateDatasetDialog.vue b/ui/src/views/dataset/component/CreateDatasetDialog.vue
index b958bd8f0..1316a0373 100644
--- a/ui/src/views/dataset/component/CreateDatasetDialog.vue
+++ b/ui/src/views/dataset/component/CreateDatasetDialog.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog title="创建知识库" v-model="dialogVisible" width="650" append-to-body>
+  <el-dialog title="创建知识库" v-model="dialogVisible" width="680" append-to-body>
     <!-- 基本信息 -->
     <BaseForm ref="BaseFormRef" v-if="dialogVisible" />
     <el-form
@@ -25,7 +25,7 @@
                     </AppAvatar>
                     <div>
                       <p class="mb-4">通用型</p>
-                      <el-text type="info">可以通过上传文件或手动录入方式构建知识库</el-text>
+                      <el-text type="info">上传本地文件或手动录入</el-text>
                     </div>
                   </div>
                 </el-radio>
@@ -44,7 +44,7 @@
                     </AppAvatar>
                     <div>
                       <p class="mb-4">Web 站点</p>
-                      <el-text type="info">通过网站链接同步方式构建知识库 </el-text>
+                      <el-text type="info">同步Web网站文本数据 </el-text>
                     </div>
                   </div>
                 </el-radio>
diff --git a/ui/src/views/template/component/ModelCard.vue b/ui/src/views/template/component/ModelCard.vue
index 9984d8690..ba4c4d4bd 100644
--- a/ui/src/views/template/component/ModelCard.vue
+++ b/ui/src/views/template/component/ModelCard.vue
@@ -23,7 +23,7 @@
             <el-tag v-if="model.permission_type === 'PRIVATE'" type="danger" class="danger-tag"
               >私有</el-tag
             >
-            <el-tag v-else type="info" class="info-tag">公有</el-tag>
+            <el-tag v-else type="info" class="info-tag">公用</el-tag>
           </div>
         </div>
       </div>
@@ -59,7 +59,7 @@
     </div>
 
     <template #mouseEnter>
-      <div class="operation-button">
+      <div class="operation-button" v-if="model.permission_type === 'PUBLIC'">
         <el-tooltip effect="dark" content="修改" placement="top">
           <el-button text :disabled="!is_permisstion" @click.stop="openEditModel">
             <el-icon>