From 41d07fd670fe56e2e3d6e63dd94c6c3cec9c70c4 Mon Sep 17 00:00:00 2001
From: Bai <baijiangjie@gmail.com>
Date: Thu, 1 Dec 2022 12:09:43 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9<=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E5=8F=B0-=E6=88=91=E7=9A=84=E8=B5=84=E4=BA=A7>=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2;=E4=BF=AE=E6=94=B9<=E6=8E=A7=E5=88=B6=E5=8F=B0-?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=AF=A6=E6=83=85>=E9=A1=B5=E9=9D=A2;?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9<GrantedSystemUsersShowFormatter>=E4=B8=BA<Gr?=
 =?UTF-8?q?antedAccountShowFormatter>=E7=BB=84=E4=BB=B6;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/GrantedAssets/index.vue        | 18 +++++++--------
 ...er.vue => GrantedAccountShowFormatter.vue} | 10 ++++-----
 src/components/TableFormatters/index.js       |  6 ++---
 src/views/myassets/index.vue                  | 22 +++++++++----------
 src/views/users/User/UserDetail/index.vue     | 12 +++++-----
 5 files changed, 34 insertions(+), 34 deletions(-)
 rename src/components/TableFormatters/{GrantedSystemUsersShowFormatter.vue => GrantedAccountShowFormatter.vue} (69%)

