diff --git a/ui/src/router/modules/application-detail.ts b/ui/src/router/modules/application-detail.ts index 33ac7267d..6373892ac 100644 --- a/ui/src/router/modules/application-detail.ts +++ b/ui/src/router/modules/application-detail.ts @@ -1,7 +1,7 @@ import { SourceTypeEnum } from '@/enums/common' import { get_next_route } from '@/utils/permission' -import { PermissionConst, RoleConst } from '@/utils/permission/data' +import { EditionConst, PermissionConst, RoleConst } from '@/utils/permission/data' import { ComplexPermission } from '@/utils/permission/type' const ApplicationDetailRouter = { @@ -77,15 +77,13 @@ const ApplicationDetailRouter = { permission: [ () => { const to: any = get_next_route() - return new ComplexPermission([RoleConst.USER],[PermissionConst.APPLICATION.getApplicationWorkspaceResourcePermission( to ? to.params.id : '',)],[],'AND')}, - RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, - PermissionConst.APPLICATION_ACCESS_READ.getWorkspacePermissionWorkspaceManageRole, - () => { + return new ComplexPermission([RoleConst.USER],[PermissionConst.APPLICATION.getApplicationWorkspaceResourcePermission( to ? to.params.id : '',)],[EditionConst.IS_EE, EditionConst.IS_PE],'AND')}, + new ComplexPermission([RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,],[PermissionConst.APPLICATION_ACCESS_READ.getWorkspacePermissionWorkspaceManageRole],[EditionConst.IS_EE, EditionConst.IS_PE],'OR'), + new ComplexPermission([],[() => { const to: any = get_next_route() return PermissionConst.APPLICATION_ACCESS_READ.getApplicationWorkspaceResourcePermission( - to ? to.params.id : '', - ) - } + to ? to.params.id : '',) + }],[EditionConst.IS_EE, EditionConst.IS_PE],'OR'), ] }, component: () => import('@/views/application/ApplicationAccess.vue'), @@ -104,14 +102,13 @@ const ApplicationDetailRouter = { permission: [ () => { const to: any = get_next_route() - return new ComplexPermission([RoleConst.USER],[PermissionConst.APPLICATION.getApplicationWorkspaceResourcePermission( to ? to.params.id : '',)],[],'AND')}, - RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, - PermissionConst.APPLICATION_CHAT_USER_READ.getWorkspacePermissionWorkspaceManageRole, + return new ComplexPermission([RoleConst.USER],[PermissionConst.APPLICATION.getApplicationWorkspaceResourcePermission( to ? to.params.id : '',)],[EditionConst.IS_EE, EditionConst.IS_PE],'AND')}, + new ComplexPermission([RoleConst.WORKSPACE_MANAGE.getWorkspaceRole],[PermissionConst.APPLICATION_CHAT_USER_READ.getWorkspacePermissionWorkspaceManageRole],[EditionConst.IS_EE, EditionConst.IS_PE],'OR') + , () => { const to: any = get_next_route() - return PermissionConst.APPLICATION_CHAT_USER_READ.getApplicationWorkspaceResourcePermission( - to ? to.params.id : '', - ) + return new ComplexPermission([],[PermissionConst.APPLICATION_CHAT_USER_READ.getApplicationWorkspaceResourcePermission( + to ? to.params.id : '',)],[EditionConst.IS_EE, EditionConst.IS_PE],'OR') } ] }, diff --git a/ui/src/router/modules/knowledge.ts b/ui/src/router/modules/knowledge.ts index 02d753b62..b70ae5a9a 100644 --- a/ui/src/router/modules/knowledge.ts +++ b/ui/src/router/modules/knowledge.ts @@ -6,7 +6,6 @@ const ModelRouter = { title: 'views.knowledge.title', menu: true, permission: [ - RoleConst.ADMIN, RoleConst.USER.getWorkspaceRole, RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, PermissionConst.KNOWLEDGE_READ.getWorkspacePermission, diff --git a/ui/src/router/modules/model.ts b/ui/src/router/modules/model.ts index 3a7b4ed65..21314cbe3 100644 --- a/ui/src/router/modules/model.ts +++ b/ui/src/router/modules/model.ts @@ -6,7 +6,6 @@ const ModelRouter = { title: 'views.model.title', menu: true, permission: [ - RoleConst.ADMIN, RoleConst.USER.getWorkspaceRole, RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, PermissionConst.MODEL_READ.getWorkspacePermission, diff --git a/ui/src/router/modules/tool.ts b/ui/src/router/modules/tool.ts index 4b38de1ac..3680f9837 100644 --- a/ui/src/router/modules/tool.ts +++ b/ui/src/router/modules/tool.ts @@ -6,7 +6,6 @@ const ModelRouter = { title: 'views.tool.title', menu: true, permission: [ - RoleConst.ADMIN, RoleConst.USER.getWorkspaceRole, RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, PermissionConst.TOOL_READ.getWorkspacePermission,