diff --git a/ui/src/router/modules/system.ts b/ui/src/router/modules/system.ts index 56d9fd333..31f09dd5d 100644 --- a/ui/src/router/modules/system.ts +++ b/ui/src/router/modules/system.ts @@ -38,7 +38,7 @@ const systemRouter = { new ComplexPermission( [RoleConst.ADMIN, RoleConst.WORKSPACE_MANAGE.getWorkspaceRole], [PermissionConst.ROLE_READ, PermissionConst.WORKSPACE_ROLE_READ], - [EditionConst.IS_EE], + [EditionConst.IS_EE, EditionConst.IS_PE], 'OR', ), ], diff --git a/ui/src/utils/dynamics-api/permission-api.ts b/ui/src/utils/dynamics-api/permission-api.ts index 2e467275a..25cda5e5c 100644 --- a/ui/src/utils/dynamics-api/permission-api.ts +++ b/ui/src/utils/dynamics-api/permission-api.ts @@ -1,8 +1,8 @@ -import { PermissionConst, EditionConst, RoleConst } from '@/utils/permission/data' -import { hasPermission } from '@/utils/permission/index' +import {PermissionConst, EditionConst, RoleConst} from '@/utils/permission/data' +import {hasPermission} from '@/utils/permission/index' import roleSystemApi from '@/api/system/role' import roleWorkspaceApi from '@/api/workspace/role' -import { ComplexPermission } from '../permission/type' +import {ComplexPermission} from '../permission/type' // 系统管理员 API const systemApiMap = { @@ -19,19 +19,20 @@ const workspaceApiMap = { */ export function loadPermissionApi(type: string) { - if (hasPermission(EditionConst.IS_EE, 'OR')) { - if (hasPermission(new ComplexPermission ( + if (hasPermission([EditionConst.IS_EE, EditionConst.IS_PE], 'OR')) { + if (hasPermission(new ComplexPermission( [RoleConst.ADMIN], [PermissionConst.ROLE_READ], [], - 'OR'),'OR')) { + 'OR'), 'OR')) { // 加载系统管理员 API return systemApiMap[type] - } if (hasPermission(new ComplexPermission ( + } + if (hasPermission(new ComplexPermission( [RoleConst.WORKSPACE_MANAGE.getWorkspaceRole], [PermissionConst.WORKSPACE_ROLE_READ.getWorkspacePermissionWorkspaceManageRole], [], - 'OR'),'OR' )) { + 'OR'), 'OR')) { // 加载企业版工作空间管理员 API return workspaceApiMap[type] } diff --git a/ui/src/views/system/role/component/AddMemberDrawer.vue b/ui/src/views/system/role/component/AddMemberDrawer.vue index 4707de94a..a47004dd4 100644 --- a/ui/src/views/system/role/component/AddMemberDrawer.vue +++ b/ui/src/views/system/role/component/AddMemberDrawer.vue @@ -21,17 +21,19 @@ diff --git a/ui/src/views/system/user-manage/component/UserDrawer.vue b/ui/src/views/system/user-manage/component/UserDrawer.vue index e1bd0629b..e38318073 100644 --- a/ui/src/views/system/user-manage/component/UserDrawer.vue +++ b/ui/src/views/system/user-manage/component/UserDrawer.vue @@ -53,11 +53,11 @@ {{ userForm.password }} -

+

{{ $t('views.userManage.roleSetting') }}

+ :addText="$t('views.userManage.addRole')" v-if="user.isEE() || user.isPE()"/> + v-if="user.isEE() || user.isPE()"> @@ -129,7 +129,7 @@ size="small" v-model="row.is_active" :before-change="() => changeState(row)" - v-if="hasPermission([RoleConst.ADMIN,PermissionConst.USER_EDIT],'OR')" + v-if="hasPermission([RoleConst.ADMIN,PermissionConst.USER_EDIT],'OR')" /> @@ -146,7 +146,7 @@ text @click.stop="editPwdUser(row)" :title="$t('views.userManage.setting.updatePwd')" - v-if="hasPermission([RoleConst.ADMIN,PermissionConst.USER_EDIT],'OR')" + v-if="hasPermission([RoleConst.ADMIN,PermissionConst.USER_EDIT],'OR')" > @@ -158,7 +158,7 @@ text @click.stop="deleteUserManage(row)" :title="$t('common.delete')" - v-if="hasPermission([RoleConst.ADMIN,PermissionConst.USER_DELETE],'OR')" + v-if="hasPermission([RoleConst.ADMIN,PermissionConst.USER_DELETE],'OR')" >