diff --git a/src/components/AutoDataTable/index.vue b/src/components/AutoDataTable/index.vue index 26ea2428c..aee79a1c5 100644 --- a/src/components/AutoDataTable/index.vue +++ b/src/components/AutoDataTable/index.vue @@ -232,6 +232,16 @@ export default { } return col }, + addOrderingIfNeed(col) { + if (col.prop) { + const column = this.meta[col.prop] || {} + if (column.order) { + col.sortable = 'custom' + col['column-key'] = col.prop + } + } + return col + }, setDefaultFormatterIfNeed(col) { if (!col.formatter) { col.formatter = (row, column, cellValue) => { @@ -247,6 +257,7 @@ export default { } return col }, + generateColumn(name) { const colMeta = this.meta[name] || {} const customMeta = this.config.columnsMeta ? this.config.columnsMeta[name] : {} @@ -258,6 +269,7 @@ export default { col = Object.assign(col, customMeta) col = this.addHelpTipsIfNeed(col) col = this.addFilterIfNeed(col) + col = this.addOrderingIfNeed(col) return col }, generateTotalColumns() { diff --git a/src/views/accounts/AssetAccount/AssetAccountDetail/Activity.vue b/src/views/accounts/AssetAccount/AssetAccountDetail/Activity.vue deleted file mode 100644 index ce9ade964..000000000 --- a/src/views/accounts/AssetAccount/AssetAccountDetail/Activity.vue +++ /dev/null @@ -1,36 +0,0 @@ - - - - - diff --git a/src/views/accounts/AssetAccount/AssetAccountDetail/Detail.vue b/src/views/accounts/AssetAccount/AssetAccountDetail/Detail.vue index 28a67de04..6440a82b9 100644 --- a/src/views/accounts/AssetAccount/AssetAccountDetail/Detail.vue +++ b/src/views/accounts/AssetAccount/AssetAccountDetail/Detail.vue @@ -1,10 +1,10 @@ @@ -78,8 +78,29 @@ export default { callbacks: Object.freeze({ click: () => { this.$axios.post( - `/api/v1/accounts/accounts/${this.object.id}/verify/`, - { action: 'test' } + `/api/v1/accounts/accounts/tasks/`, + { + action: 'test', + accounts: [this.object.id] + } + ).then(res => { + openTaskPage(res['task']) + }) + } + }) + }, + { + title: this.$t('assets.PushAccount'), + attrs: { + type: 'primary', + label: this.$t('assets.Push'), + disabled: !vm.$hasPerm('accounts.create_account') + }, + callbacks: Object.freeze({ + click: () => { + this.$axios.post( + `/api/v1/accounts/accounts/tasks/`, + { action: 'verify', accounts: [this.object.id] } ).then(res => { openTaskPage(res['task']) }) @@ -124,5 +145,5 @@ export default { } - diff --git a/src/views/assets/Platform/PlatformDetail/Automation.vue b/src/views/assets/Platform/PlatformDetail/Automation.vue index 7b28dfd6e..db1886eed 100644 --- a/src/views/assets/Platform/PlatformDetail/Automation.vue +++ b/src/views/assets/Platform/PlatformDetail/Automation.vue @@ -1,6 +1,6 @@ @@ -69,5 +69,8 @@ export default { diff --git a/src/views/settings/Ldap/SyncSettingDialog.vue b/src/views/settings/Ldap/SyncSettingDialog.vue index ab54e5b5a..f5a6c7c46 100644 --- a/src/views/settings/Ldap/SyncSettingDialog.vue +++ b/src/views/settings/Ldap/SyncSettingDialog.vue @@ -1,27 +1,27 @@ diff --git a/src/views/tasks/TaskDetail/TaskHistory.vue b/src/views/tasks/TaskDetail/TaskHistory.vue index 63a8b5096..27f4bbcb5 100644 --- a/src/views/tasks/TaskDetail/TaskHistory.vue +++ b/src/views/tasks/TaskDetail/TaskHistory.vue @@ -1,5 +1,5 @@