From 0ef58745d01cab66acb8e5142ce7a43fa8c95ada Mon Sep 17 00:00:00 2001 From: wxg0103 <727495428@qq.com> Date: Wed, 28 Oct 2026 14:49:00 +0800 Subject: [PATCH] fix: backend permission bit error --- .../auth/constants/permission_constants.py | 187 +++++++++--------- ui/src/api/types/system-authentication.ts | 2 +- .../components/LoginSetting.vue | 17 +- 3 files changed, 105 insertions(+), 101 deletions(-) diff --git a/apps/common/auth/constants/permission_constants.py b/apps/common/auth/constants/permission_constants.py index e0d33058d96..ae6d7d48d08 100644 --- a/apps/common/auth/constants/permission_constants.py +++ b/apps/common/auth/constants/permission_constants.py @@ -225,7 +225,7 @@ class PermissionConstants(Enum): PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE, PermissionScopeConstants.WORKSPACE_RESOURCE], resource_permission_group_list=[ResourcePermissionConst.MODEL_VIEW], ), ) @@ -333,7 +333,7 @@ class PermissionConstants(Enum): role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, resource_permission_group_list=[ResourcePermissionConst.TOOL_VIEW], - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE, PermissionScopeConstants.WORKSPACE_RESOURCE], ), ) @@ -545,7 +545,7 @@ class PermissionConstants(Enum): PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE, PermissionScopeConstants.WORKSPACE_RESOURCE], resource_permission_group_list=[ResourcePermissionConst.KNOWLEDGE_VIEW], ), ) @@ -1526,17 +1526,17 @@ class PermissionConstants(Enum): # ==================== 应用 ==================== APPLICATION_READ = ( - Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.READ, bit_index=1), + Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.READ, bit_index=0), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE_RESOURCE, PermissionScopeConstants.WORKSPACE], resource_permission_group_list=[ResourcePermissionConst.APPLICATION_VIEW], ), ) APPLICATION_CREATE = ( - Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.CREATE, bit_index=2), + Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.CREATE, bit_index=1), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, @@ -1546,117 +1546,117 @@ class PermissionConstants(Enum): ) APPLICATION_COPY = ( - Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.COPY, bit_index=3), + Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.COPY, bit_index=2), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE_RESOURCE, PermissionScopeConstants.WORKSPACE], resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANAGE], ), ) APPLICATION_EDIT = ( - Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.EDIT, bit_index=4), + Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.EDIT, bit_index=3), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE_RESOURCE, PermissionScopeConstants.WORKSPACE], resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANAGE], ), ) APPLICATION_DELETE = ( - Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.DELETE, bit_index=5), + Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.DELETE, bit_index=4), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE_RESOURCE, PermissionScopeConstants.WORKSPACE], resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANAGE], ), ) APPLICATION_IMPORT = ( - Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.IMPORT, bit_index=6), + Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.IMPORT, bit_index=5), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE_RESOURCE, PermissionScopeConstants.WORKSPACE], resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANAGE], ), ) APPLICATION_EXPORT = ( - Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.EXPORT, bit_index=7), + Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.EXPORT, bit_index=6), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE_RESOURCE, PermissionScopeConstants.WORKSPACE], resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANAGE], ), ) APPLICATION_PUBLISH = ( - Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.PUBLISH, bit_index=8), + Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.PUBLISH, bit_index=7), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE_RESOURCE, PermissionScopeConstants.WORKSPACE], resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANAGE], ), ) APPLICATION_BATCH_DELETE = ( - Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.BATCH_DELETE, bit_index=9), + Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.BATCH_DELETE, bit_index=8), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE_RESOURCE, PermissionScopeConstants.WORKSPACE], resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANAGE], ), ) APPLICATION_BATCH_MOVE = ( - Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.BATCH_MOVE, bit_index=10), + Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.BATCH_MOVE, bit_index=9), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE_RESOURCE, PermissionScopeConstants.WORKSPACE], resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANAGE], ), ) APPLICATION_RESOURCE_AUTHORIZATION = ( - Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.AUTH, bit_index=11), + Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.AUTH, bit_index=10), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE_RESOURCE, PermissionScopeConstants.WORKSPACE], resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANAGE], ), ) APPLICATION_RELATE_RESOURCE_VIEW = ( - Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.RELATE_VIEW, bit_index=12), + Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.RELATE_VIEW, bit_index=11), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE_RESOURCE, PermissionScopeConstants.WORKSPACE], resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANAGE], ), ) # 应用触发器 APPLICATION_TRIGGER_READ = ( - Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.TRIGGER_READ, bit_index=13), + Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.TRIGGER_READ, bit_index=12), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE_RESOURCE, PermissionScopeConstants.WORKSPACE], ), ) APPLICATION_TRIGGER_CREATE = ( - Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.TRIGGER_CREATE, bit_index=14), + Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.TRIGGER_CREATE, bit_index=13), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, @@ -1665,244 +1665,244 @@ class PermissionConstants(Enum): ) APPLICATION_TRIGGER_EDIT = ( - Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.TRIGGER_EDIT, bit_index=15), + Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.TRIGGER_EDIT, bit_index=14), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE_RESOURCE, PermissionScopeConstants.WORKSPACE], ), ) APPLICATION_TRIGGER_DELETE = ( - Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.TRIGGER_DELETE, bit_index=16), + Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.TRIGGER_DELETE, bit_index=15), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE_RESOURCE, PermissionScopeConstants.WORKSPACE], ), ) APPLICATION_PORTAL_UP = ( - Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.PORTAL_UP, bit_index=17), + Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.PORTAL_UP, bit_index=16), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE_RESOURCE, PermissionScopeConstants.WORKSPACE], resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANAGE], ), ) APPLICATION_PORTAL_DOWN = ( - Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.PORTAL_DOWN, bit_index=18), + Permission(group=Group.APPLICATION, sub_group=Group.APPLICATION, operate=Operate.PORTAL_DOWN, bit_index=17), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE_RESOURCE, PermissionScopeConstants.WORKSPACE], resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANAGE], ), ) # ==================== 应用文件夹 ==================== APPLICATION_FOLDER_READ = ( - Permission(group=Group.APPLICATION, sub_group=Group.FOLDER, operate=Operate.READ, bit_index=0), + Permission(group=Group.APPLICATION, sub_group=Group.FOLDER, operate=Operate.READ, bit_index=18), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE_RESOURCE, PermissionScopeConstants.WORKSPACE], resource_permission_group_list=[ResourcePermissionConst.APPLICATION_VIEW], ), ) APPLICATION_FOLDER_CREATE = ( - Permission(group=Group.APPLICATION, sub_group=Group.FOLDER, operate=Operate.CREATE, bit_index=1), + Permission(group=Group.APPLICATION, sub_group=Group.FOLDER, operate=Operate.CREATE, bit_index=19), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE], + scope=[PermissionScopeConstants.WORKSPACE, PermissionScopeConstants.WORKSPACE_RESOURCE], resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANAGE], ), ) APPLICATION_FOLDER_EDIT = ( - Permission(group=Group.APPLICATION, sub_group=Group.FOLDER, operate=Operate.EDIT, bit_index=2), + Permission(group=Group.APPLICATION, sub_group=Group.FOLDER, operate=Operate.EDIT, bit_index=20), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE_RESOURCE, PermissionScopeConstants.WORKSPACE], resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANAGE], ), ) APPLICATION_FOLDER_DELETE = ( - Permission(group=Group.APPLICATION, sub_group=Group.FOLDER, operate=Operate.DELETE, bit_index=3), + Permission(group=Group.APPLICATION, sub_group=Group.FOLDER, operate=Operate.DELETE, bit_index=21), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE_RESOURCE, PermissionScopeConstants.WORKSPACE], resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANAGE], ), ) APPLICATION_FOLDER_AUTH = ( - Permission(group=Group.APPLICATION, sub_group=Group.FOLDER, operate=Operate.AUTH, bit_index=4), + Permission(group=Group.APPLICATION, sub_group=Group.FOLDER, operate=Operate.AUTH, bit_index=22), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE_RESOURCE, PermissionScopeConstants.WORKSPACE], resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANAGE], ), ) # ==================== 应用概览 ==================== APPLICATION_OVERVIEW_READ = ( - Permission(group=Group.APPLICATION, sub_group=Group.OVERVIEW, operate=Operate.READ, bit_index=0), + Permission(group=Group.APPLICATION, sub_group=Group.OVERVIEW, operate=Operate.READ, bit_index=23), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE_RESOURCE, PermissionScopeConstants.WORKSPACE], resource_permission_group_list=[ResourcePermissionConst.APPLICATION_VIEW], ), ) APPLICATION_OVERVIEW_EMBED = ( - Permission(group=Group.APPLICATION, sub_group=Group.OVERVIEW, operate=Operate.EMBED, bit_index=1), + Permission(group=Group.APPLICATION, sub_group=Group.OVERVIEW, operate=Operate.EMBED, bit_index=24), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE_RESOURCE, PermissionScopeConstants.WORKSPACE], resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANAGE], ), ) APPLICATION_OVERVIEW_ACCESS = ( - Permission(group=Group.APPLICATION, sub_group=Group.OVERVIEW, operate=Operate.ACCESS, bit_index=2), + Permission(group=Group.APPLICATION, sub_group=Group.OVERVIEW, operate=Operate.ACCESS, bit_index=25), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE_RESOURCE, PermissionScopeConstants.WORKSPACE], resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANAGE], ), ) APPLICATION_OVERVIEW_DISPLAY = ( - Permission(group=Group.APPLICATION, sub_group=Group.OVERVIEW, operate=Operate.DISPLAY, bit_index=3), + Permission(group=Group.APPLICATION, sub_group=Group.OVERVIEW, operate=Operate.DISPLAY, bit_index=26), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE_RESOURCE, PermissionScopeConstants.WORKSPACE], resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANAGE], ), ) APPLICATION_OVERVIEW_API_KEY = ( - Permission(group=Group.APPLICATION, sub_group=Group.OVERVIEW, operate=Operate.API_KEY, bit_index=4), + Permission(group=Group.APPLICATION, sub_group=Group.OVERVIEW, operate=Operate.API_KEY, bit_index=27), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE_RESOURCE, PermissionScopeConstants.WORKSPACE], resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANAGE], ), ) APPLICATION_OVERVIEW_PUBLIC = ( - Permission(group=Group.APPLICATION, sub_group=Group.OVERVIEW, operate=Operate.PUBLIC_ACCESS, bit_index=5), + Permission(group=Group.APPLICATION, sub_group=Group.OVERVIEW, operate=Operate.PUBLIC_ACCESS, bit_index=28), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE_RESOURCE, PermissionScopeConstants.WORKSPACE], resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANAGE], ), ) # ==================== 应用接入 ==================== APPLICATION_ACCESS_READ = ( - Permission(group=Group.APPLICATION, sub_group=Group.ACCESS, operate=Operate.READ, bit_index=0), + Permission(group=Group.APPLICATION, sub_group=Group.ACCESS, operate=Operate.READ, bit_index=29), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE_RESOURCE, PermissionScopeConstants.WORKSPACE], resource_permission_group_list=[ResourcePermissionConst.APPLICATION_VIEW], ), ) APPLICATION_ACCESS_EDIT = ( - Permission(group=Group.APPLICATION, sub_group=Group.ACCESS, operate=Operate.EDIT, bit_index=1), + Permission(group=Group.APPLICATION, sub_group=Group.ACCESS, operate=Operate.EDIT, bit_index=30), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE_RESOURCE, PermissionScopeConstants.WORKSPACE], resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANAGE], ), ) # ==================== 应用对话用户 ==================== APPLICATION_CHAT_USER_READ = ( - Permission(group=Group.APPLICATION, sub_group=Group.CHAT_USER, operate=Operate.READ, bit_index=0), + Permission(group=Group.APPLICATION, sub_group=Group.CHAT_USER, operate=Operate.READ, bit_index=31), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE_RESOURCE, PermissionScopeConstants.WORKSPACE], resource_permission_group_list=[ResourcePermissionConst.APPLICATION_VIEW], ), ) APPLICATION_CHAT_USER_EDIT = ( - Permission(group=Group.APPLICATION, sub_group=Group.CHAT_USER, operate=Operate.EDIT, bit_index=1), + Permission(group=Group.APPLICATION, sub_group=Group.CHAT_USER, operate=Operate.EDIT, bit_index=32), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE_RESOURCE, PermissionScopeConstants.WORKSPACE], resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANAGE], ), ) # ==================== 应用对话日志 ==================== APPLICATION_CHAT_LOG_READ = ( - Permission(group=Group.APPLICATION, sub_group=Group.CHAT_LOG, operate=Operate.READ, bit_index=0), + Permission(group=Group.APPLICATION, sub_group=Group.CHAT_LOG, operate=Operate.READ, bit_index=33), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE_RESOURCE, PermissionScopeConstants.WORKSPACE], resource_permission_group_list=[ResourcePermissionConst.APPLICATION_VIEW], ), ) APPLICATION_CHAT_LOG_ANNOTATION = ( - Permission(group=Group.APPLICATION, sub_group=Group.CHAT_LOG, operate=Operate.ANNOTATION, bit_index=1), + Permission(group=Group.APPLICATION, sub_group=Group.CHAT_LOG, operate=Operate.ANNOTATION, bit_index=34), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE_RESOURCE, PermissionScopeConstants.WORKSPACE], resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANAGE], ), ) APPLICATION_CHAT_LOG_EXPORT = ( - Permission(group=Group.APPLICATION, sub_group=Group.CHAT_LOG, operate=Operate.EXPORT, bit_index=2), + Permission(group=Group.APPLICATION, sub_group=Group.CHAT_LOG, operate=Operate.EXPORT, bit_index=35), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE_RESOURCE, PermissionScopeConstants.WORKSPACE], resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANAGE], ), ) APPLICATION_CHAT_LOG_CLEAR_POLICY = ( - Permission(group=Group.APPLICATION, sub_group=Group.CHAT_LOG, operate=Operate.CLEAR_POLICY, bit_index=3), + Permission(group=Group.APPLICATION, sub_group=Group.CHAT_LOG, operate=Operate.CLEAR_POLICY, bit_index=36), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE_RESOURCE, PermissionScopeConstants.WORKSPACE], resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANAGE], ), ) APPLICATION_CHAT_LOG_ADD_KNOWLEDGE = ( - Permission(group=Group.APPLICATION, sub_group=Group.CHAT_LOG, operate=Operate.ADD_KNOWLEDGE, bit_index=4), + Permission(group=Group.APPLICATION, sub_group=Group.CHAT_LOG, operate=Operate.ADD_KNOWLEDGE, bit_index=37), PermissionMeta( role_list=[RoleConstants.WORKSPACE_MANAGE, RoleConstants.USER], category=Category.WORKSPACE, - scope=[PermissionScopeConstants.WORKSPACE_RESOURCE], + scope=[PermissionScopeConstants.WORKSPACE_RESOURCE, PermissionScopeConstants.WORKSPACE], resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANAGE], ), ) @@ -2990,7 +2990,7 @@ class PermissionConstants(Enum): # 资源管理 - 应用概览 RESOURCE_APPLICATION_OVERVIEW_READ = ( Permission( - group=Group.SYSTEM_RES_APPLICATION, sub_group=Group.SYSTEM_OVERVIEW, operate=Operate.READ, bit_index=0 + group=Group.SYSTEM_RES_APPLICATION, sub_group=Group.SYSTEM_OVERVIEW, operate=Operate.READ, bit_index=14 ), PermissionMeta( role_list=[RoleConstants.ADMIN], @@ -3002,7 +3002,7 @@ class PermissionConstants(Enum): RESOURCE_APPLICATION_OVERVIEW_EMBED = ( Permission( - group=Group.SYSTEM_RES_APPLICATION, sub_group=Group.SYSTEM_OVERVIEW, operate=Operate.EMBED, bit_index=1 + group=Group.SYSTEM_RES_APPLICATION, sub_group=Group.SYSTEM_OVERVIEW, operate=Operate.EMBED, bit_index=15 ), PermissionMeta( role_list=[RoleConstants.ADMIN], @@ -3014,7 +3014,7 @@ class PermissionConstants(Enum): RESOURCE_APPLICATION_OVERVIEW_ACCESS = ( Permission( - group=Group.SYSTEM_RES_APPLICATION, sub_group=Group.SYSTEM_OVERVIEW, operate=Operate.ACCESS, bit_index=2 + group=Group.SYSTEM_RES_APPLICATION, sub_group=Group.SYSTEM_OVERVIEW, operate=Operate.ACCESS, bit_index=16 ), PermissionMeta( role_list=[RoleConstants.ADMIN], @@ -3026,7 +3026,7 @@ class PermissionConstants(Enum): RESOURCE_APPLICATION_OVERVIEW_DISPLAY = ( Permission( - group=Group.SYSTEM_RES_APPLICATION, sub_group=Group.SYSTEM_OVERVIEW, operate=Operate.DISPLAY, bit_index=3 + group=Group.SYSTEM_RES_APPLICATION, sub_group=Group.SYSTEM_OVERVIEW, operate=Operate.DISPLAY, bit_index=17 ), PermissionMeta( role_list=[RoleConstants.ADMIN], @@ -3038,7 +3038,7 @@ class PermissionConstants(Enum): RESOURCE_APPLICATION_OVERVIEW_API_KEY = ( Permission( - group=Group.SYSTEM_RES_APPLICATION, sub_group=Group.SYSTEM_OVERVIEW, operate=Operate.API_KEY, bit_index=4 + group=Group.SYSTEM_RES_APPLICATION, sub_group=Group.SYSTEM_OVERVIEW, operate=Operate.API_KEY, bit_index=18 ), PermissionMeta( role_list=[RoleConstants.ADMIN], @@ -3053,7 +3053,7 @@ class PermissionConstants(Enum): group=Group.SYSTEM_RES_APPLICATION, sub_group=Group.SYSTEM_OVERVIEW, operate=Operate.PUBLIC_ACCESS, - bit_index=5, + bit_index=19, ), PermissionMeta( role_list=[RoleConstants.ADMIN], @@ -3066,7 +3066,7 @@ class PermissionConstants(Enum): # 资源管理 - 应用接入 RESOURCE_APPLICATION_ACCESS_READ = ( Permission( - group=Group.SYSTEM_RES_APPLICATION, sub_group=Group.SYSTEM_ACCESS, operate=Operate.READ, bit_index=0 + group=Group.SYSTEM_RES_APPLICATION, sub_group=Group.SYSTEM_ACCESS, operate=Operate.READ, bit_index=20 ), PermissionMeta( role_list=[RoleConstants.ADMIN], @@ -3078,7 +3078,7 @@ class PermissionConstants(Enum): RESOURCE_APPLICATION_ACCESS_EDIT = ( Permission( - group=Group.SYSTEM_RES_APPLICATION, sub_group=Group.SYSTEM_ACCESS, operate=Operate.EDIT, bit_index=1 + group=Group.SYSTEM_RES_APPLICATION, sub_group=Group.SYSTEM_ACCESS, operate=Operate.EDIT, bit_index=21 ), PermissionMeta( role_list=[RoleConstants.ADMIN], @@ -3091,7 +3091,7 @@ class PermissionConstants(Enum): # 资源管理 - 应用对话用户 RESOURCE_APPLICATION_CHAT_USER_READ = ( Permission( - group=Group.SYSTEM_RES_APPLICATION, sub_group=Group.SYSTEM_CHAT_USER, operate=Operate.READ, bit_index=0 + group=Group.SYSTEM_RES_APPLICATION, sub_group=Group.SYSTEM_CHAT_USER, operate=Operate.READ, bit_index=22 ), PermissionMeta( role_list=[RoleConstants.ADMIN], @@ -3103,7 +3103,7 @@ class PermissionConstants(Enum): RESOURCE_APPLICATION_CHAT_USER_EDIT = ( Permission( - group=Group.SYSTEM_RES_APPLICATION, sub_group=Group.SYSTEM_CHAT_USER, operate=Operate.EDIT, bit_index=1 + group=Group.SYSTEM_RES_APPLICATION, sub_group=Group.SYSTEM_CHAT_USER, operate=Operate.EDIT, bit_index=23 ), PermissionMeta( role_list=[RoleConstants.ADMIN], @@ -3116,7 +3116,7 @@ class PermissionConstants(Enum): # 资源管理 - 应用对话日志 RESOURCE_APPLICATION_CHAT_LOG_READ = ( Permission( - group=Group.SYSTEM_RES_APPLICATION, sub_group=Group.SYSTEM_CHAT_LOG, operate=Operate.READ, bit_index=0 + group=Group.SYSTEM_RES_APPLICATION, sub_group=Group.SYSTEM_CHAT_LOG, operate=Operate.READ, bit_index=24 ), PermissionMeta( role_list=[RoleConstants.ADMIN], @@ -3131,7 +3131,7 @@ class PermissionConstants(Enum): group=Group.SYSTEM_RES_APPLICATION, sub_group=Group.SYSTEM_CHAT_LOG, operate=Operate.ADD_KNOWLEDGE, - bit_index=1, + bit_index=25, ), PermissionMeta( role_list=[RoleConstants.ADMIN], @@ -3143,7 +3143,10 @@ class PermissionConstants(Enum): RESOURCE_APPLICATION_CHAT_LOG_ANNOTATION = ( Permission( - group=Group.SYSTEM_RES_APPLICATION, sub_group=Group.SYSTEM_CHAT_LOG, operate=Operate.ANNOTATION, bit_index=2 + group=Group.SYSTEM_RES_APPLICATION, + sub_group=Group.SYSTEM_CHAT_LOG, + operate=Operate.ANNOTATION, + bit_index=26, ), PermissionMeta( role_list=[RoleConstants.ADMIN], @@ -3155,7 +3158,7 @@ class PermissionConstants(Enum): RESOURCE_APPLICATION_CHAT_LOG_EXPORT = ( Permission( - group=Group.SYSTEM_RES_APPLICATION, sub_group=Group.SYSTEM_CHAT_LOG, operate=Operate.EXPORT, bit_index=3 + group=Group.SYSTEM_RES_APPLICATION, sub_group=Group.SYSTEM_CHAT_LOG, operate=Operate.EXPORT, bit_index=27 ), PermissionMeta( role_list=[RoleConstants.ADMIN], @@ -3170,7 +3173,7 @@ class PermissionConstants(Enum): group=Group.SYSTEM_RES_APPLICATION, sub_group=Group.SYSTEM_CHAT_LOG, operate=Operate.CLEAR_POLICY, - bit_index=4, + bit_index=28, ), PermissionMeta( role_list=[RoleConstants.ADMIN], diff --git a/ui/src/api/types/system-authentication.ts b/ui/src/api/types/system-authentication.ts index 8b4a4c264a7..9b0b4d101d4 100644 --- a/ui/src/api/types/system-authentication.ts +++ b/ui/src/api/types/system-authentication.ts @@ -13,7 +13,7 @@ export interface AuthProviderSettingPayload { export interface LoginAuthSettingPayload { default_value: string failed_attempts: number - group_id?: string + group_ids?: string[] lock_time: number login_methods: string[] max_attempts: number diff --git a/ui/src/views/system/settings/authentication/components/LoginSetting.vue b/ui/src/views/system/settings/authentication/components/LoginSetting.vue index 1a0b95d80ce..e6924a02e0b 100644 --- a/ui/src/views/system/settings/authentication/components/LoginSetting.vue +++ b/ui/src/views/system/settings/authentication/components/LoginSetting.vue @@ -23,7 +23,7 @@ const loginSettingFields = [ 'lock_time', 'role_id', 'workspace_id', - 'group_id', + 'group_ids', ] as const const form = reactive>({ login_methods: [LOGIN_METHOD.LOCAL], @@ -33,7 +33,7 @@ const form = reactive>({ lock_time: 10, role_id: ROLE_TYPE.USER, workspace_id: 'default', - group_id: undefined, + group_ids: [], }) const rules: FormRules = { default_value: [{ required: true, message: '请选择默认登录方式', trigger: 'change' }], @@ -102,13 +102,13 @@ function loadRoleSettingOptions() { function handleRoleChange() { if (!showWorkspaceSelector.value) { form.workspace_id = undefined - form.group_id = undefined + form.group_ids = [] userGroups.value = [] } } function handleWorkspaceChange() { - form.group_id = undefined + form.group_ids = [] loadUserGroups() } @@ -119,7 +119,7 @@ const userGroups = ref([]) function loadUserGroups() { if (!form.workspace_id || !showWorkspaceSelector.value) { userGroups.value = [] - form.group_id = undefined + form.group_ids = [] return Promise.resolve() } @@ -127,8 +127,9 @@ function loadUserGroups() { return UserGroupsApi.getSystemUserGroups(form.workspace_id) .then((groups) => { userGroups.value = groups - if (!groups.some(({ id }) => id === form.group_id)) { - form.group_id = undefined + form.group_ids = (form.group_ids ?? []).filter((id) => groups.some(({ id: groupId }) => groupId === id)) + if (!form.group_ids.length) { + form.group_ids = [] } }) .finally(() => { @@ -254,7 +255,7 @@ onMounted(() => { - +