From 530928af3867f2b8006d7d7d9948a62aba512512 Mon Sep 17 00:00:00 2001 From: zhangzhanwei Date: Thu, 26 Jun 2025 21:00:53 +0800 Subject: [PATCH] fix: System router permission --- apps/common/constants/permission_constants.py | 5 ++--- ui/src/router/modules/application.ts | 2 +- ui/src/router/modules/system.ts | 21 ++++++++++++------- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/apps/common/constants/permission_constants.py b/apps/common/constants/permission_constants.py index 71abc619f..82582e747 100644 --- a/apps/common/constants/permission_constants.py +++ b/apps/common/constants/permission_constants.py @@ -745,12 +745,12 @@ class PermissionConstants(Enum): parent_group=[WorkspaceGroup.APPLICATION, UserGroup.APPLICATION], resource_permission_group_list=[ResourcePermissionGroup.MANAGE]) - APPLICATION_CHAT_USER_READ = Permission(group=Group.CHAT_USER, operate=Operate.READ, + APPLICATION_CHAT_USER_READ = Permission(group=Group.APPLICATION_CHAT_USER, operate=Operate.READ, role_list=[RoleConstants.ADMIN, RoleConstants.USER], parent_group=[WorkspaceGroup.APPLICATION, UserGroup.APPLICATION], resource_permission_group_list=[ResourcePermissionGroup.MANAGE], ) - APPLICATION_CHAT_USER_EDIT = Permission(group=Group.CHAT_USER, operate=Operate.EDIT, + APPLICATION_CHAT_USER_EDIT = Permission(group=Group.APPLICATION_CHAT_USER, operate=Operate.EDIT, role_list=[RoleConstants.ADMIN, RoleConstants.USER], parent_group=[WorkspaceGroup.APPLICATION, UserGroup.APPLICATION], resource_permission_group_list=[ResourcePermissionGroup.MANAGE], @@ -818,7 +818,6 @@ class PermissionConstants(Enum): CHAT_USER_READ = Permission(group=Group.CHAT_USER, operate=Operate.READ, role_list=[RoleConstants.ADMIN], parent_group=[SystemGroup.CHAT_USER], - label=_('Sync users') ) CHAT_USER_CREATE = Permission(group=Group.CHAT_USER, operate=Operate.CREATE, role_list=[RoleConstants.ADMIN], diff --git a/ui/src/router/modules/application.ts b/ui/src/router/modules/application.ts index aa2682117..c3fcbea9a 100644 --- a/ui/src/router/modules/application.ts +++ b/ui/src/router/modules/application.ts @@ -1,4 +1,4 @@ -import { PermissionConst, EditionConst, RoleConst } from '@/utils/permission/data' +import { PermissionConst, RoleConst } from '@/utils/permission/data' const applicationRouter = { path: '/application', name: 'application', diff --git a/ui/src/router/modules/system.ts b/ui/src/router/modules/system.ts index 341860898..f6196a081 100644 --- a/ui/src/router/modules/system.ts +++ b/ui/src/router/modules/system.ts @@ -18,6 +18,7 @@ const systemRouter = { activeMenu: '/system', parentPath: '/system', parentName: 'system', + sameRoute: 'user', permission: [RoleConst.ADMIN, PermissionConst.USER_READ], }, component: () => import('@/views/system/user-manage/index.vue'), @@ -32,6 +33,7 @@ const systemRouter = { activeMenu: '/system', parentPath: '/system', parentName: 'system', + sameRoute: 'role', permission: [ new ComplexPermission( [RoleConst.ADMIN, RoleConst.WORKSPACE_MANAGE.getWorkspaceRole], @@ -53,6 +55,7 @@ const systemRouter = { activeMenu: '/system', parentPath: '/system', parentName: 'system', + sameRoute: 'workspace', permission: [ new ComplexPermission( [RoleConst.WORKSPACE_MANAGE, RoleConst.ADMIN], @@ -102,6 +105,7 @@ const systemRouter = { activeMenu: '/system', parentPath: '/system', parentName: 'system', + sameRoute: 'authorization', }, component: () => import('@/views/system/resource-authorization/index.vue'), }, @@ -187,10 +191,11 @@ const systemRouter = { activeMenu: '/system', parentPath: '/system', parentName: 'system', + sameRoute: 'chat', permission: [ new ComplexPermission( - [RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, RoleConst.ADMIN], - [PermissionConst.WORKSPACE_USER_GROUP_READ], + [RoleConst.WORKSPACE_MANAGE, RoleConst.ADMIN], + [PermissionConst.WORKSPACE_CHAT_USER_READ, PermissionConst.CHAT_USER_READ], [EditionConst.IS_EE, EditionConst.IS_PE], 'OR', ), @@ -207,8 +212,8 @@ const systemRouter = { parentName: 'system', permission: [ new ComplexPermission( - [RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, RoleConst.ADMIN], - [PermissionConst.WORKSPACE_CHAT_USER_READ], + [RoleConst.WORKSPACE_MANAGE, RoleConst.ADMIN], + [PermissionConst.CHAT_USER_READ, PermissionConst.WORKSPACE_CHAT_USER_READ], [EditionConst.IS_EE, EditionConst.IS_PE], 'OR', ), @@ -226,8 +231,8 @@ const systemRouter = { parentName: 'system', permission: [ new ComplexPermission( - [RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, RoleConst.ADMIN], - [PermissionConst.WORKSPACE_USER_GROUP_READ], + [RoleConst.WORKSPACE_MANAGE, RoleConst.ADMIN], + [PermissionConst.WORKSPACE_USER_GROUP_READ, PermissionConst.USER_GROUP_READ], [EditionConst.IS_EE, EditionConst.IS_PE], 'OR', ), @@ -245,7 +250,7 @@ const systemRouter = { parentName: 'system', permission: [ new ComplexPermission( - [RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, RoleConst.ADMIN], + [RoleConst.ADMIN], [PermissionConst.CHAT_USER_AUTH_READ], [EditionConst.IS_EE, EditionConst.IS_PE], 'OR', @@ -266,6 +271,7 @@ const systemRouter = { activeMenu: '/system', parentPath: '/system', parentName: 'system', + sameRoute: 'setting', }, children: [ { @@ -315,6 +321,7 @@ const systemRouter = { activeMenu: '/system', parentPath: '/system', parentName: 'system', + sameRoute: 'operate', permission: [EditionConst.IS_PE, EditionConst.IS_EE], }, component: () => import('@/views/system/operate-log/index.vue'),