diff --git a/src/components/AccountCreateForm/index.vue b/src/components/AccountCreateForm/index.vue
deleted file mode 100644
index f32386841..000000000
--- a/src/components/AccountCreateForm/index.vue
+++ /dev/null
@@ -1,117 +0,0 @@
-<template>
-  <AutoDataForm v-bind="$data" @submit="confirm" />
-</template>
-
-<script>
-import AutoDataForm from '@/components/AutoDataForm'
-import { UpdateToken } from '@/components/FormFields'
-export default {
-  name: 'AccountCreateForm',
-  components: {
-    AutoDataForm
-  },
-  props: {
-    protocols: {
-      type: Array,
-      default: () => ([])
-    },
-    accounts: {
-      type: Array,
-      default: () => ([])
-    },
-    account: {
-      type: Object,
-      default: null
-    }
-  },
-  data() {
-    return {
-      url: '/api/v1/assets/accounts/',
-      form: this.account || { },
-      fields: [
-        ['Basic', ['username', 'privileged']],
-        ['Auth', ['secret_type', 'password', 'ssh_key', 'token', 'api_key', 'passphrase']],
-        ['Other', ['push_now', 'name', 'comment']]
-      ],
-      defaultPrivilegedAccounts: ['root', 'administrator'],
-      fieldsMeta: {
-        username: {
-          on: {
-            change: ([value], updateForm) => {
-              if (this.defaultPrivilegedAccounts.indexOf(value.toLowerCase()) > -1) {
-                updateForm({ privileged: true })
-              }
-            }
-          }
-        },
-        password: {
-          label: 'Password',
-          component: UpdateToken,
-          hidden: (formValue) => formValue['secret_type'] !== 'password'
-        },
-        ssh_key: {
-          label: 'SSH private key',
-          el: {
-            type: 'textarea',
-            rows: 4
-          },
-          hidden: (formValue) => formValue['secret_type'] !== 'ssh_key'
-        },
-        passphrase: {
-          label: 'Passphrase',
-          component: UpdateToken,
-          hidden: (formValue) => formValue['secret_type'] !== 'ssh_key'
-        },
-        token: {
-          label: 'Token',
-          el: {
-            type: 'textarea',
-            rows: 4
-          },
-          hidden: (formValue) => formValue['secret_type'] !== 'token'
-        },
-        api_key: {
-          id: 'api_key',
-          label: 'Secret key',
-          el: {
-            type: 'textarea',
-            rows: 4
-          },
-          hidden: (formValue) => formValue['secret_type'] !== 'api_key'
-        },
-        secret_type: {
-          label: 'Secret Type',
-          type: 'radio-group',
-          options: [
-            { label: 'Password', value: 'password' },
-            { label: 'SSH key', value: 'ssh_key' },
-            { label: 'Token', value: 'token' },
-            { label: 'Api key', value: 'api_key' }
-          ]
-        }
-      },
-      hasSaveContinue: false
-    }
-  },
-  mounted() {
-    console.log('protocols: ', this.protocols)
-    console.log('this.account: ', this.account)
-  },
-  methods: {
-    confirm(form) {
-      console.log('Account form: accout is: ', this.account)
-      if (this.account?.name) {
-        this.$emit('edit', form)
-      } else {
-        this.$emit('add', form)
-      }
-    },
-    hasProtocol(name) {
-      return this.protocols.find(item => item.name === name)
-    }
-  }
-}
-</script>
-
-<style scoped>
-</style>
diff --git a/src/components/AccountCreateUpdateForm/index.vue b/src/components/AccountCreateUpdateForm/index.vue
new file mode 100644
index 000000000..d7f27c748
--- /dev/null
+++ b/src/components/AccountCreateUpdateForm/index.vue
@@ -0,0 +1,137 @@
+<template>
+  <AutoDataForm
+    v-bind="$data"
+    @submit="confirm"
+    @afterRemoteMeta="afterGetRemoteMeta"
+  />
+</template>
+
+<script>
+import AutoDataForm from '@/components/AutoDataForm'
+import { UpdateToken } from '@/components/FormFields'
+export default {
+  name: 'AccountCreateForm',
+  components: {
+    AutoDataForm
+  },
+  props: {
+    platform: {
+      type: Object,
+      required: true
+    },
+    account: {
+      type: Object,
+      default: null
+    }
+  },
+  data() {
+    return {
+      loading: true,
+      usernameChanged: false,
+      url: '/api/v1/assets/accounts/',
+      form: this.account || { },
+      fields: [
+        [this.$t('common.Basic'), ['name', 'username', 'privileged']],
+        [this.$t('assets.Secret'), ['secret_type', 'password', 'ssh_key', 'token', 'api_key', 'passphrase']],
+        [this.$t('common.Other'), ['push_now', 'comment']]
+      ],
+      defaultPrivilegedAccounts: ['root', 'administrator'],
+      fieldsMeta: {
+        name: {
+          on: {
+            input: ([value], updateForm) => {
+              if (!this.usernameChanged) {
+                updateForm({ username: value })
+              }
+            }
+          }
+        },
+        username: {
+          on: {
+            input: ([value], updateForm) => {
+              this.usernameChanged = true
+            },
+            change: ([value], updateForm) => {
+              if (this.defaultPrivilegedAccounts.indexOf(value.toLowerCase()) > -1) {
+                updateForm({ privileged: true })
+              }
+            }
+          }
+        },
+        password: {
+          label: this.$t('assets.Password'),
+          component: UpdateToken,
+          hidden: (formValue) => formValue.secret_type !== 'password'
+        },
+        ssh_key: {
+          label: this.$t('assets.PrivateKey'),
+          el: {
+            type: 'textarea',
+            rows: 4
+          },
+          hidden: (formValue) => formValue.secret_type !== 'ssh_key'
+        },
+        passphrase: {
+          label: 'Passphrase',
+          component: UpdateToken,
+          hidden: (formValue) => formValue.secret_type !== 'ssh_key'
+        },
+        token: {
+          label: 'Token',
+          el: {
+            type: 'textarea',
+            rows: 4
+          },
+          hidden: (formValue) => formValue.secret_type !== 'token'
+        },
+        api_key: {
+          id: 'api_key',
+          label: this.$t('assets.SecretKey'),
+          el: {
+            type: 'textarea',
+            rows: 4
+          },
+          hidden: (formValue) => formValue.secret_type !== 'api_key'
+        },
+        secret_type: {
+          type: 'radio-group',
+          options: []
+        },
+        push_now: {
+          hidden: () => {
+            return !this.platform.automation?.['push_account_enabled']
+          }
+        }
+      },
+      hasSaveContinue: false
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    afterGetRemoteMeta(meta) {
+      const choices = meta.secret_type.choices
+      const secretTypes = []
+      this.platform.protocols?.forEach(p => {
+        secretTypes.push(...p['secret_types'])
+      })
+      if (!this.form.secret_type) {
+        this.form.secret_type = secretTypes[0]
+      }
+      this.fieldsMeta.secret_type.options = choices.filter(item => {
+        return secretTypes.indexOf(item.value) > -1
+      })
+    },
+    confirm(form) {
+      if (this.account?.name) {
+        this.$emit('edit', form)
+      } else {
+        this.$emit('add', form)
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/src/components/AccountHistoryTable/index.vue b/src/components/AccountHistoryTable/index.vue
index 82fb7cff8..a7d4e5925 100644
--- a/src/components/AccountHistoryTable/index.vue
+++ b/src/components/AccountHistoryTable/index.vue
@@ -7,7 +7,7 @@
 
 <script>
 import { ActionsFormatter, DetailFormatter } from '@/components/TableFormatters'
-import ShowSecretInfo from '../AccountListTable/ShowSecretInfo'
+import ShowSecretInfo from '../AccountListTable/ViewSecret'
 import { GenericListPage } from '@/layout/components'
 
 export default {
diff --git a/src/components/AccountListTable/AddAccount.vue b/src/components/AccountListTable/AddAccount.vue
index f891c9fa5..48d01773b 100644
--- a/src/components/AccountListTable/AddAccount.vue
+++ b/src/components/AccountListTable/AddAccount.vue
@@ -10,8 +10,9 @@
     v-bind="$attrs"
     v-on="$listeners"
   >
-    <AccountCreateForm
-      :protocols="protocols"
+    <AccountCreateUpdateForm
+      v-if="!loading"
+      :platform="platform"
       :account="account"
       @add="addAccount"
       @edit="editAccount"
@@ -21,12 +22,12 @@
 
 <script>
 import Dialog from '@/components/Dialog'
-import AccountCreateForm from '@/components/AccountCreateForm'
+import AccountCreateUpdateForm from '@/components/AccountCreateUpdateForm'
 export default {
   name: 'CreateAccountDialog',
   components: {
     Dialog,
-    AccountCreateForm
+    AccountCreateUpdateForm
   },
   props: {
     visible: {
@@ -39,18 +40,16 @@ export default {
     },
     account: {
       type: Object,
-      default: () => ({
-        name: '',
-        username: '',
-        password: '',
-        private_key: ''
-      })
+      default: () => ({})
     }
   },
   data() {
     return {
+      loading: true,
+      platform: {}
     }
   },
+
   computed: {
     iVisible: {
       get() {
@@ -64,7 +63,17 @@ export default {
       return this.asset ? this.asset.protocol : []
     }
   },
+  async mounted() {
+    try {
+      await this.getPlatform()
+    } finally {
+      this.loading = false
+    }
+  },
   methods: {
+    async getPlatform() {
+      this.platform = await this.$axios.get(`/api/v1/assets/platforms/${this.asset?.platform?.id}/`)
+    },
     addAccount(form) {
       const data = { asset: this.asset.id, ...form }
       this.$axios.post(`/api/v1/assets/accounts/`, data).then(() => {
diff --git a/src/components/AccountListTable/UpdateSecretInfo.vue b/src/components/AccountListTable/UpdateSecretInfo.vue
index b035b3b8d..9c8e770ea 100644
--- a/src/components/AccountListTable/UpdateSecretInfo.vue
+++ b/src/components/AccountListTable/UpdateSecretInfo.vue
@@ -1,7 +1,7 @@
 <template>
   <Dialog
     width="50"
-    :title="this.$t('assets.UpdateAssetUserToken')"
+    :title="this.$tc('assets.UpdateAssetUserToken')"
     :visible.sync="visible"
     :destroy-on-close="true"
     @confirm="handleConfirm()"
diff --git a/src/components/AccountListTable/ShowSecretInfo.vue b/src/components/AccountListTable/ViewSecret.vue
similarity index 96%
rename from src/components/AccountListTable/ShowSecretInfo.vue
rename to src/components/AccountListTable/ViewSecret.vue
index 08da85ec6..238bd19cf 100644
--- a/src/components/AccountListTable/ShowSecretInfo.vue
+++ b/src/components/AccountListTable/ViewSecret.vue
@@ -20,7 +20,7 @@
           <el-form-item :label="this.$t('assets.Name')">
             <el-input v-model="account.asset.name" readonly />
           </el-form-item>
-          <el-form-item :label="this.$t('assets.Username')">
+          <el-form-item :label="this.$tc('assets.Username')">
             <el-input v-model="account['username']" readonly />
           </el-form-item>
           <el-form-item v-if="secretTypePassword" :label="this.$t('assets.Password')">
@@ -68,7 +68,7 @@ export default {
   },
   data() {
     return {
-      dialogTitle: this.$t('common.ViewSecret'),
+      dialogTitle: this.$tc('common.ViewSecret'),
       authInfo: {},
       showAuthInfo: false,
       url: `/api/v1/assets/account-secrets/${this.account.id}/`
diff --git a/src/components/AccountListTable/index.vue b/src/components/AccountListTable/index.vue
index 5bb221193..971ee4d44 100644
--- a/src/components/AccountListTable/index.vue
+++ b/src/components/AccountListTable/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <ListTable ref="ListTable" :table-config="tableConfig" :header-actions="headerActions" />
-    <ShowSecretInfo v-if="showViewSecretDialog" :visible.sync="showViewSecretDialog" :account="account" />
+    <ViewSecret v-if="showViewSecretDialog" :visible.sync="showViewSecretDialog" :account="account" />
     <UpdateSecretInfo
       v-if="showUpdateSecretDialog"
       :visible.sync="showUpdateSecretDialog"
@@ -26,7 +26,7 @@
 <script>
 import ListTable from '@/components/ListTable/index'
 import { ActionsFormatter } from '@/components/TableFormatters'
-import ShowSecretInfo from './ShowSecretInfo'
+import ViewSecret from './ViewSecret'
 import UpdateSecretInfo from './UpdateSecretInfo'
 import AddAccount from './AddAccount'
 import { connectivityMeta } from './const'
@@ -39,9 +39,9 @@ export default {
   components: {
     ListTable,
     UpdateSecretInfo,
-    ShowSecretInfo,
-    AddAccount,
-    PasswordHistoryDialog
+    PasswordHistoryDialog,
+    ViewSecret,
+    AddAccount
   },
   props: {
     url: {
@@ -138,7 +138,7 @@ export default {
                 {
                   name: 'View',
                   title: this.$t('common.View'),
-                  can: this.$hasPerm('assets.view_assetaccountsecret'),
+                  can: this.$hasPerm('assets.view_accountsecret'),
                   type: 'primary',
                   callback: ({ row }) => {
                     vm.account = row
@@ -176,7 +176,7 @@ export default {
                 {
                   name: 'Update',
                   title: this.$t('common.Update'),
-                  can: this.$hasPerm('assets.change_assetaccountsecret') && !this.$store.getters.currentOrgIsRoot,
+                  can: this.$hasPerm('assets.change_account') && !this.$store.getters.currentOrgIsRoot,
                   callback: ({ row }) => {
                     vm.account = row
                     vm.showAddDialog = false
@@ -252,6 +252,8 @@ export default {
         actionColumn.formatterArgs.extraActions.push(item)
       }
     }
+
+    console.log('Has perm: ', this.$hasPerm('assets.change_account'))
   },
   methods: {
     onUpdateAuthDone(account) {
diff --git a/src/components/AutoDataForm/index.vue b/src/components/AutoDataForm/index.vue
index 7222d0d6c..719a35932 100644
--- a/src/components/AutoDataForm/index.vue
+++ b/src/components/AutoDataForm/index.vue
@@ -76,13 +76,15 @@ export default {
         data = await this.$store.dispatch('common/getUrlMeta', { url: this.url })
       }
       this.remoteMeta = data.actions[this.method.toUpperCase()] || {}
+      this.$emit('afterRemoteMeta', this.remoteMeta)
       this.generateColumns()
+      this.$emit('afterGenerateColumns', this.totalFields)
       this.cleanFormValue()
       this.loading = false
       console.log('Loading: ', this.groups)
     },
     generateColumns() {
-      const generator = new FormFieldGenerator()
+      const generator = new FormFieldGenerator(this.$emit)
       this.totalFields = generator.generateFields(this.fields, this.fieldsMeta, this.remoteMeta)
       this.groups = generator.groups
       this.$log.debug('Total fields: ', this.totalFields)
diff --git a/src/components/AutoDataForm/utils.js b/src/components/AutoDataForm/utils.js
index 1abaa0c06..118979745 100644
--- a/src/components/AutoDataForm/utils.js
+++ b/src/components/AutoDataForm/utils.js
@@ -2,12 +2,13 @@ import Vue from 'vue'
 import Select2 from '@/components/FormFields/Select2'
 import ObjectSelect2 from '@/components/FormFields/NestedObjectSelect2'
 import NestedField from '@/components/AutoDataForm/components/NestedField'
-import Swicher from '@/components/FormFields/Swicher'
+import Switcher from '@/components/FormFields/Switcher'
 import rules from '@/components/DataForm/rules'
 import { assignIfNot } from '@/utils/common'
 
 export class FormFieldGenerator {
-  constructor() {
+  constructor(emit) {
+    this.$emite = emit
     this.groups = []
   }
   generateFieldByType(type, field, fieldMeta, fieldRemoteMeta) {
@@ -62,7 +63,7 @@ export class FormFieldGenerator {
         break
       case 'boolean':
         type = ''
-        field.component = Swicher
+        field.component = Switcher
         break
       case 'object_related_field':
         field.component = ObjectSelect2
diff --git a/src/components/FormFields/ProtocolSelector/index.vue b/src/components/FormFields/ProtocolSelector/index.vue
index 25a6f9ec7..0eb6c4ac2 100644
--- a/src/components/FormFields/ProtocolSelector/index.vue
+++ b/src/components/FormFields/ProtocolSelector/index.vue
@@ -137,12 +137,9 @@ export default {
     },
     setDefaultItems(choices) {
       const defaults = choices.filter(item => item.required || item.primary || item.default)
-      console.log('defaults1: ', defaults)
-      console.log('this value: ', this.value)
       const notInDefaults = this.value.filter(item => {
         return !defaults.find(d => d.name === item.name)
       })
-      console.log('Not defaults: ', notInDefaults)
       this.items = [...defaults, ...notInDefaults]
     },
     onSettingClick(item) {
@@ -158,7 +155,7 @@ export default {
 }
 
 .el-select {
-  width: 100px;
+  max-width: 120px;
 }
 
 .input-with-select {
@@ -171,7 +168,7 @@ export default {
 }
 
 .el-select ::v-deep .el-input__inner {
-  width: 100px;
+  width: 110px;
 }
 
 .input-button {
diff --git a/src/components/FormFields/Swicher.vue b/src/components/FormFields/Switcher.vue
similarity index 88%
rename from src/components/FormFields/Swicher.vue
rename to src/components/FormFields/Switcher.vue
index 411336fab..1cad17181 100644
--- a/src/components/FormFields/Swicher.vue
+++ b/src/components/FormFields/Switcher.vue
@@ -10,7 +10,7 @@
 
 <script>
 export default {
-  name: 'Switcher',
+  name: 'Switcher', // 不能叫 Switch，否则会和 js 关键字冲突
   props: {
     type: {
       type: String,
diff --git a/src/components/FormFields/index.js b/src/components/FormFields/index.js
index 4439d4d5c..8638777b8 100644
--- a/src/components/FormFields/index.js
+++ b/src/components/FormFields/index.js
@@ -1,45 +1,45 @@
 import Link from './Link'
-import PasswordInput from './PasswordInput'
-import Select2 from './Select2'
-import Swicher from './Swicher'
-import UploadField from './UploadField'
-import UploadKey from './UploadKey'
-import UserPassword from './UserPassword'
-import WeekCronSelect from './WeekCronSelect'
-import UpdateToken from './UpdateToken'
-import JsonEditor from './JsonEditor'
 import Text from './Text'
+import Select2 from './Select2'
+import Switcher from './Switcher'
+import UploadKey from './UploadKey'
+import JsonEditor from './JsonEditor'
+import UploadField from './UploadField'
+import UpdateToken from './UpdateToken'
+import UserPassword from './UserPassword'
+import PasswordInput from './PasswordInput'
+import WeekCronSelect from './WeekCronSelect'
 import NestedObjectSelect2 from './NestedObjectSelect2'
 import DatetimeRangePicker from './DatetimeRangePicker'
 
 export default {
-  DatetimeRangePicker,
-  NestedObjectSelect2,
+  Text,
   Link,
-  PasswordInput,
+  Switcher,
   Select2,
-  Swicher,
   UploadKey,
+  JsonEditor,
+  UpdateToken,
   UploadField,
   UserPassword,
+  PasswordInput,
   WeekCronSelect,
-  UpdateToken,
-  JsonEditor,
-  Text
+  NestedObjectSelect2,
+  DatetimeRangePicker
 }
 
 export {
-  DatetimeRangePicker,
-  NestedObjectSelect2,
+  Text,
   Link,
-  PasswordInput,
+  Switcher,
   Select2,
-  Swicher,
   UploadKey,
+  JsonEditor,
+  UpdateToken,
   UploadField,
   UserPassword,
+  PasswordInput,
   WeekCronSelect,
-  UpdateToken,
-  JsonEditor,
-  Text
+  NestedObjectSelect2,
+  DatetimeRangePicker
 }
diff --git a/src/components/QuickActions/action.vue b/src/components/QuickActions/action.vue
index 0645eba00..9ed23e9a8 100644
--- a/src/components/QuickActions/action.vue
+++ b/src/components/QuickActions/action.vue
@@ -3,14 +3,31 @@
     <td>{{ action.title }}:</td>
     <td>
       <span>
-        <component :is="iType" v-model="action.attrs.model" v-bind="action.attrs" v-on="callbacks">{{ label }}</component>
+        <component
+          :is="iType"
+          v-model="action.attrs.model"
+          v-bind="action.attrs"
+          v-on="callbacks"
+        >
+          {{ label }}
+        </component>
       </span>
     </td>
   </tr>
 </template>
 
 <script>
-import Switcher from '../FormFields/Swicher'
+import Switcher from '../FormFields/Switcher'
+
+class Action {
+  constructor() {
+    this.title = ''
+    this.type = ''
+    this.attrs = {}
+    this.callbacks = ''
+  }
+}
+
 export default {
   name: 'ActionItem',
   components: {
@@ -18,8 +35,8 @@ export default {
   },
   props: {
     action: {
-      type: Object,
-      default: () => ({})
+      type: [Action, Object],
+      default: () => ({ title: '' })
     }
   },
   data() {
@@ -30,7 +47,7 @@ export default {
   computed: {
     iType() {
       switch (this.action.type) {
-        case 'switcher':
+        case 'switch':
           return 'Switcher'
         default:
           return 'el-button'
diff --git a/src/components/index.js b/src/components/index.js
index a3b9176d8..8c5e26a61 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -19,7 +19,7 @@ export { default as SvgIcon } from './SvgIcon'
 export { default as TreeTable } from './TreeTable'
 export { default as IBox } from './IBox'
 export { default as QuickActions } from './QuickActions'
-export { default as Switcher } from './FormFields/Swicher'
+export { default as Switcher } from './FormFields/Switcher'
 export { default as SummaryCard } from './SummaryCard'
 export { default as UploadField } from './FormFields/UploadField'
 export { default as AccountListTable } from './AccountListTable/index'
diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json
index a2627f9fc..7f799c172 100644
--- a/src/i18n/langs/zh.json
+++ b/src/i18n/langs/zh.json
@@ -98,6 +98,9 @@
     "NoSQLProtocol": "非关系数据库"
   },
   "assets": {
+    "PrivateKey": "密钥",
+    "Secret": "密码",
+    "Network": "网络",
     "All": "所有",
     "Cloud": "云服务",
     "CloudPlatform": "云平台",
@@ -280,6 +283,7 @@
     "ReLoginErr": "登录时长已超过 5 分钟，请重新登录"
   },
   "common": {
+    "Selector": "选择器",
     "NeedAddAppsOrSystemUserErrMsg": "需要添加应用或系统用户",
     "VerificationCodeSent": "验证码已发送",
     "SendVerificationCode": "发送验证码",
diff --git a/src/styles/element-variables.scss b/src/styles/element-variables.scss
index 52c8fdece..d2b9e0857 100644
--- a/src/styles/element-variables.scss
+++ b/src/styles/element-variables.scss
@@ -596,7 +596,7 @@ $--button-active-shade-percent: 10% !default;
 -------------------------- */
 $--cascader-height: 200px !default;
 
-/* Switch
+/* Switcher
 -------------------------- */
 /// color||Color|0
 $--switch-on-color: $--color-primary !default;
diff --git a/src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue b/src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue
index b556d885e..b2a508ba9 100644
--- a/src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue
+++ b/src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue
@@ -17,6 +17,10 @@ export default {
     addFields: {
       type: Array,
       default: () => []
+    },
+    addFieldsMeta: {
+      type: Object,
+      default: () => ({})
     }
   },
   data() {
@@ -31,31 +35,38 @@ export default {
         updateSuccessNextRoute: { name: 'AssetList' },
         hasDetailInMsg: false,
         fields: [
-          [this.$t('common.Basic'), ['name', 'address', 'platform', 'domain']],
-          [this.$t('assets.Protocols'), ['protocols']],
-          [this.$t('assets.Node'), ['nodes']],
+          [this.$t('common.Basic'), ['name', 'address', 'platform']],
+          [this.$t('assets.Network'), ['domain', 'protocols']],
           [this.$t('assets.Account'), ['accounts']],
+          [this.$t('assets.Node'), ['nodes']],
           [this.$t('assets.Label'), ['labels']],
           [this.$t('common.Other'), ['is_active', 'comment']]
         ],
-        fieldsMeta: assetFieldsMeta()
+        fieldsMeta: assetFieldsMeta(this)
       }
     }
   },
   computed: {
     iConfig() {
-      const { url, addFields, defaultConfig } = this
+      const { url, addFields, addFieldsMeta, defaultConfig } = this
       // 过滤类型为：null, undefined 的元素
       defaultConfig.fields = defaultConfig.fields.filter(Boolean)
       const config = _.merge(defaultConfig, { url })
-      if (addFields.length > 0) {
-        const defaultFields = Object.fromEntries(config.fields)
-        for (const [key, value] of addFields) {
-          if (defaultFields.hasOwnProperty(key)) {
-            defaultFields[key] = new Set([...defaultFields[key], ...(value || [])])
-          }
+      for (const [groupName, adds] of addFields) {
+        const group = config.fields.find(([name]) => name === groupName)
+        if (group) {
+          group[1] = group[1].concat(adds)
+        } else {
+          config.fields.splice(1, 0, [groupName, adds])
+        }
+      }
+
+      for (const [name, meta] of Object.entries(addFieldsMeta)) {
+        if (config.fieldsMeta[name]) {
+          config.fieldsMeta[name] = Object.assign(config.fieldsMeta[name], meta)
+        } else {
+          config.fieldsMeta[name] = meta
         }
-        config.fields = Object.entries(defaultFields)
       }
       return config
     }
@@ -87,8 +98,8 @@ export default {
     },
     async setPlatformConstrains() {
       const { platform } = this
-      this.$set(this.defaultConfig.fieldsMeta.protocols.el, 'choices', (platform['protocols'] || []))
-      this.$set(this.defaultConfig.fieldsMeta.accounts.el, 'protocols', (platform['protocols'] || []))
+      this.defaultConfig.fieldsMeta.protocols.el.choices.splice(0, 0, ...platform.protocols)
+      this.defaultConfig.fieldsMeta.accounts.el.platform = platform
       const hiddenCheckFields = ['protocols', 'domain']
 
       for (const field of hiddenCheckFields) {
diff --git a/src/views/assets/Asset/AssetCreateUpdate/DeviceCreateUpdate.vue b/src/views/assets/Asset/AssetCreateUpdate/DeviceCreateUpdate.vue
index 4bf960164..a5f3ae0d8 100644
--- a/src/views/assets/Asset/AssetCreateUpdate/DeviceCreateUpdate.vue
+++ b/src/views/assets/Asset/AssetCreateUpdate/DeviceCreateUpdate.vue
@@ -10,7 +10,7 @@ export default {
   components: { BaseAssetCreateUpdate },
   data() {
     return {
-      url: '/api/v1/assets/assets/devices/'
+      url: '/api/v1/assets/devices/'
     }
   }
 }
diff --git a/src/views/assets/Asset/AssetCreateUpdate/WebCreateUpdate.vue b/src/views/assets/Asset/AssetCreateUpdate/WebCreateUpdate.vue
index 24f3843c3..e2eb5d87a 100644
--- a/src/views/assets/Asset/AssetCreateUpdate/WebCreateUpdate.vue
+++ b/src/views/assets/Asset/AssetCreateUpdate/WebCreateUpdate.vue
@@ -10,7 +10,42 @@ export default {
   components: { BaseAssetCreateUpdate },
   data() {
     return {
-      url: '/api/v1/assets/webs/'
+      url: '/api/v1/assets/webs/',
+      addFields: [
+        [this.$t('common.Selector'), [
+          'autofill', 'username_selector',
+          'password_selector', 'submit_selector',
+          'script'
+        ]]
+      ],
+      addFieldsMeta: {
+        protocols: {
+          hidden: (formValue) => {
+            const address = formValue['address']
+            if (!address) return
+            let port = address.startsWith('https://') ? 443 : 80
+            try {
+              const url = new URL(address)
+              if (url.port) { port = url.port }
+            } catch (e) {
+              // pass
+            }
+            formValue['protocols'][0].port = port
+          }
+        },
+        username_selector: {
+          hidden: (formValue) => formValue['autofill'] !== 'basic'
+        },
+        password_selector: {
+          hidden: (formValue) => formValue['autofill'] !== 'basic'
+        },
+        submit_selector: {
+          hidden: (formValue) => formValue['autofill'] !== 'basic'
+        },
+        script: {
+          hidden: (formValue) => formValue['autofill'] !== 'script'
+        }
+      }
     }
   }
 }
diff --git a/src/views/assets/Asset/AssetCreateUpdate/components/AccountTemplateDialog.vue b/src/views/assets/Asset/AssetCreateUpdate/components/AccountTemplateDialog.vue
new file mode 100644
index 000000000..5feb8c747
--- /dev/null
+++ b/src/views/assets/Asset/AssetCreateUpdate/components/AccountTemplateDialog.vue
@@ -0,0 +1,42 @@
+<template>
+  <Dialog
+    :title="'选择模版'"
+    :destroy-on-close="true"
+    width="70%"
+    v-bind="$attrs"
+    v-on="$listeners"
+  >
+    <AutoDataTable :config="tableConfig" />
+  </Dialog>
+</template>
+
+<script>
+import Dialog from '@/components/Dialog'
+import AutoDataTable from '@/components/AutoDataTable'
+export default {
+  name: 'AccountTemplateDialog',
+  components: {
+    Dialog,
+    AutoDataTable
+  },
+  props: {
+  },
+  data() {
+    return {
+      tableConfig: {
+        url: '/api/v1/assets/account-templates/',
+        columns: ['name', 'username', 'privileged', 'actions'],
+        columnsMeta: {
+          privileged: {
+            width: '100px'
+          }
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/assets/Asset/AssetCreateUpdate/components/AddAccountDialog.vue b/src/views/assets/Asset/AssetCreateUpdate/components/AddAccountDialog.vue
new file mode 100644
index 000000000..2153cd426
--- /dev/null
+++ b/src/views/assets/Asset/AssetCreateUpdate/components/AddAccountDialog.vue
@@ -0,0 +1,70 @@
+<template>
+  <Dialog
+    v-if="visible"
+    :title="this.$tc('assets.AddAccount')"
+    :visible.sync="visible"
+    :destroy-on-close="true"
+    :show-cancel="false"
+    :show-confirm="false"
+    width="70%"
+  >
+    <AccountCreateForm
+      :platform="platform"
+      :account="account"
+      @add="addAccount"
+      @edit="editAccount"
+    />
+  </Dialog>
+</template>
+
+<script>
+import Dialog from '@/components/Dialog'
+import AccountCreateForm from '@/components/AccountCreateUpdateForm'
+export default {
+  name: 'AddAccountDialog',
+  components: {
+    Dialog,
+    AccountCreateForm
+  },
+  props: {
+    platform: {
+      type: Object,
+      default: () => ({})
+    },
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    account: {
+      type: Object,
+      default: () => ({})
+    },
+    accounts: {
+      type: Array,
+      default: () => ([])
+    }
+  },
+  data() {
+    return {}
+  },
+  methods: {
+    addAccount(account) {
+      const i = this.accounts.findIndex(item => item.username === account.username)
+      if (i !== -1) {
+        this.accounts.splice(i, 1)
+      }
+      this.accounts.push(account)
+      this.$emit('update:visible', false)
+    },
+    editAccount(form) {
+      const i = this.accounts.findIndex(item => item.username === this.account.username)
+      this.accounts.splice(i, 1, form)
+      this.$emit('update:visible', false)
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/FormFields/AssetAccounts.vue b/src/views/assets/Asset/AssetCreateUpdate/components/AssetAccounts.vue
similarity index 56%
rename from src/components/FormFields/AssetAccounts.vue
rename to src/views/assets/Asset/AssetCreateUpdate/components/AssetAccounts.vue
index a6f6d0012..5ee5b786c 100644
--- a/src/components/FormFields/AssetAccounts.vue
+++ b/src/views/assets/Asset/AssetCreateUpdate/components/AssetAccounts.vue
@@ -21,50 +21,32 @@
       <el-button size="mini" type="primary" @click="onAddClick">添加</el-button>
       <el-button size="mini" type="success" @click="onAddFromTemplateClick">模版添加</el-button>
     </div>
-    <Dialog
-      v-if="visible"
-      :title="this.$tc('assets.AddAccount')"
-      :visible.sync="visible"
-      :destroy-on-close="true"
-      :show-cancel="false"
-      :show-confirm="false"
-      width="70%"
-    >
-      <AccountCreateForm
-        :protocols="protocols"
-        :account="account"
-        @add="addAccount"
-        @edit="editAccount"
-      />
-    </Dialog>
-    <Dialog
-      v-if="templateTable.visible"
-      :title="'选择模版'"
-      :visible.sync="templateTable.visible"
-      :destroy-on-close="true"
-      width="70%"
-      @submit="onSelectTemplate"
-    >
-      <AutoDataTable :config="templateTable.tableConfig" />
-    </Dialog>
+
+    <AddAccountDialog
+      :visible.sync="addAccountDialogVisible"
+      :platform="platform"
+      :account="account"
+      :accounts="accounts"
+    />
+    <AccountTemplateDialog
+      :visible.sync="templateDialogVisible"
+    />
   </div>
 </template>
 
 <script>
-import Dialog from '@/components/Dialog'
-import AccountCreateForm from '@/components/AccountCreateForm'
-import AutoDataTable from '@/components/AutoDataTable'
+import AccountTemplateDialog from './AccountTemplateDialog'
+import AddAccountDialog from './AddAccountDialog'
 export default {
   name: 'AssetAccounts',
   components: {
-    Dialog,
-    AutoDataTable,
-    AccountCreateForm
+    AccountTemplateDialog,
+    AddAccountDialog
   },
   props: {
-    protocols: {
-      type: Array,
-      default: () => []
+    platform: {
+      type: Object,
+      default: () => ({})
     },
     value: {
       type: [Array],
@@ -79,22 +61,11 @@ export default {
   },
   data() {
     return {
-      visible: false,
+      addAccountDialogVisible: false,
+      templateDialogVisible: false,
       accounts: [],
       account: {},
-      initial: false,
-      templateTable: {
-        visible: false,
-        tableConfig: {
-          url: '/api/v1/assets/account-templates/',
-          columns: ['name', 'username', 'privileged', 'actions'],
-          columnsMeta: {
-            privileged: {
-              width: '100px'
-            }
-          }
-        }
-      }
+      initial: false
     }
   },
   watch: {
@@ -112,24 +83,11 @@ export default {
     }
   },
   methods: {
-    addAccount(account) {
-      const i = this.accounts.findIndex(item => item.username === account.username)
-      if (i !== -1) {
-        this.accounts.splice(i, 1)
-      }
-      this.accounts.push(account)
-      this.visible = false
-    },
     removeAccount(account) {
       this.accounts = this.accounts.filter((item) => {
         return item._id !== account._id
       })
     },
-    editAccount(form) {
-      const i = this.accounts.findIndex(item => item.username === this.account.username)
-      this.accounts.splice(i, 1, form)
-      this.visible = false
-    },
     onEditClick(account) {
       this.account = account
       setTimeout(() => {
@@ -139,14 +97,13 @@ export default {
     onAddClick() {
       this.account = null
       setTimeout(() => {
-        this.visible = true
+        this.addAccountDialogVisible = true
       })
     },
     onAddFromTemplateClick() {
-      this.templateTable.visible = true
+      this.templateDialogVisible = true
     },
     onSelectTemplate() {
-
     }
   }
 }
diff --git a/src/views/assets/Asset/AssetDetail/Account.vue b/src/views/assets/Asset/AssetDetail/Account.vue
index 8dfe994c7..41e12dbc9 100644
--- a/src/views/assets/Asset/AssetDetail/Account.vue
+++ b/src/views/assets/Asset/AssetDetail/Account.vue
@@ -5,11 +5,11 @@
         <AccountListTable
           ref="ListTable"
           :asset="object"
-          :url="assetUserUrl"
+          :url="url"
           :has-import="false"
           :has-clone="false"
           :has-left-actions="true"
-          :columns="assetAccountColumns"
+          :columns="columns"
         />
       </el-col>
       <el-col :md="8" :sm="24">
@@ -38,9 +38,9 @@ export default {
   },
   data() {
     return {
-      assetUserUrl: `/api/v1/assets/accounts/?asset=${this.object.id}`,
-      assetAccountColumns: [
-        'username', 'version', 'privlieged', 'connectivity',
+      url: `/api/v1/assets/accounts/?asset=${this.object.id}`,
+      columns: [
+        'username', 'version', 'privileged', 'connectivity',
         'date_created', 'date_updated', 'actions'
       ],
       quickActions: [
diff --git a/src/views/assets/const.js b/src/views/assets/const.js
index 6c3cd41a0..2205930e5 100644
--- a/src/views/assets/const.js
+++ b/src/views/assets/const.js
@@ -1,18 +1,34 @@
 import i18n from '@/i18n/i18n'
 import ProtocolSelector from '@/components/FormFields/ProtocolSelector'
-import AssetAccounts from '@/components/FormFields/AssetAccounts'
+import AssetAccounts from '@/views/assets/Asset/AssetCreateUpdate/components/AssetAccounts'
 import rules from '@/components/DataForm/rules'
 import { Select2 } from '@/components/FormFields'
 
-export const assetFieldsMeta = () => {
+export const assetFieldsMeta = (vm) => {
+  const platformProtocols = []
+  const secretTypes = []
   return {
     address: {},
     protocols: {
       component: ProtocolSelector,
-      on: {},
       el: {
         settingReadonly: true,
-        choices: []
+        choices: platformProtocols
+      },
+      on: {
+        input: ([value]) => {
+          const protocolSecretTypes = platformProtocols.reduce((pre, cur) => {
+            pre[cur.name] = cur['secret_types']
+            return pre
+          }, {})
+          const _secretTypes = value.map(v => v.name).reduce((pre, name) => {
+            if (protocolSecretTypes[name]) {
+              return pre.concat(protocolSecretTypes[name])
+            }
+            return pre
+          }, [])
+          secretTypes.splice(0, secretTypes.length, ..._secretTypes)
+        }
       }
     },
     platform: {
@@ -42,7 +58,7 @@ export const assetFieldsMeta = () => {
       component: AssetAccounts,
       label: '',
       el: {
-        protocols: [],
+        platform: {},
         default: []
       }
     },
diff --git a/src/views/profile/ProfileInfo.vue b/src/views/profile/ProfileInfo.vue
index e1c3e8491..2fc36f842 100644
--- a/src/views/profile/ProfileInfo.vue
+++ b/src/views/profile/ProfileInfo.vue
@@ -15,13 +15,13 @@
         <el-col :md="10" :sm="24">
           <QuickActions
             type="primary"
-            :title="this.$t('users.AuthSettings')"
+            :title="this.$tc('users.AuthSettings')"
             :actions="authQuickActions"
           />
           <QuickActions
             type="info"
             style="margin-top: 15px"
-            :title="this.$t('users.MessageSubscription')"
+            :title="this.$tc('users.MessageSubscription')"
             fa="fa-info-circle"
             :actions="messageSubscriptionQuickActions"
           />
@@ -156,7 +156,7 @@ export default {
       messageSubscriptionQuickActions: [
         {
           title: this.$t('notifications.SiteMessage'),
-          type: 'switcher',
+          type: 'switch',
           attrs: {
             disabled: true,
             name: 'site_msg',
@@ -168,7 +168,7 @@ export default {
         },
         {
           title: this.$t('setting.Email'),
-          type: 'switcher',
+          type: 'switch',
           attrs: {
             name: 'email',
             model: this.object.receive_backends.indexOf('email') !== -1