From ec3eab6e720a232f10af24c794747c2593a4d5bb Mon Sep 17 00:00:00 2001 From: feng626 <1304903146@qq.com> Date: Mon, 19 Sep 2022 11:36:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?perf:=20=E8=B4=A6=E5=8F=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=9B=B8=E5=85=B3=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/AccountHistoryTable/index.vue | 2 +- src/components/AccountListTable/index.vue | 6 +++--- src/router/console/accounts.js | 4 ++-- src/views/assets/Asset/AssetDetail/SystemUser.vue | 4 ++-- src/views/assets/Asset/AssetDetail/index.vue | 4 ++-- src/views/users/Role/RoleDetail/RoleInfo.vue | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/components/AccountHistoryTable/index.vue b/src/components/AccountHistoryTable/index.vue index bebaa06ff..82fb7cff8 100644 --- a/src/components/AccountHistoryTable/index.vue +++ b/src/components/AccountHistoryTable/index.vue @@ -49,7 +49,7 @@ export default { url: this.url, permissions: { app: 'assets', - resource: 'authbook' + resource: 'account' }, columns: [ 'asset_name', 'ip', 'username', 'version', diff --git a/src/components/AccountListTable/index.vue b/src/components/AccountListTable/index.vue index fa6ed3da5..515166573 100644 --- a/src/components/AccountListTable/index.vue +++ b/src/components/AccountListTable/index.vue @@ -73,7 +73,7 @@ export default { url: this.url, permissions: { app: 'assets', - resource: 'authbook' + resource: 'account' }, columns: [ 'hostname', 'ip', 'username', 'version', 'connectivity', @@ -136,7 +136,7 @@ export default { { name: 'Delete', title: this.$t('common.Delete'), - can: this.$hasPerm('assets.delete_authbook'), + can: this.$hasPerm('assets.delete_account'), type: 'primary', callback: ({ row }) => { this.$axios.delete(`/api/v1/assets/accounts/${row.id}/`).then(() => { @@ -148,7 +148,7 @@ export default { { name: 'Test', title: this.$t('common.Test'), - can: this.$hasPerm('assets.test_authbook'), + can: this.$hasPerm('assets.test_account'), callback: ({ row }) => { this.$axios.post( `/api/v1/assets/accounts/${row.id}/verify/`, diff --git a/src/router/console/accounts.js b/src/router/console/accounts.js index 28a1d9d87..327dc4179 100644 --- a/src/router/console/accounts.js +++ b/src/router/console/accounts.js @@ -3,7 +3,7 @@ import empty from '@/layout/empty' export default [ { - path: 'authbook', + path: 'accounts', component: empty, meta: { title: i18n.t('route.AssetAccount'), @@ -19,7 +19,7 @@ export default [ meta: { title: i18n.t('route.AssetAccount'), app: 'assets', - permissions: ['assets.view_authbook'] + permissions: ['assets.view_account'] } }, { diff --git a/src/views/assets/Asset/AssetDetail/SystemUser.vue b/src/views/assets/Asset/AssetDetail/SystemUser.vue index 78825812e..dbfebc248 100644 --- a/src/views/assets/Asset/AssetDetail/SystemUser.vue +++ b/src/views/assets/Asset/AssetDetail/SystemUser.vue @@ -91,7 +91,7 @@ export default { name: 'Delete', title: this.$t('common.Delete'), type: 'danger', - can: !this.$store.getters.currentOrgIsRoot && vm.$hasPerm('assets.delete_authbook'), + can: !this.$store.getters.currentOrgIsRoot && vm.$hasPerm('assets.delete_account'), callback: (val) => { this.$axios.delete(`/api/v1/assets/system-users-assets-relations/${val.row.id}/`).then(() => { this.$message.success(this.$t('common.deleteSuccessMsg')) @@ -164,7 +164,7 @@ export default { } ], systemUserRelationConfig: { - disabled: !vm.$hasPerm('assets.add_authbook'), + disabled: !vm.$hasPerm('assets.add_account'), icon: 'fa-link', type: 'info', title: this.$t('assets.AssociateSystemUsers'), diff --git a/src/views/assets/Asset/AssetDetail/index.vue b/src/views/assets/Asset/AssetDetail/index.vue index ba3ca655f..fffeb3401 100644 --- a/src/views/assets/Asset/AssetDetail/index.vue +++ b/src/views/assets/Asset/AssetDetail/index.vue @@ -41,12 +41,12 @@ export default { { title: this.$t('assets.SystemUser'), name: 'SystemUserList', - hidden: () => !this.$hasPerm('assets.view_authbook') + hidden: () => !this.$hasPerm('assets.view_account') }, { title: this.$t('assets.AccountList'), name: 'Account', - hidden: () => !this.$hasPerm('assets.view_authbook') + hidden: () => !this.$hasPerm('assets.view_account') }, { title: this.$t('assets.PermUserList'), diff --git a/src/views/users/Role/RoleDetail/RoleInfo.vue b/src/views/users/Role/RoleDetail/RoleInfo.vue index d8cdf7a08..0e447be8b 100644 --- a/src/views/users/Role/RoleDetail/RoleInfo.vue +++ b/src/views/users/Role/RoleDetail/RoleInfo.vue @@ -100,7 +100,7 @@ export default { 'assets.gateway': ['assets.view_domain'], 'assets.add_asset': ['assets.view_platform'], 'assets.change_asset': ['assets.view_platform'], - 'assets.view_authbook': ['assets.view_node'], + 'assets.view_account': ['assets.view_node'], 'assets.gathereduser': ['assets.view_node'], 'assets.refresh_assethardwareinfo': ['assets.change_asset'], 'xpack.gatherusertaskexecution': ['xpack.view_gatherusertask'], From 602ea51bbf23c04c917db965f0e5f156a427b416 Mon Sep 17 00:00:00 2001 From: feng626 <1304903146@qq.com> Date: Mon, 19 Sep 2022 19:48:55 +0800 Subject: [PATCH 2/3] perf: account filter --- src/views/accounts/AssetAccount/AssetAccountList.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/accounts/AssetAccount/AssetAccountList.vue b/src/views/accounts/AssetAccount/AssetAccountList.vue index ae29dc77f..037b1b35c 100644 --- a/src/views/accounts/AssetAccount/AssetAccountList.vue +++ b/src/views/accounts/AssetAccount/AssetAccountList.vue @@ -39,12 +39,12 @@ export default { let url = '/api/v1/assets/accounts/' if (treeNode.meta.type === 'node') { const nodeId = treeNode.meta.data.id - url = setUrlParam(url, 'asset', '') - url = setUrlParam(url, 'node', nodeId) + url = setUrlParam(url, 'assets', '') + url = setUrlParam(url, 'nodes', nodeId) } else if (treeNode.meta.type === 'asset') { const assetId = treeNode.meta.data.id - url = setUrlParam(url, 'node', '') - url = setUrlParam(url, 'asset', assetId) + url = setUrlParam(url, 'nodes', '') + url = setUrlParam(url, 'assets', assetId) } this.accountsUrl = url } From 6db7cb4a6e2cf9a5fb365db37eec6a30f22c7cab Mon Sep 17 00:00:00 2001 From: feng626 <1304903146@qq.com> Date: Mon, 19 Sep 2022 20:57:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?perf=20=E8=B4=A6=E5=8F=B7=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/AccountListTable/index.vue | 26 +++++++++++++---------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/components/AccountListTable/index.vue b/src/components/AccountListTable/index.vue index 515166573..6053b6497 100644 --- a/src/components/AccountListTable/index.vue +++ b/src/components/AccountListTable/index.vue @@ -19,7 +19,7 @@