From d311884ec0f1839bd5ed0cc139b8f34e5599d0d5 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 11 Aug 2022 16:26:16 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=20account?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AccountCreateForm/index.vue        | 14 ++++++++------
 src/components/AccountHistoryTable/index.vue      | 13 +++++--------
 src/components/AccountListTable/AddAccount.vue    |  4 ++--
 .../AccountListTable/ShowSecretInfo.vue           |  4 ++--
 .../AccountListTable/UpdateSecretInfo.vue         |  4 ++--
 src/components/FormFields/ProtocolSelector.vue    | 12 ++++++------
 .../RemoteApp/RemoteAppCreateUpdate.vue           |  2 +-
 src/views/assets/Asset/AssetCreateUpdate.vue      |  2 +-
 src/views/assets/Asset/AssetList.vue              |  9 +++++++--
 src/views/assets/Host/HostCreateUpdate.vue        | 15 ++++++++-------
 .../assets/Platform/PlatformCreateUpdate.vue      | 10 +++-------
 11 files changed, 45 insertions(+), 44 deletions(-)

diff --git a/src/components/AccountCreateForm/index.vue b/src/components/AccountCreateForm/index.vue
index 5af4b36bc..7b1594267 100644
--- a/src/components/AccountCreateForm/index.vue
+++ b/src/components/AccountCreateForm/index.vue
@@ -4,8 +4,7 @@
 
 <script>
 import AutoDataForm from '@/components/AutoDataForm'
