From 041801a3193a65c34a23de875e47e3287faef7a7 Mon Sep 17 00:00:00 2001
From: Bai <baijiangjie@gmail.com>
Date: Wed, 15 Feb 2023 15:56:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=8E=88=E6=9D=83?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E5=88=97=E8=A1=A8=20accounts=20popover=20?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AssetPermissionCreateUpdate.vue           |  3 +-
 .../AssetPermission/AssetPermissionList.vue   |  4 +--
 .../components/AccountFormatter.vue           | 29 +++++++++++--------
 src/views/perms/const.js                      | 12 ++++++++
 4 files changed, 33 insertions(+), 15 deletions(-)

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 @@
 
 <script>
 import { TagInput } from '@/components/FormFields'
+import {
+  AllAccount,
+  SPECAccount,
+  SameUSER,
+  ManualINPUT,
+  AccountLabelMapper
+} from '@/views/perms/const'
 
 export default {
   components: {
@@ -32,29 +39,27 @@ export default {
     }
   },
   data() {
-    const ALL = '@ALL'
-    const SPEC = '@SPEC'
     const choices = [
       {
-        label: this.$t('perms.AllAccounts'),
-        value: ALL
+        label: AccountLabelMapper[AllAccount],
+        value: AllAccount
       },
       {
-        label: this.$t('perms.SpecifyAccounts'),
-        value: SPEC
+        label: AccountLabelMapper[SPECAccount],
+        value: SPECAccount
       },
       {
-        label: this.$t('perms.ManualInput'),
-        value: '@INPUT'
+        label: AccountLabelMapper[ManualINPUT],
+        value: ManualINPUT
       },
       {
-        label: this.$t('perms.SameAccount'),
-        value: '@USER'
+        label: AccountLabelMapper[SameUSER],
+        value: SameUSER
       }
     ]
     return {
-      ALL: ALL,
-      SPEC: SPEC,
+      ALL: AllAccount,
+      SPEC: SPECAccount,
       choices: choices,
       choicesSelected: [],
       defaultChoices: [this.ALL],
diff --git a/src/views/perms/const.js b/src/views/perms/const.js
index b8feb1562..036963ff4 100644
--- a/src/views/perms/const.js
+++ b/src/views/perms/const.js
@@ -40,3 +40,15 @@ export const AssetPermissionListPageSearchConfigOptions = [
     ]
   }
 ]
+
+export const AllAccount = '@ALL'
+export const SPECAccount = '@SPEC'
+export const SameUSER = '@USER'
+export const ManualINPUT = '@INPUT'
+
+export const AccountLabelMapper = {
+  [AllAccount]: i18n.t('perms.AllAccounts'),
+  [SPECAccount]: i18n.t('perms.SpecifyAccounts'),
+  [SameUSER]: i18n.t('perms.SameAccount'),
+  [ManualINPUT]: i18n.t('perms.ManualInput')
+}