diff --git a/ui/src/router/modules/system.ts b/ui/src/router/modules/system.ts index c5051a650..9433bba00 100644 --- a/ui/src/router/modules/system.ts +++ b/ui/src/router/modules/system.ts @@ -19,12 +19,8 @@ const systemRouter = { parentPath: '/system', parentName: 'system', permission: [ - new ComplexPermission( - [RoleConst.ADMIN,], - [PermissionConst.USER_READ], - [EditionConst.IS_EE], - 'OR', - ), + RoleConst.ADMIN, + PermissionConst.USER_READ ], }, component: () => import('@/views/system/user-manage/index.vue'), @@ -63,7 +59,9 @@ const systemRouter = { permission: [ new ComplexPermission( [RoleConst.WORKSPACE_MANAGE, RoleConst.ADMIN], - [PermissionConst.WORKSPACE_WORKSPACE_READ.getWorkspacePermissionWorkspaceManageRole], + [PermissionConst.WORKSPACE_READ.getWorkspacePermissionWorkspaceManageRole, + PermissionConst.WORKSPACE_READ + ], [EditionConst.IS_EE], 'OR', ), diff --git a/ui/src/utils/permission/data.ts b/ui/src/utils/permission/data.ts index 91eb6da8c..a38a5646b 100644 --- a/ui/src/utils/permission/data.ts +++ b/ui/src/utils/permission/data.ts @@ -25,10 +25,10 @@ import { Permission, Role, Edition } from '@/utils/permission/type' // ANNOTATION = "READ+ANNOTATION" # 标注 // CLEAR_POLICY = "READ+CLEAR_POLICY" const PermissionConst = { - USER_READ: new Permission('USER:READ'), - USER_CREATE: new Permission('USER:READ+CREATE'), - USER_EDIT: new Permission('USER:READ+EDIT'), - USER_DELETE: new Permission('USER:READ+DELETE'), + USER_READ: new Permission('USER_MANAGEMENT:READ'), + USER_CREATE: new Permission('USER_MANAGEMENT:READ+CREATE'), + USER_EDIT: new Permission('USER_MANAGEMENT:READ+EDIT'), + USER_DELETE: new Permission('USER_MANAGEMENT:READ+DELETE'), WORKSPACE_USER_RESOURCE_PERMISSION_READ: new Permission('WORKSPACE_USER_RESOURCE_PERMISSION:READ'), WORKSPACE_USER_RESOURCE_PERMISSION_EDIT: new Permission('WORKSPACE_USER_RESOURCE_PERMISSION:READ+EDIT'), diff --git a/ui/src/views/system/workspace/component/Member.vue b/ui/src/views/system/workspace/component/Member.vue index b84e85c56..63acbae35 100644 --- a/ui/src/views/system/workspace/component/Member.vue +++ b/ui/src/views/system/workspace/component/Member.vue @@ -1,7 +1,9 @@