diff --git a/src/components/Apps/AccountCreateUpdateForm/const.js b/src/components/Apps/AccountCreateUpdateForm/const.js index 4fda3a232..db21cf112 100644 --- a/src/components/Apps/AccountCreateUpdateForm/const.js +++ b/src/components/Apps/AccountCreateUpdateForm/const.js @@ -37,7 +37,7 @@ export const accountFieldsMeta = (vm) => { on_invalid: { rules: [Required], label: vm.$t('AccountPolicy'), - helpText: vm.$t('BulkCreateStrategy'), + helpText: vm.$t('AccountPolicyHelpText'), hidden: () => { return vm.platform || vm.asset } diff --git a/src/components/Apps/AccountListTable/AccountList.vue b/src/components/Apps/AccountListTable/AccountList.vue index 1b560e34e..466dd9ebc 100644 --- a/src/components/Apps/AccountListTable/AccountList.vue +++ b/src/components/Apps/AccountListTable/AccountList.vue @@ -366,7 +366,7 @@ export default { }.bind(this) }, { - name: 'ClearSecret', + name: 'BatchClearSecret', title: this.$t('ClearSecret'), type: 'primary', icon: 'clean', @@ -380,13 +380,13 @@ export default { { account_ids: ids }).then(() => { this.$message.success(this.$tc('ClearSuccessMsg')) }).catch(err => { - this.$message.error(this.$tc('BulkClearErrorMsg' + ' ' + err)) + this.$message.error(this.$tc('BatchClearErrorMsg' + ' ' + err)) }) }.bind(this) }, { - name: 'actionUpdateSelected', - title: this.$t('AccountBatchUpdate'), + name: 'BatchUpdate', + title: this.$t('BatchUpdate'), icon: 'batch-update', can: ({ selectedRows }) => { return selectedRows.length > 0 && diff --git a/src/components/Apps/BlockedIPs/BlockedIPList.vue b/src/components/Apps/BlockedIPs/BlockedIPList.vue index b65ea1f3a..46505e866 100644 --- a/src/components/Apps/BlockedIPs/BlockedIPList.vue +++ b/src/components/Apps/BlockedIPs/BlockedIPList.vue @@ -68,7 +68,7 @@ export default { extraMoreActions: [ { name: 'UnlockSelected', - title: this.$t('BulkUnblock'), + title: this.$t('BatchUnblock'), type: 'primary', can: ({ selectedRows }) => { return selectedRows.length > 0 diff --git a/src/components/Table/ListTable/TableAction/LeftSide.vue b/src/components/Table/ListTable/TableAction/LeftSide.vue index 11f69a281..0ee280eb0 100644 --- a/src/components/Table/ListTable/TableAction/LeftSide.vue +++ b/src/components/Table/ListTable/TableAction/LeftSide.vue @@ -91,7 +91,7 @@ export default { return { defaultMoreActions: [ { - title: this.$t('DeleteSelected'), + title: this.$t('BatchDelete'), name: 'actionDeleteSelected', has: this.hasBulkDelete, icon: 'fa fa-trash-o', diff --git a/src/router/console/assets.js b/src/router/console/assets.js index 3a69700d8..dd081e43b 100644 --- a/src/router/console/assets.js +++ b/src/router/console/assets.js @@ -255,7 +255,7 @@ export default [ name: 'DomainDetail', component: () => import('@/views/assets/Domain/DomainDetail'), hidden: true, - meta: { title: i18n.t('DomainDetail') } + meta: { title: i18n.t('Detail') } } ] }, diff --git a/src/router/workbench/index.js b/src/router/workbench/index.js index e5360b347..09270b440 100644 --- a/src/router/workbench/index.js +++ b/src/router/workbench/index.js @@ -72,11 +72,11 @@ export default { }, children: [ { - path: 'bulk-Transfer', - name: 'BulkTransfer', + path: 'batch-Transfer', + name: 'BatchTransfer', component: () => import('@/views/ops/File/index'), meta: { - title: i18n.t('BulkTransfer'), + title: i18n.t('BatchTransfer'), permissions: ['rbac.view_filemanager'] } }, diff --git a/src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionList.vue b/src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionList.vue index a7476170f..f263853d7 100644 --- a/src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionList.vue +++ b/src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionList.vue @@ -47,6 +47,9 @@ export default { return row.timedelta.toFixed(2) + 's' } }, + is_success: { + width: '90px' + }, actions: { formatterArgs: { hasDelete: false, diff --git a/src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupInfo.vue b/src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupInfo.vue index 61efb5594..d8d8251a9 100644 --- a/src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupInfo.vue +++ b/src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupInfo.vue @@ -31,7 +31,7 @@ export default { return { quickActions: [ { - title: this.$t('ManualExecutePlan'), + title: this.$t('ManualExecution'), attrs: { type: 'primary', label: this.$t('Execute') diff --git a/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretInfo.vue b/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretInfo.vue index b25eec1f3..9cd41d8f8 100644 --- a/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretInfo.vue +++ b/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretInfo.vue @@ -31,7 +31,7 @@ export default { return { quickActions: [ { - title: this.$t('ManualExecutePlan'), + title: this.$t('ManualExecution'), attrs: { type: 'primary', label: this.$t('Execute'), diff --git a/src/views/accounts/AccountGather/AccountGatherList.vue b/src/views/accounts/AccountGather/AccountGatherList.vue index 4ac6e16f8..5fe193c4b 100644 --- a/src/views/accounts/AccountGather/AccountGatherList.vue +++ b/src/views/accounts/AccountGather/AccountGatherList.vue @@ -71,9 +71,6 @@ export default { present: { width: '100px' }, - address_last_login: { - width: '120px' - }, date_updated: { formatter: function(row, col, cell) { return toSafeLocalDateStr(row.date_updated) @@ -129,8 +126,8 @@ export default { }, extraMoreActions: [ { - name: 'SyncSelected', - title: this.$t('SyncSelected'), + name: 'BatchSync', + title: this.$t('BatchSync'), type: 'primary', icon: 'fa fa-exchange', can: ({ selectedRows }) => { @@ -146,13 +143,13 @@ export default { ).then(() => { this.$message.success(this.$tc('SyncSuccessMsg')) }).catch(err => { - this.$message.error(this.$tc('BulkSyncErrorMsg' + ' ' + err)) + this.$message.error(this.$tc('BatchSyncErrorMsg' + ' ' + err)) }) }.bind(this) }, { - name: 'BulkSyncDelete', - title: this.$t('BulkSyncDelete'), + name: 'BatchSyncDelete', + title: this.$t('BatchSyncDelete'), type: 'primary', icon: 'fa fa-exchange', can: ({ selectedRows }) => { diff --git a/src/views/accounts/AccountPush/AccountPushDetail/AccountPushInfo.vue b/src/views/accounts/AccountPush/AccountPushDetail/AccountPushInfo.vue index 6ce963fd3..622d311f3 100644 --- a/src/views/accounts/AccountPush/AccountPushDetail/AccountPushInfo.vue +++ b/src/views/accounts/AccountPush/AccountPushDetail/AccountPushInfo.vue @@ -31,7 +31,7 @@ export default { return { quickActions: [ { - title: this.$t('ManualExecutePlan'), + title: this.$t('ManualExecution'), attrs: { type: 'primary', label: this.$t('Execute'), diff --git a/src/views/assets/Asset/AssetDetail/Account.vue b/src/views/assets/Asset/AssetDetail/Account.vue index 6b3c698d2..0284e9623 100644 --- a/src/views/assets/Asset/AssetDetail/Account.vue +++ b/src/views/assets/Asset/AssetDetail/Account.vue @@ -66,7 +66,7 @@ export default { ], quickActions: [ { - title: this.$t('BulkVerify'), + title: this.$t('BatchTest'), attrs: { type: 'primary', label: this.$tc('Test') diff --git a/src/views/assets/Asset/AssetList/components/AssetBulkUpdateDialog.vue b/src/views/assets/Asset/AssetList/components/AssetBulkUpdateDialog.vue index 275b686d0..27383e681 100644 --- a/src/views/assets/Asset/AssetList/components/AssetBulkUpdateDialog.vue +++ b/src/views/assets/Asset/AssetList/components/AssetBulkUpdateDialog.vue @@ -57,7 +57,7 @@ export default { { required: false } ], label: this.$t('Platform'), - helpText: this.$t('BulkUpdatePlatformHelpText') + helpText: this.$t('BatchUpdatePlatformHelpText') }, nodes: { ...meta.nodes, diff --git a/src/views/assets/Domain/DomainDetail/index.vue b/src/views/assets/Domain/DomainDetail/index.vue index 29fcacf67..77828b379 100644 --- a/src/views/assets/Domain/DomainDetail/index.vue +++ b/src/views/assets/Domain/DomainDetail/index.vue @@ -27,7 +27,7 @@ export default { activeMenu: 'Detail', submenu: [ { - title: this.$t('DomainDetail'), + title: this.$t('Detail'), name: 'Detail' }, { diff --git a/src/views/ops/File/index.vue b/src/views/ops/File/index.vue index d4de879eb..986a04679 100644 --- a/src/views/ops/File/index.vue +++ b/src/views/ops/File/index.vue @@ -123,7 +123,7 @@ import { formatFileSize } from '@/utils/common' import store from '@/store' export default { - name: 'BulkTransfer', + name: 'BatchTransfer', components: { TreeTable, Page, diff --git a/src/views/sessions/OnlineSession/OnlineSessionList.vue b/src/views/sessions/OnlineSession/OnlineSessionList.vue index f15ba1872..cd8100f33 100644 --- a/src/views/sessions/OnlineSession/OnlineSessionList.vue +++ b/src/views/sessions/OnlineSession/OnlineSessionList.vue @@ -110,7 +110,7 @@ export default { extraMoreActions: [ { name: 'OfflineSelected', - title: this.$t('BulkOffline'), + title: this.$t('BatchOffline'), type: 'danger', icon: 'clean', can: ({ selectedRows }) => { diff --git a/src/views/settings/Applet/Applet/AppletDetail/AppletHosts.vue b/src/views/settings/Applet/Applet/AppletDetail/AppletHosts.vue index 4773c88a0..dbbaa3550 100644 --- a/src/views/settings/Applet/Applet/AppletDetail/AppletHosts.vue +++ b/src/views/settings/Applet/Applet/AppletDetail/AppletHosts.vue @@ -35,7 +35,7 @@ export default { extraMoreActions: [ { name: 'SyncSelected', - title: this.$t('BulkDeploy'), + title: this.$t('BatchDeployment'), type: 'primary', can: ({ selectedRows }) => { return selectedRows.length > 0