diff --git a/src/components/Dialog/index.vue b/src/components/Dialog/index.vue index 2042a2ac4..8ff2cf310 100644 --- a/src/components/Dialog/index.vue +++ b/src/components/Dialog/index.vue @@ -98,6 +98,14 @@ export default { margin-left: 20px; } + //.el-form-item__label { + // width: 30% !important; + //} + // + //.el-form-item__content { + // margin-left: 30% !important; + //} + .el-icon-circle-check { display: none; } diff --git a/src/components/Form/DataForm/rules/index.js b/src/components/Form/DataForm/rules/index.js index b72ae8e4d..56c80ed87 100644 --- a/src/components/Form/DataForm/rules/index.js +++ b/src/components/Form/DataForm/rules/index.js @@ -1,11 +1,11 @@ import i18n from '@/i18n/i18n' export const Required = { - required: true, message: i18n.t('fieldRequiredError'), trigger: 'blur' + required: true, message: i18n.t('FieldRequiredError'), trigger: 'blur' } export const RequiredChange = { - required: true, message: i18n.t('fieldRequiredError'), trigger: 'change' + required: true, message: i18n.t('FieldRequiredError'), trigger: 'change' } export const EmailCheck = { diff --git a/src/components/Table/AutoDataTable/index.vue b/src/components/Table/AutoDataTable/index.vue index 0c37212bd..cab581108 100644 --- a/src/components/Table/AutoDataTable/index.vue +++ b/src/components/Table/AutoDataTable/index.vue @@ -135,7 +135,7 @@ export default { false: i18n.t('Inactive') } } - col.width = '80px' + col.width = '100px' break case 'datetime': case 'date_start': @@ -277,8 +277,8 @@ export default { const customMeta = this.config.columnsMeta ? this.config.columnsMeta[name] : {} let col = { prop: name, label: colMeta.label, showOverflowTooltip: true } - col = this.generateColumnByName(name, col) col = this.generateColumnByType(colMeta.type, col, colMeta) + col = this.generateColumnByName(name, col) col = this.setDefaultFormatterIfNeed(col) col = Object.assign(col, customMeta) col = this.addHelpTipsIfNeed(col) diff --git a/src/router/console/index.js b/src/router/console/index.js index d09f678aa..4c50cd610 100644 --- a/src/router/console/index.js +++ b/src/router/console/index.js @@ -8,7 +8,6 @@ import AssetsMenu from './assets' import PermsMenu from './perms' import AccountMenus from './accounts' import LabelMenus from './labels' -import AclsMenus from './acls' export default { path: '/console', @@ -76,17 +75,7 @@ export default { resource: 'assetpermission', permissions: [] }, - children: PermsMenu[0].children - }, - { - path: '/console/acls', - component: empty, - name: 'Acls', - meta: { - title: i18n.t('MenuAcls'), - icon: 'acl' - }, - children: AclsMenus + children: PermsMenu }, { path: '/console/more', diff --git a/src/router/console/perms.js b/src/router/console/perms.js index 00f8120ef..9ebe467fd 100644 --- a/src/router/console/perms.js +++ b/src/router/console/perms.js @@ -1,5 +1,6 @@ import i18n from '@/i18n/i18n' import empty from '@/layout/empty' +import AclsMenus from './acls' export default [ { @@ -38,5 +39,6 @@ export default [ meta: { title: i18n.t('AssetPermissionDetail'), permissions: ['perms.view_assetpermission'] } } ] - } + }, + ...AclsMenus ] diff --git a/src/views/accounts/AccountChangeSecret/AccountChangeSecretList.vue b/src/views/accounts/AccountChangeSecret/AccountChangeSecretList.vue index ed8e0c4b8..6c58b98c5 100644 --- a/src/views/accounts/AccountChangeSecret/AccountChangeSecretList.vue +++ b/src/views/accounts/AccountChangeSecret/AccountChangeSecretList.vue @@ -60,6 +60,7 @@ export default { }, executed_amount: { formatter: DetailFormatter, + width: '100px', formatterArgs: { route: 'AccountGatherList', can: vm.$hasPerm('accounts.view_changesecretexecution'), diff --git a/src/views/accounts/AccountGather/AccountGatherList.vue b/src/views/accounts/AccountGather/AccountGatherList.vue index 15a844e5c..4ac6e16f8 100644 --- a/src/views/accounts/AccountGather/AccountGatherList.vue +++ b/src/views/accounts/AccountGather/AccountGatherList.vue @@ -42,8 +42,15 @@ export default { url: '/api/v1/accounts/gathered-accounts/', hasTree: true, columns: [ - 'asset', 'username', 'date_last_login', 'present', 'address_last_login', 'date_updated' + 'asset', 'username', 'date_last_login', 'present', + 'address_last_login', 'date_updated' ], + columnsShow: { + default: [ + 'asset', 'username', 'date_last_login', 'present', + 'address_last_login' + ] + }, columnsMeta: { asset: { formatter: function(row) { @@ -62,10 +69,10 @@ export default { showOverflowTooltip: true }, present: { - width: 80 + width: '100px' }, address_last_login: { - width: 120 + width: '120px' }, date_updated: { formatter: function(row, col, cell) { diff --git a/src/views/accounts/AccountGather/AccountGatherTaskList.vue b/src/views/accounts/AccountGather/AccountGatherTaskList.vue index dcd9ae408..6f104f278 100644 --- a/src/views/accounts/AccountGather/AccountGatherTaskList.vue +++ b/src/views/accounts/AccountGather/AccountGatherTaskList.vue @@ -22,10 +22,16 @@ export default { app: 'accounts', resource: 'gatheraccountsautomation' }, - columns: ['name', 'nodes', 'is_periodic', 'periodic_display', 'executed_amount', 'actions'], + columns: [ + 'name', 'nodes', 'is_periodic', + 'periodic_display', 'executed_amount' + ], columnsShow: { min: ['name', 'actions'], - default: ['name', 'nodes', 'is_periodic', 'periodic_display', 'executed_amount', 'actions'] + default: [ + 'name', 'nodes', 'is_periodic', + 'periodic_display', 'executed_amount' + ] }, columnsMeta: { name: { @@ -47,7 +53,7 @@ export default { showFalse: false }, filterable: false, - width: '100px' + width: '120px' }, periodic_display: { }, diff --git a/src/views/accounts/AccountGather/index.vue b/src/views/accounts/AccountGather/index.vue index 6610f6e28..4c2233ae9 100644 --- a/src/views/accounts/AccountGather/index.vue +++ b/src/views/accounts/AccountGather/index.vue @@ -16,7 +16,7 @@ export default { activeMenu: 'AccountGatherList', submenu: [ { - title: this.$t('AccountGatherTaskList'), + title: this.$t('GatheredAccounts'), name: 'AccountGatherList', hidden: !this.$hasPerm('accounts.view_gatheredaccount'), component: () => import('@/views/accounts/AccountGather/AccountGatherList.vue') diff --git a/src/views/users/User/components/InviteUsersDialog.vue b/src/views/users/User/components/InviteUsersDialog.vue index b0b555975..3f280f2e5 100644 --- a/src/views/users/User/components/InviteUsersDialog.vue +++ b/src/views/users/User/components/InviteUsersDialog.vue @@ -9,7 +9,7 @@ after custom-class="asset-select-dialog" top="15vh" - width="800px" + width="700px" >