feat(member): member manage

Author: dataeaseShu

frontend/src/api/workspace.ts

@@ -14,3 +14,4 @@ export const workspaceUwsDelete = (data: any) => request.delete('/system/workspa
 export const workspaceDelete = (data: any) => request.delete('/system/workspace', { data })
 export const workspaceList = () => request.get('/system/workspace')
 export const workspaceDetail = (id: any) => request.get(`/system/workspace/${id}`)
+export const uwsOption = (params: any) => request.get('system/workspace/uws/option', { params })

frontend/src/assets/permission/icon_custom-tools_colorful.png

@@ -25,13 +25,16 @@ const routerList = computed(() => {
   if (showSysmenu.value) {
     return router.getRoutes().filter((route) => route.path.includes('/system') && !route.redirect)
   }
+
   return router.getRoutes().filter((route) => {
     return (
       !route.path.includes('canvas') &&
+      !route.path.includes('member') &&
+      !route.path.includes('permission') &&
       !route.path.includes('preview') &&
       route.path !== '/login' &&
       !route.path.includes('/system') &&
-      !route.redirect &&
+      (route.path.includes('set') || !route.redirect) &&
       route.path !== '/:pathMatch(.*)*' &&
       !route.path.includes('dsTable')
     )
@@ -45,17 +48,28 @@ const routerList = computed(() => {
   </el-menu>
 </template>
 
-<style lang="less" scoped>
+<style lang="less">
 .ed-menu-vertical {
   --ed-menu-item-height: 40px;
   --ed-menu-bg-color: transparent;
   --ed-menu-base-level-padding: 4px;
   border-right: none;
   .ed-menu-item {
-    height: 40px;
+    height: 40px !important;
+    border-radius: 6px !important;
+    &.is-active {
+      background-color: #fff !important;
+      border-radius: 6px;
+    }
+  }
+
+  .ed-sub-menu .ed-sub-menu__title:hover {
     border-radius: 6px;
-    &.is-active.is-active.is-active {
-      background-color: #1cba901a;
+  }
+
+  .ed-sub-menu.is-active {
+    .ed-sub-menu__title {
+      color: #1cba90 !important;
     }
   }
 }

frontend/src/assets/svg/icon_down_outlined.svg

@@ -8,13 +8,16 @@ import model from '@/assets/svg/icon_dataset_filled.svg'
 import ds from '@/assets/svg/ds.svg'
 import dashboard from '@/assets/svg/dashboard.svg'
 import chat from '@/assets/svg/chat.svg'
+import setting from '@/assets/svg/icon_setting_filled.svg'
 import icon_user from '@/assets/svg/icon_user.svg'
+
 const iconMap = {
   icon_ai: model,
   ds,
   dashboard,
   chat,
   user,
+  setting,
   icon_user: icon_user,
   workspace,
 } as { [key: string]: any }
@@ -38,7 +41,9 @@ const MenuItem = defineComponent({
     const router = useRouter()
 
     const handleMenuClick = (e: any) => {
-      router.push(e.index)
+      if (e.index) {
+        router.push(e.redirect || e.index)
+      }
     }
 
     return () => {
@@ -50,7 +55,7 @@ const MenuItem = defineComponent({
       if (children?.length) {
         return h(
           ElSubMenu,
-          { index: path, onClick: (e: any) => handleMenuClick(e) },
+          { index: path, onClick: () => handleMenuClick(props.menu) },
           {
             title: () => titleWithIcon(props),
             default: () => children.map((ele: any) => h(MenuItem, { menu: ele })),

frontend/src/assets/svg/icon_member_outlined.svg

@@ -8,6 +8,7 @@
   "common": {
     "input_content": "Please Input Content",
     "empty": " ",
+    "may_not_exist": "No results yet, the user may not exist",
     "back": "Back",
     "confirm": "Confirm",
     "cancel": "Cancel",
@@ -299,7 +300,43 @@
     "there_are": "There are",
     "2_dashboards": "{msg} dashboards",
     "smart_data_centers": "{msg} smart data centers",
-    "confirm_to_delete": "This data source is in use. Deleting it will cause these resources to not work properly. Confirm to delete?"
+    "confirm_to_delete": "This data source is in use. Deleting it will cause these resources to not work properly. Confirm to delete?",
+    "id_account_to_add": "Search user ID/account to add",
+    "find_user": "Find user",
+    "add_successfully": "Add successfully",
+    "member_management": "Member management",
+    "permission_configuration": "Permission configuration",
+    "set": "Set"
+  },
+  "permission": {
+    "search_rule_group": "Search rule group",
+    "add_rule_group": "Add rule group",
+    "permission_rule": "Permission rule",
+    "restricted_user": "Restricted user",
+    "set_rule": "Set rule",
+    "set_user": "Set user",
+    "2": "{msg}",
+    "238_people": "{msg} people",
+    "no_permission_rule": "No permission rule",
+    "set_permission_rule": "Set permission rule",
+    "basic_information": "Basic information",
+    "rule_group_name": "Rule group name",
+    "rule_name": "Rule name",
+    "type": "Type",
+    "data_source": "Data source",
+    "data_table": "Data table",
+    "select_restricted_user": "Select restricted user",
+    "rule_group_1": "Delete rule group: {msg}?",
+    "no_rule": "No rule",
+    "row_permission": "Row permission",
+    "column_permission": "Column permission",
+    "rule_rule_1": "Delete rule: {msg}?",
+    "no_content": "No content",
+    "edit_column_permission": "Edit column permission",
+    "edit_row_permission": "Edit row permission",
+    "add_column_permission": "Add column permission",
+    "add_row_permission": "Add row permission",
+    "no_fields_yet": "No fields yet"
   },
   "chat": {
     "chart_type": {

frontend/src/assets/svg/icon_setting_filled.svg

@@ -1,12 +1,13 @@
 {
-  "menu": {
+  "menu": { 
     "Data Q&A": "智能问数",
     "Data Connections": "数据源",
     "Dashboard": "仪表盘",
     "AI Model Configuration": "模型配置"
   },
   "common": {
     "input_content": "请输入内容",
+    "may_not_exist": "暂无结果，用户可能不存在",
     "empty": "",
     "back": "返回",
     "confirm": "确认",
@@ -319,7 +320,42 @@
     "there_are": "有 ",
     "2_dashboards": "{msg} 个仪表板",
     "smart_data_centers": "{msg} 个智能问数",
-    "confirm_to_delete": "正在使用此数据源，删除后会导致这些资源无法正常使用，确认删除?"
+    "confirm_to_delete": "正在使用此数据源，删除后会导致这些资源无法正常使用，确认删除?",
+    "id_account_to_add": "搜索用户ID/账号添加",
+    "find_user": "查找用户",
+    "add_successfully": "添加成功",
+    "member_management": "成员管理",
+    "permission_configuration": "权限配置",
+    "set": "设置"
+  },
+  "permission": {
+    "search_rule_group": "搜索规则组",
+    "add_rule_group": "添加规则组",
+    "permission_rule": "权限规则",
+    "restricted_user": "受限用户",
+    "set_rule": "设置规则",
+    "set_user": "设置用户",
+    "2": "{msg} 个",
+    "238_people": "{msg} 人",
+    "no_permission_rule": "暂无权限规则",
+    "set_permission_rule": "设置权限规则",
+    "rule_group_name": "规则组名称",
+    "rule_name": "规则名称", 
+    "type": "类型",
+    "data_source": "数据源",
+    "data_table": "数据表",
+    "select_restricted_user": "选择受限用户",
+    "rule_group_1": "是否删除规则组：{msg}？",
+    "no_rule": "暂无规则",
+    "row_permission": "行权限",
+    "column_permission": "列权限",
+    "rule_rule_1": "是否删除规则：{msg}？",
+    "no_content": "暂无内容",
+    "edit_column_permission": "编辑列权限",
+    "edit_row_permission": "编辑行权限",
+    "add_column_permission": "添加列权限",
+    "add_row_permission": "添加行权限",
+    "no_fields_yet": "暂无字段"
   },
   "chat": {
     "chart_type": {
@@ -357,4 +393,4 @@
     "back_community": "还原至社区版",
     "confirm_tips": "确定还原至社区版？"
   }
-}
+}

frontend/src/components/layout/Menu.vue

@@ -1,5 +1,4 @@
 import { createRouter, createWebHashHistory } from 'vue-router'
-
 import Layout from '@/components/layout/index.vue'
 import LayoutDsl from '@/components/layout/LayoutDsl.vue'
 import SinglePage from '@/components/layout/SinglePage.vue'
@@ -11,10 +10,14 @@ import DashboardPreview from '@//views/dashboard/preview/SQPreviewSingle.vue'
 import Dashboard from '@/views/dashboard/index.vue'
 import Model from '@/views/system/model/Model.vue'
 import assistant from '@/views/embedded/assistant.vue'
-// import User from "@/views/system/user/index.vue";
+import Member from '@/views/system/member/index.vue'
+import Permission from '@/views/system/permission/index.vue'
 import User from '@/views/system/user/User.vue'
 import Workspace from '@/views/system/workspace/index.vue'
+import { i18n } from '@/i18n'
 import { watchRouter } from './watch'
+
+const t = i18n.global.t
 const router = createRouter({
   history: createWebHashHistory(),
   routes: [
@@ -32,7 +35,7 @@ const router = createRouter({
           path: 'index',
           name: 'chat',
           component: chat,
-          meta: { title: 'Data Q&A', icon: 'chat' },
+          meta: { title: t('menu.Data Q&A'), icon: 'chat' },
         },
       ],
     },
@@ -57,7 +60,7 @@ const router = createRouter({
           path: 'index',
           name: 'ds',
           component: Datasource,
-          meta: { title: 'Data Connections', icon: 'ds' },
+          meta: { title: t('menu.Data Connections'), icon: 'ds' },
         },
       ],
     },
@@ -70,7 +73,27 @@ const router = createRouter({
           path: 'index',
           name: 'dashboard',
           component: Dashboard,
-          meta: { title: 'Dashboard', icon: 'dashboard' },
+          meta: { title: t('dashboard.dashboard'), icon: 'dashboard' },
+        },
+      ],
+    },
+    {
+      path: '/set',
+      component: LayoutDsl,
+      redirect: '/set/member',
+      meta: { title: t('workspace.set'), icon: 'setting' },
+      children: [
+        {
+          path: '/set/member',
+          name: 'member',
+          component: Member,
+          meta: { title: t('workspace.member_management') },
+        },
+        {
+          path: '/set/permission',
+          name: 'permission',
+          component: Permission,
+          meta: { title: t('workspace.permission_configuration') },
         },
       ],
     },
@@ -127,13 +150,13 @@ const router = createRouter({
           path: 'user',
           name: 'user',
           component: User,
-          meta: { title: '用户管理', icon: 'user' },
+          meta: { title: t('user.user_management'), icon: 'user' },
         },
         {
           path: 'workspace',
           name: 'workspace',
           component: Workspace,
-          meta: { title: '工作空间', icon: 'workspace' },
+          meta: { title: t('user.workspace'), icon: 'workspace' },
         },
         {
           path: 'model',