diff --git a/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue b/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue index c3de659fb..0baf854e9 100644 --- a/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue +++ b/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue @@ -13,6 +13,7 @@ import { GenericCreateUpdatePage } from '@/layout/components' import AssetSelect from '@/components/AssetSelect' import { getDayFuture } from '@/utils/common' import AccountFormatter from './components/AccountFormatter' +import { AllAccount } from '../const' export default { name: 'AccountFormatter', @@ -35,7 +36,7 @@ export default { date_expired: getDayFuture(36500, new Date()).toISOString(), nodes: nodesInitial, assets: assetsInitial, - accounts: ['@ALL'] + accounts: [AllAccount] }, fields: [ [this.$t('common.Basic'), ['name']], diff --git a/src/views/perms/AssetPermission/AssetPermissionList.vue b/src/views/perms/AssetPermission/AssetPermissionList.vue index 0205742e8..b060ec5cf 100644 --- a/src/views/perms/AssetPermission/AssetPermissionList.vue +++ b/src/views/perms/AssetPermission/AssetPermissionList.vue @@ -18,7 +18,7 @@ import AssetTreeTable from '@/components/AssetTreeTable' import PermBulkUpdateDialog from './components/PermBulkUpdateDialog' import AmountFormatter from '@/components/TableFormatters/AmountFormatter' import { mapGetters } from 'vuex' -import { AssetPermissionListPageSearchConfigOptions } from '../const' +import { AccountLabelMapper, AssetPermissionListPageSearchConfigOptions } from '../const' export default { components: { @@ -121,7 +121,7 @@ export default { formatter: AmountFormatter, formatterArgs: { getItem(item) { - return item + return AccountLabelMapper[item] || item }, routeQuery: { activeTab: 'AssetPermissionAccount' diff --git a/src/views/perms/AssetPermission/components/AccountFormatter.vue b/src/views/perms/AssetPermission/components/AccountFormatter.vue index d2c8af27d..3907f3399 100644 --- a/src/views/perms/AssetPermission/components/AccountFormatter.vue +++ b/src/views/perms/AssetPermission/components/AccountFormatter.vue @@ -20,6 +20,13 @@