diff --git a/ui/src/permission/core/index.ts b/ui/src/permission/core/index.ts index b2bfc9b3324..1c97f0af7d6 100644 --- a/ui/src/permission/core/index.ts +++ b/ui/src/permission/core/index.ts @@ -86,7 +86,7 @@ export const buildBaseResourcePermission = (permission: Permission, resourceId: export const hasEdition=(edition:Edition)=>{ const { auth } = useStore() if(edition==Edition.PE||edition==Edition.EE){ - return auth.baseProfile?.license_is_valid + return auth.baseProfile?.license_is_valid && edition==auth.baseProfile?.edition } return true } diff --git a/ui/src/permission/modules/application/system.ts b/ui/src/permission/modules/application/system.ts index adb2c6b9a4a..d30e627a14f 100644 --- a/ui/src/permission/modules/application/system.ts +++ b/ui/src/permission/modules/application/system.ts @@ -57,7 +57,7 @@ const system = { /** * 系统「应用资源管理」(系统 > 资源管理 > 应用)只读权限 * */ - read: () => canSys(P.RESOURCE_APPLICATION_READ) && hasEdition(Edition.PE), + read: () => canSys(P.RESOURCE_APPLICATION_READ) && hasEdition(Edition.EE), } export default system diff --git a/ui/src/permission/modules/knowledge/share.ts b/ui/src/permission/modules/knowledge/share.ts index 51e2631eb9a..805f36ee934 100644 --- a/ui/src/permission/modules/knowledge/share.ts +++ b/ui/src/permission/modules/knowledge/share.ts @@ -78,7 +78,7 @@ const share = { /** * 系统「共享知识库」(系统 > 共享 > 知识库)只读权限 * */ - read: () => canSys(P.SHARED_KNOWLEDGE_WORKFLOW_READ) && hasEdition(Edition.PE), + read: () => canSys(P.SHARED_KNOWLEDGE_WORKFLOW_READ) && hasEdition(Edition.EE), } export default share diff --git a/ui/src/permission/modules/knowledge/system.ts b/ui/src/permission/modules/knowledge/system.ts index d1e2fff2730..d3a81d7f371 100644 --- a/ui/src/permission/modules/knowledge/system.ts +++ b/ui/src/permission/modules/knowledge/system.ts @@ -79,7 +79,7 @@ const system = { /** * 系统「知识库资源管理」(系统 > 资源管理 > 知识库)只读权限 * */ - read: () => canSys(P.RESOURCE_KNOWLEDGE_DOCUMENT_READ) && hasEdition(Edition.PE), + read: () => canSys(P.RESOURCE_KNOWLEDGE_DOCUMENT_READ) && hasEdition(Edition.EE), } export default system diff --git a/ui/src/permission/modules/model/share.ts b/ui/src/permission/modules/model/share.ts index 6408b906a03..67a9f07e9af 100644 --- a/ui/src/permission/modules/model/share.ts +++ b/ui/src/permission/modules/model/share.ts @@ -19,7 +19,7 @@ const share = { /** * 系统「共享模型」(系统 > 共享 > 模型)只读权限 */ - read: () => canSys(P.SHARED_MODEL_READ) && hasEdition(Edition.PE), + read: () => canSys(P.SHARED_MODEL_READ) && hasEdition(Edition.EE), // —— 模型资源 —— create: () => canSys(P.SHARED_MODEL_CREATE), diff --git a/ui/src/permission/modules/model/system.ts b/ui/src/permission/modules/model/system.ts index c8f9957da59..099bedebd49 100644 --- a/ui/src/permission/modules/model/system.ts +++ b/ui/src/permission/modules/model/system.ts @@ -19,7 +19,7 @@ const system = { /** * 系统「模型资源管理」(系统 > 资源管理 > 模型)只读权限 * */ - read: () => canSys(P.RESOURCE_MODEL_READ) && hasEdition(Edition.PE), + read: () => canSys(P.RESOURCE_MODEL_READ) && hasEdition(Edition.EE), isShare: () => canSys(P.MODEL_READ), // —— 模型资源 —— diff --git a/ui/src/permission/modules/system/appearance.ts b/ui/src/permission/modules/system/appearance.ts index 1cd5525dad3..e59944eca44 100644 --- a/ui/src/permission/modules/system/appearance.ts +++ b/ui/src/permission/modules/system/appearance.ts @@ -8,7 +8,7 @@ export default { /** * 系统「外观设置」只读权限 */ - read: () => canSys(P.APPEARANCE_SETTINGS_READ) && hasEdition(Edition.PE), + read: () => canSys(P.APPEARANCE_SETTINGS_READ) && (hasEdition(Edition.PE)||hasEdition(Edition.EE)), /** * 系统「外观设置」编辑权限 */ diff --git a/ui/src/permission/modules/system/chatAuth.ts b/ui/src/permission/modules/system/chatAuth.ts index 5b10cb7ddb6..815bee28cea 100644 --- a/ui/src/permission/modules/system/chatAuth.ts +++ b/ui/src/permission/modules/system/chatAuth.ts @@ -8,7 +8,7 @@ export default { /** * 系统「对话用户认证」只读权限 */ - read: () => canSys(P.CHAT_USER_AUTH_READ) && hasEdition(Edition.PE), + read: () => canSys(P.CHAT_USER_AUTH_READ) && (hasEdition(Edition.PE)||hasEdition(Edition.EE)), /** * 系统「对话用户认证」编辑权限 */ diff --git a/ui/src/permission/modules/system/homepage.ts b/ui/src/permission/modules/system/homepage.ts index 6bae450ce33..ca7e70ab4a5 100644 --- a/ui/src/permission/modules/system/homepage.ts +++ b/ui/src/permission/modules/system/homepage.ts @@ -7,6 +7,6 @@ export default { /** * 系统「首页」只读权限 */ - read: () => hasPermission([RoleConstants.ADMIN,P.HOMEPAGE_READ],Compare.OR) && hasEdition(Edition.PE), + read: () => hasPermission([RoleConstants.ADMIN,P.HOMEPAGE_READ],Compare.OR) && hasEdition(Edition.EE), export: () => hasPermission([RoleConstants.ADMIN,P.HOMEPAGE_EXPORT],Compare.OR) } diff --git a/ui/src/permission/modules/system/loginAuth.ts b/ui/src/permission/modules/system/loginAuth.ts index be6645d2446..3dd0f6a319c 100644 --- a/ui/src/permission/modules/system/loginAuth.ts +++ b/ui/src/permission/modules/system/loginAuth.ts @@ -8,7 +8,7 @@ export default { /** * 系统「用户认证」只读权限 */ - read: () => canSys(P.LOGIN_AUTH_READ) && hasEdition(Edition.PE), + read: () => canSys(P.LOGIN_AUTH_READ) && (hasEdition(Edition.PE)||hasEdition(Edition.EE)), /** * 系统「用户认证」编辑权限 */ diff --git a/ui/src/permission/modules/system/operationLog.ts b/ui/src/permission/modules/system/operationLog.ts index 9803177d4c0..a99de2b1544 100644 --- a/ui/src/permission/modules/system/operationLog.ts +++ b/ui/src/permission/modules/system/operationLog.ts @@ -8,7 +8,7 @@ export default { /** * 系统「操作日志」只读权限 */ - read: () => canSys(P.OPERATION_LOG_READ) && hasEdition(Edition.PE), + read: () => canSys(P.OPERATION_LOG_READ) && (hasEdition(Edition.PE)||hasEdition(Edition.EE)), /** * 系统「操作日志」导出权限 */ diff --git a/ui/src/permission/modules/system/other.ts b/ui/src/permission/modules/system/other.ts index acebc1f18d3..14fcf62d0f2 100644 --- a/ui/src/permission/modules/system/other.ts +++ b/ui/src/permission/modules/system/other.ts @@ -1,7 +1,8 @@ /** 系统「其他/关于」类按钮权限 → $perm.other.* */ import { canSys } from '../../policy' -import { PermissionConstants as P, hasPermission, RoleConstants, Compare} from '../../core' +import { PermissionConstants as P, hasPermission, RoleConstants, Compare, hasEdition} from '../../core' +import { Edition } from '@/permission/core/common' export default { /** @@ -23,7 +24,7 @@ export default { /** * 系统「其他/关于」系统APIKey权限 */ - systemApiKey: () => hasPermission([RoleConstants.ADMIN,RoleConstants.WORKSPACE_MANAGE,P.SYSTEM_API_KEY_EDIT],Compare.OR), + systemApiKey: () => hasPermission([RoleConstants.ADMIN,RoleConstants.WORKSPACE_MANAGE,P.SYSTEM_API_KEY_EDIT],Compare.OR) && (hasEdition(Edition.PE)||hasEdition(Edition.EE)), /** * 系统「其他/关于」门户权限 */ diff --git a/ui/src/permission/modules/system/role.ts b/ui/src/permission/modules/system/role.ts index 92f21645946..fb0c5b6775f 100644 --- a/ui/src/permission/modules/system/role.ts +++ b/ui/src/permission/modules/system/role.ts @@ -8,7 +8,7 @@ export default { /** * 系统「角色管理」只读权限 * */ - read: () => hasPermission([RoleConstants.ADMIN,RoleConstants.WORKSPACE_MANAGE,P.ROLE_READ],Compare.OR) && hasEdition(Edition.PE), + read: () => hasPermission([RoleConstants.ADMIN,RoleConstants.WORKSPACE_MANAGE,P.ROLE_READ],Compare.OR) && (hasEdition(Edition.PE)||hasEdition(Edition.EE)), /** * 系统「角色管理」创建权限 */ diff --git a/ui/src/permission/modules/system/workspace.ts b/ui/src/permission/modules/system/workspace.ts index 1722bea484a..76238517a08 100644 --- a/ui/src/permission/modules/system/workspace.ts +++ b/ui/src/permission/modules/system/workspace.ts @@ -8,7 +8,7 @@ export default { /** * 系统「工作空间」只读权限 * */ - read: () => hasPermission([RoleConstants.ADMIN,RoleConstants.WORKSPACE_MANAGE,P.WORKSPACE_READ],Compare.OR) && hasEdition(Edition.PE), + read: () => hasPermission([RoleConstants.ADMIN,RoleConstants.WORKSPACE_MANAGE,P.WORKSPACE_READ],Compare.OR) && hasEdition(Edition.EE), /** * 系统「工作空间」创建权限 */ diff --git a/ui/src/permission/modules/tool/share.ts b/ui/src/permission/modules/tool/share.ts index 26927cf6a3d..25962fde54a 100644 --- a/ui/src/permission/modules/tool/share.ts +++ b/ui/src/permission/modules/tool/share.ts @@ -24,7 +24,7 @@ const share = { /** * 系统「共享工具」(系统 > 共享 > 工具)只读权限 */ - read: () => canSys(P.SHARED_TOOL_READ) && hasEdition(Edition.PE), + read: () => canSys(P.SHARED_TOOL_READ) && hasEdition(Edition.EE), // —— 工具资源 —— create: () => canSys(P.SHARED_TOOL_CREATE), diff --git a/ui/src/permission/modules/tool/system.ts b/ui/src/permission/modules/tool/system.ts index 60e98442730..d50977e9c9e 100644 --- a/ui/src/permission/modules/tool/system.ts +++ b/ui/src/permission/modules/tool/system.ts @@ -22,7 +22,7 @@ const system = { /** * 系统「工具资源管理」(系统 > 资源管理 > 工具)只读权限 * */ - read: () => canSys(P.RESOURCE_TOOL_READ) && hasEdition(Edition.PE), + read: () => canSys(P.RESOURCE_TOOL_READ) && hasEdition(Edition.EE), isShare: () => canSys(P.SHARED_TOOL_READ), // —— 工具资源 ——