diff --git a/src/components/Table/DataTable/index.vue b/src/components/Table/DataTable/index.vue index f3ac9b2a0..4eff0e7bf 100644 --- a/src/components/Table/DataTable/index.vue +++ b/src/components/Table/DataTable/index.vue @@ -168,4 +168,9 @@ export default { diff --git a/src/layout/components/TabPage/index.vue b/src/layout/components/TabPage/index.vue index 48c44b5d4..55e0482fc 100644 --- a/src/layout/components/TabPage/index.vue +++ b/src/layout/components/TabPage/index.vue @@ -48,7 +48,7 @@ import Page from '../Page/' import merge from 'webpack-merge' import { toSentenceCase } from '@/utils/common' -const ACTIVE_TAB_KEY = 'activeTab' +const ACTIVE_TAB_KEY = 'tab' export default { name: 'TabPage', @@ -107,7 +107,7 @@ export default { }, watch: { $route(to, from) { - const activeTab = to.query?.activeTab + const activeTab = to.query?.tab if (activeTab && this.iActiveMenu !== activeTab) { this.iActiveMenu = activeTab this.loading = false diff --git a/src/styles/index.scss b/src/styles/index.scss index b1a9711eb..50f6d8d3b 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -362,7 +362,7 @@ button, input, optgroup, select, textarea { } .el-tabs__item > span { - padding: 6px; + padding: 0 6px 0 4px; } .el-form .el-input__inner, .el-dialog__body .el-input__inner { @@ -396,3 +396,4 @@ button, input, optgroup, select, textarea { .el-cascader .el-input__inner { border-radius: 2px; } + diff --git a/src/views/accounts/AccountBackup/AccountBackupList.vue b/src/views/accounts/AccountBackup/AccountBackupList.vue index 6d95ed64d..1cf5c0832 100644 --- a/src/views/accounts/AccountBackup/AccountBackupList.vue +++ b/src/views/accounts/AccountBackup/AccountBackupList.vue @@ -55,7 +55,7 @@ export default { return { name: 'AccountBackupList', query: { - activeTab: 'AccountBackupPlanExecutionList', + tab: 'AccountBackupPlanExecutionList', plan_id: row.id } } diff --git a/src/views/accounts/AccountChangeSecret/AccountChangeSecretList.vue b/src/views/accounts/AccountChangeSecret/AccountChangeSecretList.vue index 3a08254bf..e247f715f 100644 --- a/src/views/accounts/AccountChangeSecret/AccountChangeSecretList.vue +++ b/src/views/accounts/AccountChangeSecret/AccountChangeSecretList.vue @@ -61,7 +61,7 @@ export default { return { name: 'AccountChangeSecretList', query: { - activeTab: 'AccountChangeSecretExecutionList', + tab: 'AccountChangeSecretExecutionList', automation_id: row.id } } diff --git a/src/views/accounts/AccountGather/AccountGatherTaskList.vue b/src/views/accounts/AccountGather/AccountGatherTaskList.vue index 24cd3fef7..faed33cc8 100644 --- a/src/views/accounts/AccountGather/AccountGatherTaskList.vue +++ b/src/views/accounts/AccountGather/AccountGatherTaskList.vue @@ -39,7 +39,7 @@ export default { formatterArgs: { route: 'AccountGatherTaskDetail', routeQuery: { - activeTab: 'Detail' + tab: 'Detail' } } }, @@ -65,7 +65,7 @@ export default { return { name: 'AccountGatherList', query: { - activeTab: 'AccountGatherTaskExecutionList', + tab: 'AccountGatherTaskExecutionList', automation_id: row.id } } diff --git a/src/views/accounts/AccountPush/AccountPushList.vue b/src/views/accounts/AccountPush/AccountPushList.vue index 6cd64c003..b9ad5b132 100644 --- a/src/views/accounts/AccountPush/AccountPushList.vue +++ b/src/views/accounts/AccountPush/AccountPushList.vue @@ -73,7 +73,7 @@ export default { return { name: 'AccountPushList', query: { - activeTab: 'AccountPushExecutionList', + tab: 'AccountPushExecutionList', automation_id: row.id } } diff --git a/src/views/accounts/AccountTemplate/AccountTemplateCreateUpdate.vue b/src/views/accounts/AccountTemplate/AccountTemplateCreateUpdate.vue index afe41620a..60bcb15d9 100644 --- a/src/views/accounts/AccountTemplate/AccountTemplateCreateUpdate.vue +++ b/src/views/accounts/AccountTemplate/AccountTemplateCreateUpdate.vue @@ -45,7 +45,7 @@ export default { vm.$router.push({ name: 'AccountTemplateDetail', query: { - activeTab: 'Account' + tab: 'Account' } }) } diff --git a/src/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclList.vue b/src/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclList.vue index 164a036df..26595a59d 100644 --- a/src/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclList.vue +++ b/src/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclList.vue @@ -48,7 +48,7 @@ export default { return { name: 'CommandFilterAclList', query: { - activeTab: 'CommandGroup', + tab: 'CommandGroup', command_filters: row.id } } diff --git a/src/views/acl/CommandAcl/index.vue b/src/views/acl/CommandAcl/index.vue index 04d2a7859..38b9a5215 100644 --- a/src/views/acl/CommandAcl/index.vue +++ b/src/views/acl/CommandAcl/index.vue @@ -42,7 +42,7 @@ export default { const query = _.cloneDeep(this.$route.query) const newQuery = { ...query, - activeTab: tab.name + tab: tab.name } this.$nextTick(() => { this.$router.replace({ query: newQuery }) diff --git a/src/views/assets/Asset/AssetCreateUpdate/components/AssetAccounts.vue b/src/views/assets/Asset/AssetCreateUpdate/components/AssetAccounts.vue index 1c7324d69..5e7b44bad 100644 --- a/src/views/assets/Asset/AssetCreateUpdate/components/AssetAccounts.vue +++ b/src/views/assets/Asset/AssetCreateUpdate/components/AssetAccounts.vue @@ -137,7 +137,7 @@ export default { name: 'AppletHostDetail', params: { id: assetId }, query: { - activeTab: 'Accounts' + tab: 'Accounts' } }) return @@ -146,7 +146,7 @@ export default { name: 'AssetDetail', params: { id: assetId }, query: { - activeTab: 'Account' + tab: 'Account' } }) } diff --git a/src/views/assets/Asset/AssetDetail/PermUser.vue b/src/views/assets/Asset/AssetDetail/PermUser.vue index d219929d8..6159d2faf 100644 --- a/src/views/assets/Asset/AssetDetail/PermUser.vue +++ b/src/views/assets/Asset/AssetDetail/PermUser.vue @@ -149,7 +149,7 @@ export default { formatterArgs: { route: 'AssetPermissionDetail', routeQuery: { - activeTab: 'AssetPermissionUser' + tab: 'AssetPermissionUser' } } }, @@ -160,7 +160,7 @@ export default { formatterArgs: { route: 'AssetPermissionDetail', routeQuery: { - activeTab: 'AssetPermissionUser' + tab: 'AssetPermissionUser' } } }, @@ -171,7 +171,7 @@ export default { formatterArgs: { route: 'AssetPermissionDetail', routeQuery: { - activeTab: 'AssetPermissionAsset' + tab: 'AssetPermissionAsset' } } } diff --git a/src/views/assets/Asset/AssetList/index.vue b/src/views/assets/Asset/AssetList/index.vue index 3529e23a0..106df43fb 100644 --- a/src/views/assets/Asset/AssetList/index.vue +++ b/src/views/assets/Asset/AssetList/index.vue @@ -92,7 +92,7 @@ export default { const query = _.cloneDeep(this.$route.query) const newQuery = { ...query, - activeTab: tab.name + tab: tab.name } this.$nextTick(() => { this.$router.replace({ query: newQuery }) diff --git a/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskList.vue b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskList.vue index b4b2026b7..2a730e7c5 100644 --- a/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskList.vue +++ b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskList.vue @@ -81,7 +81,7 @@ export default { permissions: 'xpack.view_syncinstancetaskexecution', route: 'SyncInstanceTaskDetail', routeQuery: { - activeTab: 'HistoryList' + tab: 'HistoryList' } } }, @@ -91,7 +91,7 @@ export default { permissions: 'xpack.view_syncinstancetask', route: 'SyncInstanceTaskDetail', routeQuery: { - activeTab: 'AssetList' + tab: 'AssetList' } } } diff --git a/src/views/assets/Domain/DomainDetail/GatewayCreateUpdate.vue b/src/views/assets/Domain/DomainDetail/GatewayCreateUpdate.vue index 20545bf4f..3210e6e5a 100644 --- a/src/views/assets/Domain/DomainDetail/GatewayCreateUpdate.vue +++ b/src/views/assets/Domain/DomainDetail/GatewayCreateUpdate.vue @@ -44,7 +44,7 @@ export default { id: this.$route.query.domain }, query: { - activeTab: 'GatewayList' + tab: 'GatewayList' } }, updateSuccessNextRoute: { @@ -53,7 +53,7 @@ export default { id: this.$route.query.domain }, query: { - activeTab: 'GatewayList' + tab: 'GatewayList' } } } diff --git a/src/views/assets/Domain/DomainList.vue b/src/views/assets/Domain/DomainList.vue index c7f5ac5d0..155d5c951 100644 --- a/src/views/assets/Domain/DomainList.vue +++ b/src/views/assets/Domain/DomainList.vue @@ -29,7 +29,7 @@ export default { async: true, permissions: 'assets.view_asset', routeQuery: { - activeTab: 'AssetList' + tab: 'AssetList' } } }, @@ -39,7 +39,7 @@ export default { formatterArgs: { permissions: 'assets.view_gateway', routeQuery: { - activeTab: 'GatewayList' + tab: 'GatewayList' } } } diff --git a/src/views/perms/const.js b/src/views/perms/const.js index 224f709bf..5cfa8c434 100644 --- a/src/views/perms/const.js +++ b/src/views/perms/const.js @@ -36,7 +36,7 @@ export const AssetPermissionTableMeta = { minWidth: '160px', formatterArgs: { routeQuery: { - activeTab: 'AssetPermissionDetail' + tab: 'AssetPermissionDetail' } } }, @@ -67,7 +67,7 @@ export const AssetPermissionTableMeta = { formatterArgs: { async: true, routeQuery: { - activeTab: 'AssetPermissionUser' + tab: 'AssetPermissionUser' } } }, @@ -77,7 +77,7 @@ export const AssetPermissionTableMeta = { formatterArgs: { async: true, routeQuery: { - activeTab: 'AssetPermissionUser' + tab: 'AssetPermissionUser' } } }, @@ -86,7 +86,7 @@ export const AssetPermissionTableMeta = { formatterArgs: { async: true, routeQuery: { - activeTab: 'AssetPermissionAsset' + tab: 'AssetPermissionAsset' } } }, @@ -96,7 +96,7 @@ export const AssetPermissionTableMeta = { formatterArgs: { async: true, routeQuery: { - activeTab: 'AssetPermissionAsset' + tab: 'AssetPermissionAsset' } } }, @@ -109,7 +109,7 @@ export const AssetPermissionTableMeta = { } }, routeQuery: { - activeTab: 'AssetPermissionAccount' + tab: 'AssetPermissionAccount' } } }, diff --git a/src/views/profile/ProfileInfo.vue b/src/views/profile/ProfileInfo.vue index 78885b31d..cd30aad2b 100644 --- a/src/views/profile/ProfileInfo.vue +++ b/src/views/profile/ProfileInfo.vue @@ -139,7 +139,7 @@ export default { }, callbacks: { click: function() { - this.$router.push({ name: 'ProfileSetting', query: { activeTab: 'PasswordUpdate' }}) + this.$router.push({ name: 'ProfileSetting', query: { tab: 'PasswordUpdate' }}) }.bind(this) } }, @@ -152,7 +152,7 @@ export default { }, callbacks: { click: function() { - this.$router.push({ name: 'ProfileSetting', query: { activeTab: 'SSHUpdate' }}) + this.$router.push({ name: 'ProfileSetting', query: { tab: 'SSHUpdate' }}) }.bind(this) } }, diff --git a/src/views/settings/Storage/index.vue b/src/views/settings/Storage/index.vue index cbc9e7d2b..d58bac6ea 100644 --- a/src/views/settings/Storage/index.vue +++ b/src/views/settings/Storage/index.vue @@ -41,7 +41,7 @@ export default { } }, beforeRouteUpdate(to, from, next) { - if (to.name === from.name && to.path === from.path && to.query?.activeTab) { + if (to.name === from.name && to.path === from.path && to.query?.tab) { this.$store.commit('common/reload') } next() diff --git a/src/views/settings/Terminal/Monitor/component/MonitorCard.vue b/src/views/settings/Terminal/Monitor/component/MonitorCard.vue index 39ebc94d2..ade0650aa 100644 --- a/src/views/settings/Terminal/Monitor/component/MonitorCard.vue +++ b/src/views/settings/Terminal/Monitor/component/MonitorCard.vue @@ -208,7 +208,7 @@ export default { this.$router.replace({ name: 'TerminalSetting', query: { - activeTab: 'TerminalList', + tab: 'TerminalList', name: name } }) diff --git a/src/views/settings/Terminal/index.vue b/src/views/settings/Terminal/index.vue index 78924f33a..4feab0112 100644 --- a/src/views/settings/Terminal/index.vue +++ b/src/views/settings/Terminal/index.vue @@ -67,7 +67,7 @@ export default { } }, beforeRouteUpdate(to, from, next) { - if (to.name === from.name && to.path === from.path && to.query?.activeTab) { + if (to.name === from.name && to.path === from.path && to.query?.tab) { this.$store.commit('common/reload') } next() diff --git a/src/views/users/Group/UserGroupList.vue b/src/views/users/Group/UserGroupList.vue index 3392eb7a7..066c995d7 100644 --- a/src/views/users/Group/UserGroupList.vue +++ b/src/views/users/Group/UserGroupList.vue @@ -31,7 +31,7 @@ export default { id: row.id }, query: { - activeTab: 'GroupUser' + tab: 'GroupUser' } } } diff --git a/src/views/users/Role/RoleList/BaseRoleList.vue b/src/views/users/Role/RoleList/BaseRoleList.vue index db19b8759..e353cc712 100644 --- a/src/views/users/Role/RoleList/BaseRoleList.vue +++ b/src/views/users/Role/RoleList/BaseRoleList.vue @@ -55,7 +55,7 @@ export default { return { name: 'RoleDetail', query: { - activeTab: 'RoleUsers', + tab: 'RoleUsers', scope: row.scope.value }, params: { diff --git a/src/views/users/User/UserList.vue b/src/views/users/User/UserList.vue index 1519cf4fd..78d06d89b 100644 --- a/src/views/users/User/UserList.vue +++ b/src/views/users/User/UserList.vue @@ -75,7 +75,7 @@ export default { formatter: AmountFormatter, formatterArgs: { routeQuery: { - activeTab: 'UserDetail' + tab: 'UserDetail' } } },