fix: The role-based authorization option is temporarily hidden
--bug=1060787 --user=张展玮 【资源管理】偶先不展示按角色授权选项的现象 https://www.tapd.cn/62980211/s/1760688v3.2
parent
5dafe6f7fe
commit
f84d093f71
|
|
@ -142,8 +142,9 @@ import { isAppIcon, resetUrl } from '@/utils/common'
|
||||||
import { RoleConst, PermissionConst } from '@/utils/permission/data'
|
import { RoleConst, PermissionConst } from '@/utils/permission/data'
|
||||||
import { hasPermission } from '@/utils/permission/index'
|
import { hasPermission } from '@/utils/permission/index'
|
||||||
import { ComplexPermission } from '@/utils/permission/type'
|
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'
|
import useStore from '@/stores'
|
||||||
|
|
||||||
const { model, user } = useStore()
|
const { model, user } = useStore()
|
||||||
const route = useRoute()
|
const route = useRoute()
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
|
|
@ -152,6 +153,10 @@ const props = defineProps<{
|
||||||
getData?: () => void
|
getData?: () => void
|
||||||
}>()
|
}>()
|
||||||
const emit = defineEmits(['submitPermissions'])
|
const emit = defineEmits(['submitPermissions'])
|
||||||
|
|
||||||
|
const permissionOptions = computed(() => {
|
||||||
|
return getPermissionOptions()
|
||||||
|
})
|
||||||
const permissionObj = ref<any>({
|
const permissionObj = ref<any>({
|
||||||
APPLICATION: new ComplexPermission(
|
APPLICATION: new ComplexPermission(
|
||||||
[RoleConst.ADMIN, RoleConst.WORKSPACE_MANAGE],
|
[RoleConst.ADMIN, RoleConst.WORKSPACE_MANAGE],
|
||||||
|
|
|
||||||
|
|
@ -2,9 +2,8 @@ import { AuthorizationEnum } from '@/enums/system'
|
||||||
import { t } from '@/locales'
|
import { t } from '@/locales'
|
||||||
import { hasPermission } from '@/utils/permission'
|
import { hasPermission } from '@/utils/permission'
|
||||||
import { EditionConst } from '@/utils/permission/data'
|
import { EditionConst } from '@/utils/permission/data'
|
||||||
|
|
||||||
const notCommunity = hasPermission([EditionConst.IS_EE,EditionConst.IS_PE],'OR')
|
|
||||||
|
|
||||||
const permissionOptions = [
|
const permissionOptions = [
|
||||||
{
|
{
|
||||||
label: t('views.system.resourceAuthorization.setting.notAuthorized'),
|
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'),
|
label: t('views.system.resourceAuthorization.setting.role'),
|
||||||
value: AuthorizationEnum.ROLE,
|
value: AuthorizationEnum.ROLE,
|
||||||
desc: t('views.system.resourceAuthorization.setting.roleDesc'),
|
desc: t('views.system.resourceAuthorization.setting.roleDesc'),
|
||||||
},
|
},]
|
||||||
)
|
}
|
||||||
|
return permissionOptions;
|
||||||
}
|
}
|
||||||
|
|
||||||
export {permissionOptions}
|
export {getPermissionOptions}
|
||||||
Loading…
Reference in New Issue