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 @@
span {
@@ -385,6 +386,7 @@ button, input, optgroup, select, textarea {
word-break: break-word;
}
}
+
.form-group-header {
text-align: left;
}
diff --git a/src/views/assets/Platform/PlatformCreateUpdate.vue b/src/views/assets/Platform/PlatformCreateUpdate.vue
index 57e18734b..994ea44dc 100644
--- a/src/views/assets/Platform/PlatformCreateUpdate.vue
+++ b/src/views/assets/Platform/PlatformCreateUpdate.vue
@@ -44,11 +44,11 @@ export default {
},
fields: [
[this.$t('Basic'), [
- 'name', 'category_type', 'charset',
- 'domain_enabled'
+ 'name', 'category_type'
]],
[this.$t('Config'), [
- 'protocols', 'su_enabled', 'su_method'
+ 'protocols', 'su_enabled', 'su_method',
+ 'domain_enabled', 'charset'
]],
[this.$t('Automations'), ['automation']],
[this.$t('Other'), ['comment']]
@@ -174,7 +174,7 @@ export default {
}
}
->>> .itemMethodKey.el-form-item {
+>>> .item-method.el-form-item {
display: inline-block;
width: 100%;
.el-form-item__content {
@@ -185,7 +185,7 @@ export default {
}
}
->>> .itemParamsKey.el-form-item {
+>>> .item-params.el-form-item {
display: inline-block;
position: absolute;
right: 20px;
diff --git a/src/views/assets/Platform/const.js b/src/views/assets/Platform/const.js
index 424e3a264..c3cbbe894 100644
--- a/src/views/assets/Platform/const.js
+++ b/src/views/assets/Platform/const.js
@@ -130,7 +130,7 @@ export const setAutomations = (vm) => {
return !formValue[itemEnabledKey] || !formValue['ansible_enabled']
})
// 设置 enableMethod className
- _.set(autoFieldsMeta, `${itemMethodKey}.attrs.class`, 'itemMethodKey')
+ _.set(autoFieldsMeta, `${itemMethodKey}.attrs.class`, 'item-method')
// 设置 enableParams Hidden
_.set(autoFieldsMeta, `${itemParamsKey}.hidden`, (formValue) => {
return !formValue[itemEnabledKey] || !formValue['ansible_enabled']
@@ -148,7 +148,7 @@ export const setAutomations = (vm) => {
// 设置 enableParams label
_.set(autoFieldsMeta, `${itemParamsKey}.label`, '')
// 设置 enableParams className
- _.set(autoFieldsMeta, `${itemParamsKey}.attrs.class`, 'itemParamsKey')
+ _.set(autoFieldsMeta, `${itemParamsKey}.attrs.class`, 'item-params')
_.set(autoFieldsMeta, `${itemParamsKey}.component`, AutomationParamsSetting)
_.set(autoFieldsMeta, `${itemParamsKey}.el.method`, initial[itemMethodKey])
// }