diff --git a/src/components/FormFields/ProtocolSelector/ProtocolSettingDialog.vue b/src/components/FormFields/ProtocolSelector/ProtocolSettingDialog.vue index 3ce8f700a..d8a151f9e 100644 --- a/src/components/FormFields/ProtocolSelector/ProtocolSettingDialog.vue +++ b/src/components/FormFields/ProtocolSelector/ProtocolSettingDialog.vue @@ -113,7 +113,7 @@ export default { }, { id: 'sftp_enabled', - label: '启用 SFTP', + label: this.$t('common.Enable') + ' SFTP', type: 'switch', hidden: () => this.item.name !== 'ssh' }, diff --git a/src/components/FormFields/ProtocolSelector/index.vue b/src/components/FormFields/ProtocolSelector/index.vue index 265336590..c4cf2c1d6 100644 --- a/src/components/FormFields/ProtocolSelector/index.vue +++ b/src/components/FormFields/ProtocolSelector/index.vue @@ -137,13 +137,10 @@ export default { item.port = selected.port }, setDefaultItems(choices) { - const defaults = choices.filter(item => (item.required || item.primary || item.default)) if (this.value.length > 0) { - const notInDefaults = this.value.filter(item => { - return defaults.find(d => d.name === item.name) - }) - this.items = notInDefaults + this.items = this.value } else { + const defaults = choices.filter(item => (item.required || item.primary || item.default)) this.items = defaults } }, diff --git a/src/views/assets/Platform/const.js b/src/views/assets/Platform/const.js index 3110405a9..879078956 100644 --- a/src/views/assets/Platform/const.js +++ b/src/views/assets/Platform/const.js @@ -16,13 +16,17 @@ export const platformFieldsMeta = (vm) => { 'gather_facts_enabled', 'gather_facts_method', 'push_account_enabled', 'push_account_method', 'change_secret_enabled', 'change_secret_method', - 'verify_account_enabled', 'verify_account_method' + 'verify_account_enabled', 'verify_account_method', + 'gather_accounts_enabled', 'gather_accounts_method' ], fieldsMeta: { ansible_config: { component: JsonEditor, hidden: (formValue) => !formValue['ansible_enabled'] }, + gather_facts_enabled: { + label: i18n.t('assets.CollectHardwareInfo') + }, ping_method: {}, gather_facts_method: {}, push_account_method: {}, diff --git a/src/views/assets/const.js b/src/views/assets/const.js index bd32617e0..2205930e5 100644 --- a/src/views/assets/const.js +++ b/src/views/assets/const.js @@ -9,13 +9,6 @@ export const assetFieldsMeta = (vm) => { const secretTypes = [] return { address: {}, - automation: { - fieldsMeta: { - gather_facts_enabled: { - label: i18n.t('assets.CollectHardwareInfo') - } - } - }, protocols: { component: ProtocolSelector, el: {