diff --git a/src/components/GrantedAssets/index.vue b/src/components/GrantedAssets/index.vue
index 058c2f5c2..a6d46efb7 100644
--- a/src/components/GrantedAssets/index.vue
+++ b/src/components/GrantedAssets/index.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script type="text/jsx">
-import { DetailFormatter, SystemUserFormatter } from '@/components/TableFormatters'
+import { DetailFormatter, AccountShowFormatter } from '@/components/TableFormatters'
 import TreeTable from '../TreeTable'
 
 export default {
@@ -35,7 +35,7 @@ export default {
     getShowUrl: {
       type: Function,
       default({ row, col }) {
-        return this.tableUrl.replace('/assets/', `/assets/${row.id}/system-users/?cache_policy=1`)
+        return this.tableUrl.replace('/assets/', `/assets/${row.id}/accounts/?cache_policy=1`)
       }
     }
   },
@@ -59,8 +59,8 @@ export default {
         hasTree: true,
         columns: [
           {
-            prop: 'hostname',
-            label: this.$t('assets.Hostname'),
+            prop: 'name',
+            label: this.$t('assets.Name'),
             formatter: DetailFormatter,
             sortable: true,
             formatterArgs: {
@@ -69,16 +69,16 @@ export default {
             showOverflowTooltip: true
           },
           {
-            prop: 'ip',
-            label: this.$t('assets.IP'),
+            prop: 'address',
+            label: this.$t('assets.Address'),
             width: '140px',
             sortable: 'custom'
           },
           {
-            prop: 'systemUsers',
-            label: this.$t('assets.SystemUsers'),
+            prop: 'accounts',
+            label: this.$t('assets.Account'),
             align: 'center',
-            formatter: SystemUserFormatter,
+            formatter: AccountShowFormatter,
             formatterArgs: {
               getUrl: this.getShowUrl.bind(this)
             },
diff --git a/src/components/TableFormatters/GrantedSystemUsersShowFormatter.vue b/src/components/TableFormatters/GrantedAccountShowFormatter.vue
similarity index 69%
rename from src/components/TableFormatters/GrantedSystemUsersShowFormatter.vue
rename to src/components/TableFormatters/GrantedAccountShowFormatter.vue
index ba60ad1db..44f3303a3 100644
--- a/src/components/TableFormatters/GrantedSystemUsersShowFormatter.vue
+++ b/src/components/TableFormatters/GrantedAccountShowFormatter.vue
@@ -1,6 +1,6 @@
 <template>
-  <span v-if="!systemUsers"><a style="color: #1c84c6;" @click="showSystemUser">{{ this.$t('common.Show') }}</a></span>
-  <span v-else>{{ systemUsers.toString() }}</span>
+  <span v-if="!accounts"><a style="color: #1c84c6;" @click="showAccount">{{ this.$t('common.Show') }}</a></span>
+  <span v-else>{{ accounts.toString() }}</span>
 </template>
 
 <script>
@@ -20,15 +20,15 @@ export default {
   },
   data() {
     return {
-      systemUsers: null
+      accounts: null
     }
   },
   methods: {
-    async showSystemUser() {
+    async showAccount() {
       const formatterArgs = Object.assign(this.formatterArgsDefault, this.col.formatterArgs)
       const url = formatterArgs.getUrl({ row: this.row, col: this.col })
       const data = await this.$axios.get(url)
-      this.systemUsers = data.map((item) => item.name)
+      this.accounts = data.map((item) => item.name)
     }
   }
 }
diff --git a/src/components/TableFormatters/index.js b/src/components/TableFormatters/index.js
index 2dd69e4ba..2b154b22e 100644
--- a/src/components/TableFormatters/index.js
+++ b/src/components/TableFormatters/index.js
@@ -5,7 +5,7 @@ import ChoicesFormatter from './ChoicesFormatter'
 import ActionsFormatter from './ActionsFormatter'
 import DeleteActionFormatter from './DeleteActionFormatter'
 import DateFormatter from './DateFormatter'
-import SystemUserFormatter from './GrantedSystemUsersShowFormatter'
+import AccountShowFormatter from './GrantedAccountShowFormatter'
 import ShowKeyCopyFormatter from './ShowKeyCopyFormatter'
 import DialogDetailFormatter from './DialogDetailFormatter'
 import EditableInputFormatter from './EditableInputFormatter'
@@ -20,7 +20,7 @@ export default {
   ActionsFormatter,
   DeleteActionFormatter,
   DateFormatter,
-  SystemUserFormatter,
+  AccountShowFormatter,
   ShowKeyCopyFormatter,
   DialogDetailFormatter,
   ArrayFormatter,
@@ -37,7 +37,7 @@ export {
   ActionsFormatter,
   DeleteActionFormatter,
   DateFormatter,
-  SystemUserFormatter,
+  AccountShowFormatter,
   ShowKeyCopyFormatter,
   DialogDetailFormatter,
   ArrayFormatter,
diff --git a/src/views/myassets/index.vue b/src/views/myassets/index.vue
index 5de531be8..9d01fd23a 100644
--- a/src/views/myassets/index.vue
+++ b/src/views/myassets/index.vue
@@ -10,7 +10,7 @@
 
 <script>
 import GenericTreeListPage from '@/layout/components/GenericTreeListPage'
-import { SystemUserFormatter, DialogDetailFormatter } from '@/components/TableFormatters'
+import { AccountShowFormatter, DialogDetailFormatter } from '@/components/TableFormatters'
 export default {
   components: {
     GenericTreeListPage
@@ -22,22 +22,22 @@ export default {
         showMenu: false,
         showRefresh: true,
         showAssets: false,
-        url: '/api/v1/perms/users/assets/',
-        nodeUrl: '/api/v1/perms/users/nodes/',
+        url: '/api/v1/perms/my/users/assets/',
+        nodeUrl: '/api/v1/perms/my/users/nodes/',
         // ?assets=0不显示资产. =1显示资产
-        treeUrl: '/api/v1/perms/users/nodes/children/tree/?cache_policy=2',
+        treeUrl: '/api/v1/perms/users/my/nodes/children/tree/?cache_policy=2',
         callback: {
           refresh: () => {},
           onSelected: function(event, treeNode) {
             if (treeNode.meta.type === 'node') {
               const currentNodeId = treeNode.meta.data.id
-              this.tableConfig.url = `/api/v1/perms/users/nodes/${currentNodeId}/assets/?cache_policy=1`
+              this.tableConfig.url = `/api/v1/perms/users/my/nodes/${currentNodeId}/assets/?cache_policy=1`
             }
           }.bind(this)
         }
       },
       tableConfig: {
-        url: '/api/v1/perms/users/assets/',
+        url: '/api/v1/perms/users/my/assets/',
         hasTree: true,
         columns: ['name', 'address', 'platform', 'category', 'accounts', 'type', 'comment', 'actions'],
         columnsShow: {
@@ -91,19 +91,19 @@ export default {
             },
             sortable: true
           },
-          ip: {
+          address: {
             sortable: 'custom',
             width: '150px'
           },
-          system_users: {
+          accounts: {
             showOverflowTooltip: true,
             align: 'center',
-            label: this.$t('assets.SystemUsers'),
+            label: this.$t('assets.Account'),
             width: '120px',
-            formatter: SystemUserFormatter,
+            formatter: AccountShowFormatter,
             formatterArgs: {
               getUrl: ({ row }) => {
-                return `/api/v1/perms/users/assets/${row.id}/system-users/?cache_policy=1`
+                return `/api/v1/perms/users/my/assets/${row.id}/accounts/?cache_policy=1`
               }
             }
           },
diff --git a/src/views/users/User/UserDetail/index.vue b/src/views/users/User/UserDetail/index.vue
index 99a07406f..eae84be9c 100644
--- a/src/views/users/User/UserDetail/index.vue
+++ b/src/views/users/User/UserDetail/index.vue
@@ -46,12 +46,12 @@ export default {
             name: 'UserGrantedAssets',
             hidden: () => !vm.$hasPerm('perms.view_userassets')
           },
-          {
-            title: this.$t('users.tabs.grantedAccounts'),
-            name: 'UserGrantedAccounts',
-            // Todo: perms.view_useraccounts
-            hidden: () => !vm.$hasPerm('perms.view_userassets')
-          },
+          // {
+          //   title: this.$t('users.tabs.grantedAccounts'),
+          //   name: 'UserGrantedAccounts',
+          //   // Todo: perms.view_useraccounts
+          //   hidden: () => !vm.$hasPerm('perms.view_userassets')
+          // },
           {
             title: this.$t('users.tabs.assetPermissionRules'),
             name: 'UserAssetPermissionRules',