From 424f68840624664ef0d22f8e67241940bfe24cf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Tue, 1 Nov 2022 18:41:53 +0800
Subject: [PATCH 1/3] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E5=88=9B=E5=BB=BA=E6=9B=B4=E6=96=B0=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AccountCreateUpdateForm/index.vue         | 43 ++++++++++++-------
 ...AddAccount.vue => AccountCreateUpdate.vue} |  0
 src/components/AccountListTable/index.vue     |  6 +--
 .../AssetCreateUpdate/WebCreateUpdate.vue     |  3 +-
 4 files changed, 33 insertions(+), 19 deletions(-)
 rename src/components/AccountListTable/{AddAccount.vue => AccountCreateUpdate.vue} (100%)

diff --git a/src/components/AccountCreateUpdateForm/index.vue b/src/components/AccountCreateUpdateForm/index.vue
index 31b25683b..366606683 100644
--- a/src/components/AccountCreateUpdateForm/index.vue
+++ b/src/components/AccountCreateUpdateForm/index.vue
@@ -1,18 +1,15 @@
 <template>
-  <AutoDataForm
-    v-bind="$data"
-    @submit="confirm"
-    @afterRemoteMeta="afterGetRemoteMeta"
-  />
+  <GenericCreateUpdateForm v-if="!loading" v-bind="$data" @afterRemoteMeta="afterGetRemoteMeta" />
 </template>
 
 <script>
-import AutoDataForm from '@/components/AutoDataForm'
+import { GenericCreateUpdateForm } from '@/layout/components'
 import { UpdateToken } from '@/components/FormFields'
