From 9322c4e7aeb98994610256ab48e92ace4fb2bcb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Fri, 4 Nov 2022 20:06:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=97=B6=E6=9C=89=E5=A4=9A=E4=B8=AA=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE=E5=8F=AA=E6=98=BE=E7=A4=BA=E4=B8=80=E4=B8=AA=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FormFields/ProtocolSelector/ProtocolSettingDialog.vue  | 2 +-
 src/components/FormFields/ProtocolSelector/index.vue       | 7 ++-----
 src/views/assets/Platform/const.js                         | 6 +++++-
 src/views/assets/const.js                                  | 7 -------
 4 files changed, 8 insertions(+), 14 deletions(-)

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: {