Skip to content

Commit 0f41f62

Browse files
committed
fix: The role-based authorization option is temporarily hidden
--bug=1060787 --user=张展玮 【资源管理】偶先不展示按角色授权选项的现象 https://www.tapd.cn/62980211/s/1760688
1 parent 5dafe6f commit 0f41f62

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

ui/src/views/system/resource-authorization/component/PermissionTable.vue

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,9 @@ import { isAppIcon, resetUrl } from '@/utils/common'
142142
import { RoleConst, PermissionConst } from '@/utils/permission/data'
143143
import { hasPermission } from '@/utils/permission/index'
144144
import { ComplexPermission } from '@/utils/permission/type'
145-
import { permissionOptions } from '@/views/system/resource-authorization/constant'
145+
import { getPermissionOptions } from '@/views/system/resource-authorization/constant'
146146
import useStore from '@/stores'
147+
147148
const { model, user } = useStore()
148149
const route = useRoute()
149150
const props = defineProps<{
@@ -152,6 +153,10 @@ const props = defineProps<{
152153
getData?: () => void
153154
}>()
154155
const emit = defineEmits(['submitPermissions'])
156+
157+
const permissionOptions = computed(() => {
158+
return getPermissionOptions()
159+
})
155160
const permissionObj = ref<any>({
156161
APPLICATION: new ComplexPermission(
157162
[RoleConst.ADMIN, RoleConst.WORKSPACE_MANAGE],

ui/src/views/system/resource-authorization/constant.ts

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ import { AuthorizationEnum } from '@/enums/system'
22
import { t } from '@/locales'
33
import { hasPermission } from '@/utils/permission'
44
import { EditionConst } from '@/utils/permission/data'
5-
6-
const notCommunity = hasPermission([EditionConst.IS_EE,EditionConst.IS_PE],'OR')
7-
5+
6+
87
const permissionOptions = [
98
{
109
label: t('views.system.resourceAuthorization.setting.notAuthorized'),
@@ -23,14 +22,16 @@ const permissionOptions = [
2322
},
2423
]
2524

26-
if (notCommunity) {
27-
permissionOptions.push(
28-
{
25+
26+
const getPermissionOptions=()=>{
27+
if (hasPermission([EditionConst.IS_EE, EditionConst.IS_PE], 'OR')) {
28+
return [...permissionOptions,{
2929
label: t('views.system.resourceAuthorization.setting.role'),
3030
value: AuthorizationEnum.ROLE,
3131
desc: t('views.system.resourceAuthorization.setting.roleDesc'),
32-
},
33-
)
32+
},]
33+
}
34+
return permissionOptions;
3435
}
3536

36-
export {permissionOptions}
37+
export {getPermissionOptions}

0 commit comments

Comments
 (0)