+
 export default {
   name: 'AccountCreateForm',
   components: {
-    AutoDataForm
+    GenericCreateUpdateForm
   },
   props: {
     platform: {
@@ -25,17 +22,17 @@ export default {
     }
   },
   data() {
+    const url = '/api/v1/assets/accounts/'
     return {
+      url,
       loading: true,
-      usernameChanged: false,
-      url: '/api/v1/assets/accounts/',
-      form: this.account || { },
+      initial: {},
+      getUrl: () => url,
       fields: [
         [this.$t('common.Basic'), ['name', 'username', 'privileged']],
         [this.$t('assets.Secret'), ['secret_type', 'secret', 'ssh_key', 'token', 'api_key', 'passphrase']],
         [this.$t('common.Other'), ['push_now', 'comment']]
       ],
-      defaultPrivilegedAccounts: ['root', 'administrator'],
       fieldsMeta: {
         name: {
           on: {
@@ -103,10 +100,26 @@ export default {
           }
         }
       },
-      hasSaveContinue: false
+      hasReset: true,
+      hasSaveContinue: false,
+      cleanFormValue(values) {
+        const secretType = values.secret_type || ''
+        if (secretType !== 'password') {
+          values.secret = values[secretType]
+          delete values[secretType]
+        }
+
+        return values
+      },
+      onSubmit: this.confirm
     }
   },
-  mounted() {
+  async created() {
+    try {
+      this.initial = await this.account
+    } finally {
+      this.loading = false
+    }
   },
   methods: {
     afterGetRemoteMeta(meta) {
@@ -115,8 +128,8 @@ export default {
       this.platform.protocols?.forEach(p => {
         secretTypes.push(...p['secret_types'])
       })
-      if (!this.form.secret_type) {
-        this.form.secret_type = secretTypes[0]
+      if (!this.initial.secret_type) {
+        this.initial.secret_type = secretTypes[0]
       }
       this.fieldsMeta.secret_type.options = choices.filter(item => {
         return secretTypes.indexOf(item.value) > -1
diff --git a/src/components/AccountListTable/AddAccount.vue b/src/components/AccountListTable/AccountCreateUpdate.vue
similarity index 100%
rename from src/components/AccountListTable/AddAccount.vue
rename to src/components/AccountListTable/AccountCreateUpdate.vue
diff --git a/src/components/AccountListTable/index.vue b/src/components/AccountListTable/index.vue
index 71cf48eb3..dd236016f 100644
--- a/src/components/AccountListTable/index.vue
+++ b/src/components/AccountListTable/index.vue
@@ -8,7 +8,7 @@
       :account="account"
       @updateAuthDone="onUpdateAuthDone"
     />
-    <AddAccount
+    <AccountCreateUpdate
       v-if="showAddDialog"
       :visible.sync="showAddDialog"
       :asset="iAsset"
@@ -28,7 +28,7 @@ import ListTable from '@/components/ListTable/index'
 import { ActionsFormatter } from '@/components/TableFormatters'
 import ViewSecret from './ViewSecret'
 import UpdateSecretInfo from './UpdateSecretInfo'
-import AddAccount from './AddAccount'
+import AccountCreateUpdate from './AccountCreateUpdate'
 import { connectivityMeta } from './const'
 import { openTaskPage } from '@/utils/jms'
 import { hasUUID } from '@/utils/common'
@@ -41,7 +41,7 @@ export default {
     UpdateSecretInfo,
     PasswordHistoryDialog,
     ViewSecret,
-    AddAccount
+    AccountCreateUpdate
   },
   props: {
     url: {
diff --git a/src/views/assets/Asset/AssetCreateUpdate/WebCreateUpdate.vue b/src/views/assets/Asset/AssetCreateUpdate/WebCreateUpdate.vue
index e2eb5d87a..d1f819622 100644
--- a/src/views/assets/Asset/AssetCreateUpdate/WebCreateUpdate.vue
+++ b/src/views/assets/Asset/AssetCreateUpdate/WebCreateUpdate.vue
@@ -30,7 +30,8 @@ export default {
             } catch (e) {
               // pass
             }
-            formValue['protocols'][0].port = port
+            const protocols = formValue['protocols']?.[0] || {}
+            protocols.port = port
           }
         },
         username_selector: {

From 0d993c0b90bbb196eed22ca91ccbd3b095cad780 Mon Sep 17 00:00:00 2001
From: "Jiangjie.Bai" <bugatti_it@163.com>
Date: Tue, 1 Nov 2022 19:52:58 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E8=B5=84=E4=BA=A7=E6=8E=88?=
 =?UTF-8?q?=E6=9D=83=E8=A7=84=E5=88=99=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=88=E6=9D=83=E8=B4=A6=E5=8F=B7tab?=
 =?UTF-8?q?=E9=A1=B5=EF=BC=8C=E6=98=BE=E7=A4=BA=E6=89=80=E6=9C=89=E6=8E=88?=
 =?UTF-8?q?=E6=9D=83=E7=9A=84=E8=B4=A6=E5=8F=B7=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/en.json                        |  1 +
 src/i18n/langs/ja.json                        |  1 +
 src/i18n/langs/zh.json                        |  1 +
 .../AssetPermissionAccount.vue                | 81 +++++++++++++++++++
 .../AssetPermissionDetail/index.vue           |  7 ++
 5 files changed, 91 insertions(+)
 create mode 100644 src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAccount.vue

diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 365e25b38..2f955d088 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -640,6 +640,7 @@
   },
   "perms": {
     "": "",
+    "permAccount": "Accounts",
     "Actions": "Actions",
     "Permission": "Permissions",
     "Asset": "Asset",
diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json
index 4e51d27b1..ac83dd08c 100644
--- a/src/i18n/langs/ja.json
+++ b/src/i18n/langs/ja.json
@@ -647,6 +647,7 @@
   },
   "perms": {
     "": "",
+    "permAccount": "認定アカウント",
     "Actions": "アクション",
     "Asset": "資産",
     "Basic": "基本",
diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json
index 1a71342a4..1a9002fb8 100644
--- a/src/i18n/langs/zh.json
+++ b/src/i18n/langs/zh.json
@@ -657,6 +657,7 @@
   },
   "perms": {
     "": "",
+    "permAccount": "授权账号",
     "Actions": "动作",
     "Asset": "资产",
     "Basic": "基本",
diff --git a/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAccount.vue b/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAccount.vue
new file mode 100644
index 000000000..b3a21f5a2
--- /dev/null
+++ b/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAccount.vue
@@ -0,0 +1,81 @@
+<template>
+  <ListTable ref="ListTable" :table-config="tableConfig" :header-actions="headerActions" class- />
+</template>
+
+<script>
+import ListTable from '@/components/ListTable'
+
+export default {
+  name: 'AssetPermissionAccount',
+  components: {
+    ListTable
+  },
+  props: {
+    object: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    const vm = this
+    return {
+      tableConfig: {
+        url: `/api/v1/perms/asset-permissions/${this.object.id}/accounts/`,
+        columns: [
+          'asset', 'name', 'username', 'privileged', 'version', 'comment'
+        ],
+        columnsShow: {
+          default: [
+            'asset', 'name', 'username', 'privileged', 'version'
+          ],
+          min: ['asset_name', 'name']
+        },
+        columnsMeta: {
+          asset: {
+            label: this.$t('assets.Asset'),
+            showOverflowTooltip: true,
+            formatter: function(row) {
+              const to = {
+                name: 'AssetDetail',
+                params: { id: row.asset.id }
+              }
+              if (vm.$hasPerm('assets.view_asset')) {
+                return <router-link to={ to } >{ row.asset.name }</router-link>
+              } else {
+                return <span>{ row.asset.name }</span>
+              }
+            }
+          },
+          name: {
+            formatter: null
+          },
+          privileged: {
+            width: '120px',
+            label: this.$t('assets.Privileged'),
+            formatterArgs: {
+              showFalse: false
+            }
+          }
+        },
+        tableAttrs: {
+          border: false
+        }
+      },
+      headerActions: {
+        hasSearch: true,
+        hasRefresh: true,
+        hasLeftActions: true,
+        hasRightActions: true,
+        hasExport: false,
+        hasImport: false,
+        hasCreate: false,
+        hasMoreActions: false
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/perms/AssetPermission/AssetPermissionDetail/index.vue b/src/views/perms/AssetPermission/AssetPermissionDetail/index.vue
index 4919e3a2d..958389aff 100644
--- a/src/views/perms/AssetPermission/AssetPermissionDetail/index.vue
+++ b/src/views/perms/AssetPermission/AssetPermissionDetail/index.vue
@@ -11,6 +11,7 @@ import { GenericDetailPage, TabPage } from '@/layout/components'
 import AssetPermissionDetail from './AssetPermissionDetail'
 import AssetPermissionUser from './AssetPermissionUser'
 import AssetPermissionAsset from './AssetPermissionAsset'
+import AssetPermissionAccount from './AssetPermissionAccount'
 
 export default {
   components: {
@@ -18,6 +19,7 @@ export default {
     AssetPermissionDetail,
     AssetPermissionUser,
     AssetPermissionAsset,
+    AssetPermissionAccount,
     TabPage
   },
   data() {
@@ -42,6 +44,11 @@ export default {
             title: this.$t('perms.assetAndNode'),
             name: 'AssetPermissionAsset',
             hidden: () => !this.$hasPerm('assets.view_asset') || !this.$hasPerm('perms.change_assetpermission')
+          },
+          {
+            title: this.$t('perms.permAccount'),
+            name: 'AssetPermissionAccount',
+            hidden: () => !this.$hasPerm('assets.view_account') || !this.$hasPerm('perms.change_assetpermission')
           }
         ]
       }

From 7b0e41d478ada6009ec2128103f37e9080e208a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Tue, 1 Nov 2022 20:19:59 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B5=84=E4=BA=A7?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E4=B8=8D=E8=83=BD=E6=9B=B4=E6=96=B0=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AccountCreateUpdateForm/index.vue         | 48 ++++++++-----------
 1 file changed, 19 insertions(+), 29 deletions(-)

diff --git a/src/components/AccountCreateUpdateForm/index.vue b/src/components/AccountCreateUpdateForm/index.vue
index 366606683..e5b3dfe88 100644
--- a/src/components/AccountCreateUpdateForm/index.vue
+++ b/src/components/AccountCreateUpdateForm/index.vue
@@ -1,15 +1,18 @@
 <template>
-  <GenericCreateUpdateForm v-if="!loading" v-bind="$data" @afterRemoteMeta="afterGetRemoteMeta" />
+  <AutoDataForm
+    v-bind="$data"
+    @submit="confirm"
+    @afterRemoteMeta="afterGetRemoteMeta"
+  />
 </template>
 
 <script>
-import { GenericCreateUpdateForm } from '@/layout/components'
+import AutoDataForm from '@/components/AutoDataForm'
 import { UpdateToken } from '@/components/FormFields'
-
 export default {
   name: 'AccountCreateForm',
   components: {
-    GenericCreateUpdateForm
+    AutoDataForm
   },
   props: {
     platform: {
@@ -22,17 +25,17 @@ export default {
     }
   },
   data() {
-    const url = '/api/v1/assets/accounts/'
     return {
-      url,
       loading: true,
-      initial: {},
-      getUrl: () => url,
+      usernameChanged: false,
+      url: '/api/v1/assets/accounts/',
+      form: this.account || {},
       fields: [
         [this.$t('common.Basic'), ['name', 'username', 'privileged']],
         [this.$t('assets.Secret'), ['secret_type', 'secret', 'ssh_key', 'token', 'api_key', 'passphrase']],
         [this.$t('common.Other'), ['push_now', 'comment']]
       ],
+      defaultPrivilegedAccounts: ['root', 'administrator'],
       fieldsMeta: {
         name: {
           on: {
@@ -100,25 +103,7 @@ export default {
           }
         }
       },
-      hasReset: true,
-      hasSaveContinue: false,
-      cleanFormValue(values) {
-        const secretType = values.secret_type || ''
-        if (secretType !== 'password') {
-          values.secret = values[secretType]
-          delete values[secretType]
-        }
-
-        return values
-      },
-      onSubmit: this.confirm
-    }
-  },
-  async created() {
-    try {
-      this.initial = await this.account
-    } finally {
-      this.loading = false
+      hasSaveContinue: false
     }
   },
   methods: {
@@ -128,14 +113,19 @@ export default {
       this.platform.protocols?.forEach(p => {
         secretTypes.push(...p['secret_types'])
       })
-      if (!this.initial.secret_type) {
-        this.initial.secret_type = secretTypes[0]
+      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) {
+      const secretType = form.secret_type || ''
+      if (secretType !== 'password') {
+        form.secret = form[secretType]
+        delete form[secretType]
+      }
       if (this.account?.name) {
         this.$emit('edit', form)
       } else {