diff --git a/src/components/Apps/AccountCreateUpdateForm/index.vue b/src/components/Apps/AccountCreateUpdateForm/index.vue index 0bcf2716f..36ca1b302 100644 --- a/src/components/Apps/AccountCreateUpdateForm/index.vue +++ b/src/components/Apps/AccountCreateUpdateForm/index.vue @@ -2,6 +2,7 @@ @@ -58,9 +59,8 @@ export default { form: Object.assign({ 'on_invalid': 'error' }, this.account || {}), encryptedFields: ['secret'], fields: [ - [this.$t('Asset'), ['assets']], [this.$t('AccountTemplate'), ['template']], - [this.$t('Basic'), ['name', 'username', 'privileged', 'su_from', 'su_from_username']], + [this.$t('Basic'), ['assets', 'name', 'username', 'privileged', 'su_from', 'su_from_username']], [this.$t('Secret'), [ 'secret_type', 'password', 'ssh_key', 'token', 'access_key', 'passphrase', 'api_key' @@ -145,5 +145,21 @@ export default { } - diff --git a/src/components/Apps/AccountListTable/AccountCreateUpdate.vue b/src/components/Apps/AccountListTable/AccountCreateUpdate.vue index 5085a6f46..c0d7e2c98 100644 --- a/src/components/Apps/AccountListTable/AccountCreateUpdate.vue +++ b/src/components/Apps/AccountListTable/AccountCreateUpdate.vue @@ -53,7 +53,7 @@ export default { title: { type: String, default: function() { - return this.$t('Add') + return this.$t('AddAccount') } } }, diff --git a/src/components/Apps/AccountListTable/AccountList.vue b/src/components/Apps/AccountListTable/AccountList.vue index bfe3e3da8..2eb1a454e 100644 --- a/src/components/Apps/AccountListTable/AccountList.vue +++ b/src/components/Apps/AccountListTable/AccountList.vue @@ -139,7 +139,7 @@ export default { showAddDialog: false, showAddTemplateDialog: false, createAccountResults: [], - accountCreateUpdateTitle: this.$t('Create'), + accountCreateUpdateTitle: this.$t('AddAccount'), iAsset: this.asset, account: {}, secretUrl: '', @@ -316,6 +316,7 @@ export default { name: 'add', title: this.$t('Create'), type: 'primary', + icon: 'plus', can: () => { return vm.$hasPerm('accounts.add_account') && !this.$store.getters.currentOrgIsRoot }, diff --git a/src/components/Form/DataForm/components/el-form-renderer/components/render-form-item.vue b/src/components/Form/DataForm/components/el-form-renderer/components/render-form-item.vue index aaa2187ca..b2d5c5909 100755 --- a/src/components/Form/DataForm/components/el-form-renderer/components/render-form-item.vue +++ b/src/components/Form/DataForm/components/el-form-renderer/components/render-form-item.vue @@ -1,7 +1,7 @@