@@ -90,11 +90,11 @@ class SystemGroup(Enum):
9090 USER_MANAGEMENT = "USER_MANAGEMENT"
9191 ROLE = "ROLE"
9292 WORKSPACE = "WORKSPACE"
93- RESOURCE = "RESOURCE"
94- # RESOURCE_APPLICATION = "RESOURCE_APPLICATION"
95- # RESOURCE_KNOWLEDGE = "RESOURCE_KNOWLEDGE"
96- # RESOURCE_TOOL = "RESOURCE_TOOL"
97- # RESOURCE_MODEL = "RESOURCE_MODEL"
93+ # RESOURCE = "RESOURCE"
94+ RESOURCE_APPLICATION = "RESOURCE_APPLICATION"
95+ RESOURCE_KNOWLEDGE = "RESOURCE_KNOWLEDGE"
96+ RESOURCE_TOOL = "RESOURCE_TOOL"
97+ RESOURCE_MODEL = "RESOURCE_MODEL"
9898 RESOURCE_PERMISSION = "RESOURCE_PERMISSION"
9999 SHARED_KNOWLEDGE = "SHARED_KNOWLEDGE"
100100 SHARED_MODEL = "SHARED_MODEL"
@@ -280,10 +280,10 @@ def get_workspace_role(self):
280280 SystemGroup .USER_MANAGEMENT .value : _ ("User Management" ),
281281 SystemGroup .ROLE .value : _ ("Role" ),
282282 SystemGroup .WORKSPACE .value : _ ("Workspace" ),
283- # SystemGroup.RESOURCE_APPLICATION.value: _("Resource Application"),
284- # SystemGroup.RESOURCE_KNOWLEDGE.value: _("Resource Knowledge"),
285- # SystemGroup.RESOURCE_TOOL.value: _("Resource Tool"),
286- # SystemGroup.RESOURCE_MODEL.value: _("Resource Model"),
283+ SystemGroup .RESOURCE_APPLICATION .value : _ ("Resource Application" ),
284+ SystemGroup .RESOURCE_KNOWLEDGE .value : _ ("Resource Knowledge" ),
285+ SystemGroup .RESOURCE_TOOL .value : _ ("Resource Tool" ),
286+ SystemGroup .RESOURCE_MODEL .value : _ ("Resource Model" ),
287287 SystemGroup .RESOURCE_PERMISSION .value : _ ("Resource Permission" ),
288288 SystemGroup .SHARED_KNOWLEDGE .value : _ ("Shared Knowledge" ),
289289 SystemGroup .SHARED_MODEL .value : _ ("Shared Model" ),
@@ -364,7 +364,7 @@ def get_workspace_role(self):
364364 Group .MODEL_WORKSPACE_USER_RESOURCE_PERMISSION .value : _ ("Model" ),
365365 Group .TOOL_WORKSPACE_USER_RESOURCE_PERMISSION .value : _ ("Tool" ),
366366 Group .SYSTEM_RES_APPLICATION .value : _ ("Application" ),
367- SystemGroup .RESOURCE .value : _ ("Resource" ),
367+ # SystemGroup.RESOURCE.value: _("Resource"),
368368}
369369
370370
@@ -374,7 +374,7 @@ class Permission:
374374 """
375375
376376 def __init__ (self , group : Group , operate : Operate , resource_path = None , role_list = None ,
377- resource_permission_group_list = None , parent_group = None , label = None , is_ee = True , is_show = True ):
377+ resource_permission_group_list = None , parent_group = None , label = None , is_ee = True ):
378378 if role_list is None :
379379 role_list = []
380380 if resource_permission_group_list is None :
@@ -389,7 +389,6 @@ def __init__(self, group: Group, operate: Operate, resource_path=None, role_list
389389 self .parent_group = parent_group # 新增字段:父级组
390390 self .label = label
391391 self .is_ee = is_ee # 是否是企业版权限
392- self .is_show = is_show # 是否在前端展示
393392
394393 @staticmethod
395394 def new_instance (permission_str : str ):
@@ -1195,128 +1194,128 @@ class PermissionConstants(Enum):
11951194 )
11961195 RESOURCE_APPLICATION_READ = Permission (
11971196 group = Group .SYSTEM_RES_APPLICATION , operate = Operate .READ , role_list = [RoleConstants .ADMIN ],
1198- parent_group = [SystemGroup .RESOURCE ]
1197+ parent_group = [SystemGroup .RESOURCE_APPLICATION ]
11991198 )
12001199
12011200 RESOURCE_KNOWLEDGE_READ = Permission (
12021201 group = Group .SYSTEM_RES_KNOWLEDGE , operate = Operate .READ , role_list = [RoleConstants .ADMIN ],
1203- parent_group = [SystemGroup .RESOURCE ]
1202+ parent_group = [SystemGroup .RESOURCE_KNOWLEDGE ]
12041203 )
12051204 RESOURCE_KNOWLEDGE_CREATE = Permission (
12061205 group = Group .SYSTEM_RES_KNOWLEDGE , operate = Operate .CREATE , role_list = [RoleConstants .ADMIN ],
1207- parent_group = [SystemGroup .RESOURCE ], is_show = False
1206+ parent_group = [SystemGroup .RESOURCE_KNOWLEDGE ]
12081207 )
12091208 RESOURCE_KNOWLEDGE_EDIT = Permission (
12101209 group = Group .SYSTEM_RES_KNOWLEDGE , operate = Operate .EDIT , role_list = [RoleConstants .ADMIN ],
1211- parent_group = [SystemGroup .RESOURCE ], is_show = False
1210+ parent_group = [SystemGroup .RESOURCE_KNOWLEDGE ]
12121211 )
12131212 RESOURCE_KNOWLEDGE_SYNC = Permission (
12141213 group = Group .SYSTEM_RES_KNOWLEDGE , operate = Operate .SYNC , role_list = [RoleConstants .ADMIN ],
1215- parent_group = [SystemGroup .RESOURCE ], is_show = False
1214+ parent_group = [SystemGroup .RESOURCE_KNOWLEDGE ]
12161215 )
12171216 RESOURCE_KNOWLEDGE_VECTOR = Permission (
12181217 group = Group .SYSTEM_RES_KNOWLEDGE , operate = Operate .VECTOR , role_list = [RoleConstants .ADMIN ],
1219- parent_group = [SystemGroup .RESOURCE ], is_show = False
1218+ parent_group = [SystemGroup .RESOURCE_KNOWLEDGE ]
12201219 )
12211220 RESOURCE_KNOWLEDGE_EXPORT = Permission (
12221221 group = Group .SYSTEM_RES_KNOWLEDGE , operate = Operate .EXPORT , role_list = [RoleConstants .ADMIN ],
1223- parent_group = [SystemGroup .RESOURCE ], is_show = False
1222+ parent_group = [SystemGroup .RESOURCE_KNOWLEDGE ]
12241223 )
12251224 RESOURCE_KNOWLEDGE_GENERATE = Permission (
12261225 group = Group .SYSTEM_RES_KNOWLEDGE , operate = Operate .GENERATE , role_list = [RoleConstants .ADMIN ],
1227- parent_group = [SystemGroup .RESOURCE ], is_show = False
1226+ parent_group = [SystemGroup .RESOURCE_KNOWLEDGE ]
12281227 )
12291228 RESOURCE_KNOWLEDGE_DELETE = Permission (
12301229 group = Group .SYSTEM_RES_KNOWLEDGE , operate = Operate .DELETE , role_list = [RoleConstants .ADMIN ],
1231- parent_group = [SystemGroup .RESOURCE ], is_show = False
1230+ parent_group = [SystemGroup .RESOURCE_KNOWLEDGE ]
12321231 )
12331232 RESOURCE_KNOWLEDGE_DOCUMENT_READ = Permission (
12341233 group = Group .SYSTEM_RES_KNOWLEDGE_DOCUMENT , operate = Operate .READ , role_list = [RoleConstants .ADMIN ],
1235- parent_group = [SystemGroup .RESOURCE ], is_show = False
1234+ parent_group = [SystemGroup .RESOURCE_KNOWLEDGE ]
12361235 )
12371236 RESOURCE_KNOWLEDGE_DOCUMENT_CREATE = Permission (
12381237 group = Group .SYSTEM_RES_KNOWLEDGE_DOCUMENT , operate = Operate .CREATE , role_list = [RoleConstants .ADMIN ],
1239- parent_group = [SystemGroup .RESOURCE ], is_show = False
1238+ parent_group = [SystemGroup .RESOURCE_KNOWLEDGE ]
12401239 )
12411240 RESOURCE_KNOWLEDGE_DOCUMENT_EDIT = Permission (
12421241 group = Group .SYSTEM_RES_KNOWLEDGE_DOCUMENT , operate = Operate .EDIT , role_list = [RoleConstants .ADMIN ],
1243- parent_group = [SystemGroup .RESOURCE ], is_show = False
1242+ parent_group = [SystemGroup .RESOURCE_KNOWLEDGE ]
12441243 )
12451244 RESOURCE_KNOWLEDGE_DOCUMENT_DELETE = Permission (
12461245 group = Group .SYSTEM_RES_KNOWLEDGE_DOCUMENT , operate = Operate .DELETE , role_list = [RoleConstants .ADMIN ],
1247- parent_group = [SystemGroup .RESOURCE ], is_show = False
1246+ parent_group = [SystemGroup .RESOURCE_KNOWLEDGE ]
12481247 )
12491248 RESOURCE_KNOWLEDGE_DOCUMENT_SYNC = Permission (
12501249 group = Group .SYSTEM_RES_KNOWLEDGE_DOCUMENT , operate = Operate .SYNC , role_list = [RoleConstants .ADMIN ],
1251- parent_group = [SystemGroup .RESOURCE ], is_show = False
1250+ parent_group = [SystemGroup .RESOURCE_KNOWLEDGE ]
12521251 )
12531252 RESOURCE_KNOWLEDGE_DOCUMENT_EXPORT = Permission (
12541253 group = Group .SYSTEM_RES_KNOWLEDGE_DOCUMENT , operate = Operate .EXPORT , role_list = [RoleConstants .ADMIN ],
1255- parent_group = [SystemGroup .RESOURCE ], is_show = False
1254+ parent_group = [SystemGroup .RESOURCE_KNOWLEDGE ]
12561255 )
12571256 RESOURCE_KNOWLEDGE_DOCUMENT_DOWNLOAD_SOURCE_FILE = Permission (
12581257 group = Group .SYSTEM_RES_KNOWLEDGE_DOCUMENT , operate = Operate .DOWNLOAD , role_list = [RoleConstants .ADMIN ],
1259- parent_group = [SystemGroup .RESOURCE ], is_show = False
1258+ parent_group = [SystemGroup .RESOURCE_KNOWLEDGE ]
12601259 )
12611260 RESOURCE_KNOWLEDGE_DOCUMENT_VECTOR = Permission (
12621261 group = Group .SYSTEM_RES_KNOWLEDGE_DOCUMENT , operate = Operate .VECTOR , role_list = [RoleConstants .ADMIN ],
1263- parent_group = [SystemGroup .RESOURCE ], is_show = False
1262+ parent_group = [SystemGroup .RESOURCE_KNOWLEDGE ]
12641263 )
12651264 RESOURCE_KNOWLEDGE_DOCUMENT_GENERATE = Permission (
12661265 group = Group .SYSTEM_RES_KNOWLEDGE_DOCUMENT , operate = Operate .GENERATE , role_list = [RoleConstants .ADMIN ],
1267- parent_group = [SystemGroup .RESOURCE ], is_show = False
1266+ parent_group = [SystemGroup .RESOURCE_KNOWLEDGE ]
12681267 )
12691268 RESOURCE_KNOWLEDGE_DOCUMENT_MIGRATE = Permission (
12701269 group = Group .SYSTEM_RES_KNOWLEDGE_DOCUMENT , operate = Operate .MIGRATE , role_list = [RoleConstants .ADMIN ],
1271- parent_group = [SystemGroup .RESOURCE ], is_show = False
1270+ parent_group = [SystemGroup .RESOURCE_KNOWLEDGE ]
12721271 )
12731272 RESOURCE_KNOWLEDGE_PROBLEM_READ = Permission (
12741273 group = Group .SYSTEM_RES_KNOWLEDGE_PROBLEM , operate = Operate .READ , role_list = [RoleConstants .ADMIN ],
1275- parent_group = [SystemGroup .RESOURCE ], is_show = False
1274+ parent_group = [SystemGroup .RESOURCE_KNOWLEDGE ]
12761275 )
12771276 RESOURCE_KNOWLEDGE_PROBLEM_CREATE = Permission (
12781277 group = Group .SYSTEM_RES_KNOWLEDGE_PROBLEM , operate = Operate .CREATE , role_list = [RoleConstants .ADMIN ],
1279- parent_group = [SystemGroup .RESOURCE ], is_show = False
1278+ parent_group = [SystemGroup .RESOURCE_KNOWLEDGE ]
12801279 )
12811280 RESOURCE_KNOWLEDGE_PROBLEM_EDIT = Permission (
12821281 group = Group .SYSTEM_RES_KNOWLEDGE_PROBLEM , operate = Operate .EDIT , role_list = [RoleConstants .ADMIN ],
1283- parent_group = [SystemGroup .RESOURCE ], is_show = False
1282+ parent_group = [SystemGroup .RESOURCE_KNOWLEDGE ]
12841283 )
12851284 RESOURCE_KNOWLEDGE_PROBLEM_DELETE = Permission (
12861285 group = Group .SYSTEM_RES_KNOWLEDGE_PROBLEM , operate = Operate .DELETE , role_list = [RoleConstants .ADMIN ],
1287- parent_group = [SystemGroup .RESOURCE ], is_show = False
1286+ parent_group = [SystemGroup .RESOURCE_KNOWLEDGE ]
12881287 )
12891288 RESOURCE_TOOL_READ = Permission (
12901289 group = Group .SYSTEM_RES_TOOL , operate = Operate .READ , role_list = [RoleConstants .ADMIN ],
1291- parent_group = [SystemGroup .RESOURCE ]
1290+ parent_group = [SystemGroup .RESOURCE_TOOL ]
12921291 )
12931292 RESOURCE_TOOL_CREATE = Permission (
12941293 group = Group .SYSTEM_RES_TOOL , operate = Operate .CREATE , role_list = [RoleConstants .ADMIN ],
1295- parent_group = [SystemGroup .RESOURCE ], is_show = False
1294+ parent_group = [SystemGroup .RESOURCE_TOOL ]
12961295 )
12971296 RESOURCE_TOOL_EDIT = Permission (
12981297 group = Group .SYSTEM_RES_TOOL , operate = Operate .EDIT , role_list = [RoleConstants .ADMIN ],
1299- parent_group = [SystemGroup .RESOURCE ], is_show = False
1298+ parent_group = [SystemGroup .RESOURCE_TOOL ]
13001299 )
13011300 RESOURCE_TOOL_DELETE = Permission (
13021301 group = Group .SYSTEM_RES_TOOL , operate = Operate .DELETE , role_list = [RoleConstants .ADMIN ],
1303- parent_group = [SystemGroup .RESOURCE ], is_show = False
1302+ parent_group = [SystemGroup .RESOURCE_TOOL ]
13041303 )
13051304 RESOURCE_TOOL_IMPORT = Permission (
13061305 group = Group .SYSTEM_RES_TOOL , operate = Operate .IMPORT , role_list = [RoleConstants .ADMIN ],
1307- parent_group = [SystemGroup .RESOURCE ], is_show = False
1306+ parent_group = [SystemGroup .RESOURCE_TOOL ]
13081307 )
13091308 RESOURCE_TOOL_EXPORT = Permission (
13101309 group = Group .SYSTEM_RES_TOOL , operate = Operate .EXPORT , role_list = [RoleConstants .ADMIN ],
1311- parent_group = [SystemGroup .RESOURCE ], is_show = False
1310+ parent_group = [SystemGroup .RESOURCE_TOOL ]
13121311 )
13131312 RESOURCE_TOOL_DEBUG = Permission (
13141313 group = Group .SYSTEM_RES_TOOL , operate = Operate .DEBUG , role_list = [RoleConstants .ADMIN ],
1315- parent_group = [SystemGroup .RESOURCE ], is_show = False
1314+ parent_group = [SystemGroup .RESOURCE_TOOL ]
13161315 )
13171316 RESOURCE_MODEL_READ = Permission (
13181317 group = Group .SYSTEM_RES_MODEL , operate = Operate .READ , role_list = [RoleConstants .ADMIN ],
1319- parent_group = [SystemGroup .RESOURCE ]
1318+ parent_group = [SystemGroup .RESOURCE_MODEL ]
13201319 )
13211320 OPERATION_LOG_READ = Permission (
13221321 group = Group .OPERATION_LOG , operate = Operate .READ , role_list = [RoleConstants .ADMIN ],
0 commit comments