feat: system

Author: wangdan-fit2cloud

ui/src/components/common-list/index.vue

@@ -77,6 +77,7 @@ defineExpose({
     font-size: 14px;
     margin-bottom: 4px;
     &.active {
+      background: var(--el-color-primary-light-9);
       border-radius: 4px;
       color: var(--el-color-primary);
       font-weight: 500;

ui/src/components/index.ts

@@ -23,6 +23,8 @@ import TagEllipsis from './tag-ellipsis/index.vue'
 import CardCheckbox from './card-checkbox/index.vue'
 import AiChat from './ai-chat/index.vue'
 import KnowledgeIcon from './app-icon/KnowledgeIcon.vue'
+import TagGroup from './tag-group/index.vue'
+import WorkspaceDropdown from './workspace-dropdown/index.vue'
 export default {
   install(app: App) {
     app.component('LogoFull', LogoFull)
@@ -49,5 +51,7 @@ export default {
     app.component('CardCheckbox', CardCheckbox)
     app.component('AiChat', AiChat)
     app.component('KnowledgeIcon', KnowledgeIcon)
+    app.component('TagGroup', TagGroup)
+    app.component('WorkspaceDropdown', WorkspaceDropdown)
   },
 }

ui/src/components/tag-group/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="tag-group" v-if="props.tags.length">
-    <el-tag class="default-tag" style="max-width: 100%;">
-      <span class="ellipsis" style="max-width: 100%;">{{ props.tags[0] }}</span>
+    <el-tag class="default-tag" style="max-width: 100%">
+      <span class="ellipsis" style="max-width: 100%">{{ props.tags[0] }}</span>
     </el-tag>
     <el-tooltip effect="light">
-      <el-tag class="info-tag ml-4" v-if="props.tags?.length > 1">
+      <el-tag class="info-tag ml-4 cursor" v-if="props.tags?.length > 1">
         +{{ props.tags?.length - 1 }}
       </el-tag>
       <template #content>
@@ -17,9 +17,8 @@
 </template>
 <script setup lang="ts">
 const props = defineProps<{
-  tags: string[],
+  tags: string[]
 }>()
-
 </script>
 
 <style lang="scss" scoped>
@@ -28,4 +27,4 @@ const props = defineProps<{
     width: 100%;
   }
 }
-</style>
+</style>

…yout-header/workspace-dropdown/index.vue …/components/workspace-dropdown/index.vueui/src/layout/layout-header/workspace-dropdown/index.vue renamed to ui/src/components/workspace-dropdown/index.vue ui/src/layout/layout-header/workspace-dropdown/index.vue renamed to ui/src/components/workspace-dropdown/index.vue

@@ -1,8 +1,8 @@
 <template>
-  <el-dropdown placement="bottom-start">
-    <el-button text>
+  <el-dropdown placement="bottom-start" class="workspace-dropdown">
+    <el-button text style="font-size: 14px" class="workspace-dropdown__button">
       <AppIcon iconName="app-wordspace" style="font-size: 18px"></AppIcon>
-      <span class="dropdown-title ellipsis">
+      <span class="ellipsis" style="max-width: 155px">
         {{ currentWorkspace?.name }}
       </span>
       <el-icon class="el-icon--right">
@@ -18,7 +18,7 @@
           @click="changeWorkspace(item)"
         >
           <AppIcon class="mr-8" iconName="app-wordspace" style="font-size: 16px"></AppIcon>
-          <span class="dropdown-item ellipsis">
+          <span class="ellipsis" style="max-width: 230px">
             {{ item.name }}
           </span>
           <el-icon
@@ -48,27 +48,16 @@ const currentWorkspace = computed(() => {
 
 function changeWorkspace(item: WorkspaceItem) {
   if (item.id === user.workspace_id) return
-
   user.setWorkspaceId(item.id || 'default')
   window.location.reload()
 }
 </script>
 <style lang="scss" scoped>
-:deep(.el-button.is-text) {
-  color: var(--el-text-color-primary);
-  max-height: 32px;
-}
-
-.dropdown-title {
-  max-width: 155px;
-  font-size: 14px;
-}
-
-.dropdown-item {
-  max-width: 230px;
-}
-
-:deep(.el-dropdown-menu__item.active) {
-  color: var(--el-color-primary);
+.workspace-dropdown {
+  &__button {
+    font-size: 14px;
+    padding: 0 12px !important;
+    max-height: 32px;
+  }
 }
 </style>

ui/src/layout/layout-header/UserHeader.vue

@@ -8,7 +8,11 @@
     <div class="flex-between w-full">
       <div class="ml-24 flex align-center">
         <!-- 企业版: 工作空间下拉框-->
-        <el-divider class="mr-16" direction="vertical" v-if="hasPermission(EditionConst.IS_EE, 'OR')" />
+        <el-divider
+          class="mr-8"
+          direction="vertical"
+          v-if="hasPermission(EditionConst.IS_EE, 'OR')"
+        />
         <WorkspaceDropdown v-if="hasPermission(EditionConst.IS_EE, 'OR')" />
       </div>
       <TopMenu></TopMenu>
@@ -23,12 +27,6 @@ import Avatar from './avatar/index.vue'
 import TopAbout from './top-about/index.vue'
 import { EditionConst } from '@/utils/permission/data'
 import { hasPermission } from '@/utils/permission/index'
-import WorkspaceDropdown from './workspace-dropdown/index.vue'
-
-import { useRouter } from 'vue-router'
-import useStore from '@/stores'
-const router = useRouter()
-const { user } = useStore()
 </script>
 <style lang="scss" scoped>
 .app-top-bar-container {

ui/src/locales/lang/en-US/views/index.ts

@@ -8,7 +8,6 @@ import system from './system'
 import tool from './tool'
 import userManage from './user-manage'
 import resourceAuthorization from './resource-authorization'
-import team from './team'
 import model from './model'
 import document from './document'
 import paragraph from './paragraph'
@@ -26,7 +25,6 @@ export default {
   tool,
   userManage,
   resourceAuthorization,
-  team,
   model,
   knowledge,
   applicationWorkflow,

ui/src/locales/lang/en-US/views/resource-authorization.ts

@@ -1,32 +1,27 @@
 export default {
   title: 'Resource Authorization',
-  member:'Member',
+  member: 'Member',
   manage: 'Owner',
   permissionSetting: 'Permission Setting',
   addMember: 'Add Member',
   addSubTitle: 'After members log in,they can access the data you have authorized.',
   searchBar: {
-    placeholder: 'Please enter the username to search'
+    placeholder: 'Please enter the username to search',
   },
   delete: {
     button: 'Remove',
     confirmTitle: 'Wheather to remove the member:',
-    confirmMessage: "After removal, the member's knowledge base and application permissions will be revoked. "
+    confirmMessage:
+      "After removal, the member's knowledge base and application permissions will be revoked. ",
   },
   setting: {
     management: ' management',
-    check: 'check'
+    check: 'check',
+    authorization: 'authorization',
+  },
+  priority: {
+    label: 'Resource permission priority',
+    role: 'Role',
+    customize: 'Customize',
   },
-  teamForm: {
-    form: {
-      userName: {
-        label: 'Username/Email',
-        placeholder: "Please enter the member's username or email",
-        requiredMessage: 'Please enter Username/Email',
-      },
-
-    },
-
-  }
 }
-

ui/src/locales/lang/en-US/views/team.ts

@@ -1,3 +1,5 @@
+import role from './role'
+
 export default {
   title: '资源授权',
   member: '成员',
@@ -6,26 +8,21 @@ export default {
   addMember: '添加成员',
   addSubTitle: '成员登录后可以访问到您授权的数据。',
   searchBar: {
-    placeholder: '请输入用户名搜索'
+    placeholder: '请输入用户名搜索',
   },
   delete: {
     button: '移除',
     confirmTitle: '是否移除成员：',
-    confirmMessage: '移除后将会取消成员拥有的知识库和应用权限。'
+    confirmMessage: '移除后将会取消成员拥有的知识库和应用权限。',
   },
   setting: {
     management: '管理',
-    check: '查看'
+    check: '查看',
+    authorization: '授权',
+  },
+  priority: {
+    label: '资源权限优先级',
+    role: '按角色',
+    customize: '自定义',
   },
-  teamForm: {
-    form: {
-      userName: {
-        label: '用户名/邮箱',
-        placeholder: '请输入成员的用户名或邮箱',
-        requiredMessage: '请输入用户名/邮箱'
-      },
-
-    },
-
-  }
 }

ui/src/locales/lang/zh-CN/views/resource-authorization.ts

@@ -8,7 +8,6 @@ import system from './system'
 import tool from './tool'
 import userManage from './user-manage'
 import resourceAuthorization from './resource-authorization'
-import team from './team'
 import model from './model'
 import document from './document'
 import paragraph from './paragraph'
@@ -26,7 +25,6 @@ export default {
   tool,
   userManage,
   resourceAuthorization,
-  team,
   model,
   knowledge,
   applicationWorkflow,