From f84d093f715b16ee272466c7c3156710c7979d70 Mon Sep 17 00:00:00 2001 From: zhangzhanwei Date: Mon, 25 Aug 2025 15:23:51 +0800 Subject: [PATCH] fix: The role-based authorization option is temporarily hidden MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1060787 --user=张展玮 【资源管理】偶先不展示按角色授权选项的现象 https://www.tapd.cn/62980211/s/1760688 --- .../component/PermissionTable.vue | 7 ++++++- .../system/resource-authorization/constant.ts | 19 ++++++++++--------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/ui/src/views/system/resource-authorization/component/PermissionTable.vue b/ui/src/views/system/resource-authorization/component/PermissionTable.vue index 573c7c1d7..aa68ffa50 100644 --- a/ui/src/views/system/resource-authorization/component/PermissionTable.vue +++ b/ui/src/views/system/resource-authorization/component/PermissionTable.vue @@ -142,8 +142,9 @@ import { isAppIcon, resetUrl } from '@/utils/common' import { RoleConst, PermissionConst } from '@/utils/permission/data' import { hasPermission } from '@/utils/permission/index' import { ComplexPermission } from '@/utils/permission/type' -import { permissionOptions } from '@/views/system/resource-authorization/constant' +import { getPermissionOptions } from '@/views/system/resource-authorization/constant' import useStore from '@/stores' + const { model, user } = useStore() const route = useRoute() const props = defineProps<{ @@ -152,6 +153,10 @@ const props = defineProps<{ getData?: () => void }>() const emit = defineEmits(['submitPermissions']) + +const permissionOptions = computed(() => { + return getPermissionOptions() +}) const permissionObj = ref({ APPLICATION: new ComplexPermission( [RoleConst.ADMIN, RoleConst.WORKSPACE_MANAGE], diff --git a/ui/src/views/system/resource-authorization/constant.ts b/ui/src/views/system/resource-authorization/constant.ts index f9d413bf4..ebeaf7d21 100644 --- a/ui/src/views/system/resource-authorization/constant.ts +++ b/ui/src/views/system/resource-authorization/constant.ts @@ -2,9 +2,8 @@ import { AuthorizationEnum } from '@/enums/system' import { t } from '@/locales' import { hasPermission } from '@/utils/permission' import { EditionConst } from '@/utils/permission/data' - -const notCommunity = hasPermission([EditionConst.IS_EE,EditionConst.IS_PE],'OR') - + + const permissionOptions = [ { label: t('views.system.resourceAuthorization.setting.notAuthorized'), @@ -23,14 +22,16 @@ const permissionOptions = [ }, ] -if (notCommunity) { - permissionOptions.push( - { + +const getPermissionOptions=()=>{ + if (hasPermission([EditionConst.IS_EE, EditionConst.IS_PE], 'OR')) { + return [...permissionOptions,{ label: t('views.system.resourceAuthorization.setting.role'), value: AuthorizationEnum.ROLE, desc: t('views.system.resourceAuthorization.setting.roleDesc'), - }, - ) + },] + } + return permissionOptions; } -export {permissionOptions} \ No newline at end of file +export {getPermissionOptions} \ No newline at end of file