-import { UpdateToken } from '@/components/FormFields'
-import { UploadKey } from '@/components'
+import { UpdateToken, UploadKey } from '@/components/FormFields'
 export default {
   name: 'AccountCreateForm',
   components: {
@@ -14,7 +13,7 @@ export default {
   props: {
     protocols: {
       type: Array,
-      default: () => ['ssh', 'rdp']
+      default: () => ([])
     },
     accounts: {
       type: Array,
@@ -30,16 +29,16 @@ export default {
       url: '/api/v1/assets/accounts/',
       form: this.account || { protocol: this.protocols[0] },
       fields: [
-        'protocol', 'type', 'username', 'password',
+        'type', 'username', 'password',
         'private_key', 'passphrase', 'comment'
       ],
       fieldsMeta: {
         protocol: {
           type: 'radio-group',
           label: this.$t('assets.Protocol'),
-          default: this.protocols[0],
+          default: this.protocols[0].name,
           options: this.protocols.map((item) => {
-            return { label: item.toUpperCase(), value: item }
+            return { label: item.name.toUpperCase(), value: item.name }
           })
         },
         password: {
@@ -55,6 +54,9 @@ export default {
       hasSaveContinue: false
     }
   },
+  mounted() {
+    console.log('protocols: ', this.protocols)
+  },
   methods: {
     confirm(form) {
       if (this.account && this.account._id) {
diff --git a/src/components/AccountHistoryTable/index.vue b/src/components/AccountHistoryTable/index.vue
index 4c67b8fee..bebaa06ff 100644
--- a/src/components/AccountHistoryTable/index.vue
+++ b/src/components/AccountHistoryTable/index.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script>
-import { ActionsFormatter, DetailFormatter, DisplayFormatter } from '@/components/TableFormatters'
+import { ActionsFormatter, DetailFormatter } from '@/components/TableFormatters'
 import ShowSecretInfo from '../AccountListTable/ShowSecretInfo'
 import { GenericListPage } from '@/layout/components'
 
@@ -52,7 +52,7 @@ export default {
           resource: 'authbook'
         },
         columns: [
-          'hostname', 'ip', 'username', 'version',
+          'asset_name', 'ip', 'username', 'version',
           'systemuser', 'date_created', 'date_updated', 'actions'
         ],
         columnsShow: {
@@ -60,9 +60,9 @@ export default {
           default: ['hostname', 'ip', 'username', 'version', 'actions']
         },
         columnsMeta: {
-          hostname: {
-            prop: 'hostname',
-            label: this.$t('assets.Hostname'),
+          asset_name: {
+            prop: 'asset_name',
+            label: this.$t('assets.Name'),
             showOverflowTooltip: true,
             formatter: DetailFormatter,
             formatterArgs: {
@@ -81,9 +81,6 @@ export default {
           username: {
             showOverflowTooltip: true
           },
-          systemuser: {
-            formatter: DisplayFormatter
-          },
           version: {
             width: '70px'
           },
diff --git a/src/components/AccountListTable/AddAccount.vue b/src/components/AccountListTable/AddAccount.vue
index d7425f61a..954fbe6b9 100644
--- a/src/components/AccountListTable/AddAccount.vue
+++ b/src/components/AccountListTable/AddAccount.vue
@@ -40,7 +40,7 @@ export default {
   data() {
     return {
       account: {
-        hostname: '',
+        name: '',
         username: '',
         password: '',
         private_key: ''
@@ -49,7 +49,7 @@ export default {
   },
   computed: {
     protocols() {
-      return this.asset ? this.asset.protocols.map((item) => item.split('/')[0]) : []
+      return this.asset ? this.asset.protocol : []
     }
   },
   methods: {
diff --git a/src/components/AccountListTable/ShowSecretInfo.vue b/src/components/AccountListTable/ShowSecretInfo.vue
index 64fa9be4b..6cbab634d 100644
--- a/src/components/AccountListTable/ShowSecretInfo.vue
+++ b/src/components/AccountListTable/ShowSecretInfo.vue
@@ -17,8 +17,8 @@
     >
       <div>
         <el-form label-position="right" label-width="80px" :model="authInfo">
-          <el-form-item :label="this.$t('assets.Hostname')">
-            <el-input v-model="account.hostname" readonly />
+          <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-input v-model="account['username']" readonly />
diff --git a/src/components/AccountListTable/UpdateSecretInfo.vue b/src/components/AccountListTable/UpdateSecretInfo.vue
index 5b0ea3cb2..b035b3b8d 100644
--- a/src/components/AccountListTable/UpdateSecretInfo.vue
+++ b/src/components/AccountListTable/UpdateSecretInfo.vue
@@ -9,8 +9,8 @@
     v-on="$listeners"
   >
     <el-form label-position="right" label-width="90px">
-      <el-form-item :label="this.$t('assets.Hostname')">
-        <el-input v-model="account.hostname" readonly />
+      <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-input v-model="account['username']" readonly />
diff --git a/src/components/FormFields/ProtocolSelector.vue b/src/components/FormFields/ProtocolSelector.vue
index efa67efcf..12cae5253 100644
--- a/src/components/FormFields/ProtocolSelector.vue
+++ b/src/components/FormFields/ProtocolSelector.vue
@@ -88,17 +88,17 @@ export default {
       this.items.push({ ...this.remainProtocols[0] })
     },
     handleProtocolChange(evt, item) {
-      const selected = this.protocols.find(item => item.name === evt)
+      const selected = this.choices.find(item => item.name === evt)
       item.name = selected.name
       item.port = selected.port
     },
     setDefaultItems(choices) {
-      if (!this.value) {
-        if (choices.length !== 0) {
-          this.items = [choices[0]]
-        }
-      } else {
+      if (this.value && this.value.length > 0) {
         this.items = [...this.value]
+        return
+      }
+      if (choices.length !== 0) {
+        this.items = [choices[0]]
       }
     }
   }
diff --git a/src/views/applications/RemoteApp/RemoteAppCreateUpdate.vue b/src/views/applications/RemoteApp/RemoteAppCreateUpdate.vue
index a334e7c16..5dfbf8b6e 100644
--- a/src/views/applications/RemoteApp/RemoteAppCreateUpdate.vue
+++ b/src/views/applications/RemoteApp/RemoteAppCreateUpdate.vue
@@ -50,7 +50,7 @@ export default {
                 ajax: {
                   url: '/api/v1/assets/assets/?platform__base=Windows',
                   transformOption: (item) => {
-                    return { label: item.hostname, value: item.id }
+                    return { label: item.name, value: item.id }
                   }
                 }
               }
diff --git a/src/views/assets/Asset/AssetCreateUpdate.vue b/src/views/assets/Asset/AssetCreateUpdate.vue
index 6d8abaabf..a629603b0 100644
--- a/src/views/assets/Asset/AssetCreateUpdate.vue
+++ b/src/views/assets/Asset/AssetCreateUpdate.vue
@@ -15,7 +15,7 @@ export default {
     return {
       initial: {},
       fields: [
-        [this.$t('common.Basic'), ['hostname', 'ip', 'platform', 'domain']]
+        [this.$t('common.Basic'), ['name', 'ip', 'platform', 'domain']]
         // [this.$t('assets.Protocol'), ['protocols']],
         // [this.$t('assets.Node'), ['nodes']],
         // this.$route.params.id ? null : [this.$t('assets.Account'), ['accounts']],
diff --git a/src/views/assets/Asset/AssetList.vue b/src/views/assets/Asset/AssetList.vue
index a2fe987cf..b69ae4c31 100644
--- a/src/views/assets/Asset/AssetList.vue
+++ b/src/views/assets/Asset/AssetList.vue
@@ -24,7 +24,12 @@
 
 <script>
 import GenericTreeListPage from '@/layout/components/GenericTreeListPage/index'
-import { DetailFormatter, ActionsFormatter, TagsFormatter, NestedObjectFormatter } from '@/components/TableFormatters'
+import {
+  DetailFormatter,
+  ActionsFormatter,
+  TagsFormatter,
+  NestedObjectFormatter
+} from '@/components/TableFormatters'
 import $ from '@/utils/jquery-vendor'
 import { mapGetters } from 'vuex'
 import { connectivityMeta } from '@/components/AccountListTable/const'
@@ -61,7 +66,7 @@ export default {
         url: '/api/v1/assets/assets/',
         hasTree: true,
         columns: [
-          'hostname', 'ip', 'protocols',
+          'name', 'ip', 'protocols',
           'category', 'type', 'platform',
           'labels', 'nodes',
           'is_active', 'connectivity',
diff --git a/src/views/assets/Host/HostCreateUpdate.vue b/src/views/assets/Host/HostCreateUpdate.vue
index d8b790e51..3c7a8f459 100644
--- a/src/views/assets/Host/HostCreateUpdate.vue
+++ b/src/views/assets/Host/HostCreateUpdate.vue
@@ -15,9 +15,11 @@ export default {
     return {
       loading: true,
       platform: {},
-      initial: { labels: [] },
+      initial: {
+        labels: []
+      },
       fields: [
-        [this.$t('common.Basic'), ['hostname', 'ip', 'platform', 'domain']],
+        [this.$t('common.Basic'), ['name', 'ip', 'platform', 'domain']],
         [this.$t('assets.Protocols'), ['protocols']],
         [this.$t('assets.Node'), ['nodes']],
         this.$route.params.id ? null : [this.$t('assets.Account'), ['accounts']],
@@ -45,13 +47,12 @@ export default {
       const initial = {
         is_active: true,
         platform: parseInt(platformId),
-        protocols: this.platform.protocols_default || ['ssh/22'],
+        protocols: this.platform.protocols_default,
         nodes: nodesInitial,
-        domain: this.platform['domain_default'],
-        admin_user: this.platform['admin_user_default']
+        domain: this.platform.domain_default
       }
-      const limits = this.platform['type_limits']
-      this.fieldsMeta.protocols.el.choices = limits['protocols_limit']
+      const constraints = this.platform['type_constraints']
+      this.fieldsMeta.protocols.el.choices = constraints['protocols']
       this.initial = initial
       this.loading = false
     }
diff --git a/src/views/assets/Platform/PlatformCreateUpdate.vue b/src/views/assets/Platform/PlatformCreateUpdate.vue
index 293dbcd6c..cc19c6ea4 100644
--- a/src/views/assets/Platform/PlatformCreateUpdate.vue
+++ b/src/views/assets/Platform/PlatformCreateUpdate.vue
@@ -23,7 +23,7 @@ export default {
     return {
       loading: true,
       initial: {
-        comment: 'Hello world',
+        comment: '',
         charset: 'utf8',
         category_type: ['host', 'linux'],
         domain_enabled: false,
@@ -106,20 +106,16 @@ export default {
         },
         protocols_enabled: {
           el: {
-            disabled: false,
-            value: false
-          },
-          value: false
+            disabled: false
+          }
         },
         protocols_default: {
           ...assetMeta.protocols,
           hidden: (formValue) => {
-            console.log('formValue', formValue)
             return !formValue['protocols_enabled']
           }
         },
         domain_enabled: {
-          value: true,
           el: {
             disabled: false
           }