From fa77a95d93c67d82f22db4b59247c61328f3b1f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Mon, 5 Dec 2022 19:20:43 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E9=80=89=E6=8B=A9=E8=B5=84=E4=BA=A7?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=BC=B9=E7=AA=97=E6=98=BE=E7=A4=BA=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AssetSelect/index.vue          | 43 +++++++++++++++++--
 .../TableFormatters/DialogDetailFormatter.vue |  6 ++-
 src/i18n/langs/en.json                        |  1 +
 src/i18n/langs/ja.json                        |  1 +
 src/i18n/langs/zh.json                        |  1 +
 src/views/myassets/index.vue                  |  4 +-
 6 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/src/components/AssetSelect/index.vue b/src/components/AssetSelect/index.vue
index 3b890f96f..ca7d4b738 100644
--- a/src/components/AssetSelect/index.vue
+++ b/src/components/AssetSelect/index.vue
@@ -31,7 +31,7 @@
 
 <script>
 import TreeTable from '@/components/TreeTable'
-import { DetailFormatter } from '@/components/TableFormatters'
+import { DialogDetailFormatter } from '@/components/TableFormatters'
 import Select2 from '@/components/FormFields/Select2'
 import Dialog from '@/components/Dialog'
 
@@ -109,9 +109,45 @@ export default {
             label: this.$t('assets.Name'),
             sortable: true,
             showOverflowTooltip: true,
-            formatter: DetailFormatter,
+            formatter: DialogDetailFormatter,
             formatterArgs: {
-              route: 'AssetDetail'
+              getDialogTitle: function({ col, row }) { this.$t('assets.AssetDetail') }.bind(this),
+              getDetailItems: function({ col, row }) {
+                return [
+                  {
+                    key: this.$t('assets.Name'),
+                    value: row.name
+                  },
+                  {
+                    key: this.$t('assets.AssetAddress'),
+                    value: row.address
+                  },
+                  {
+                    key: this.$t('assets.Protocols'),
+                    value: row.protocols.map(item => item.name).join(', ')
+                  },
+                  {
+                    key: this.$t('assets.Category'),
+                    value: row.category.label
+                  },
+                  {
+                    key: this.$t('assets.Type'),
+                    value: row.type.label
+                  },
+                  {
+                    key: this.$t('assets.Platform'),
+                    value: row.platform?.name || ''
+                  },
+                  {
+                    key: this.$t('common.Active'),
+                    value: row.is_active
+                  },
+                  {
+                    key: this.$t('assets.Comment'),
+                    value: row.comment
+                  }
+                ]
+              }.bind(this)
             }
           },
           {
@@ -233,5 +269,4 @@ export default {
 .page ::v-deep .treebox {
   height: inherit !important;
 }
-
 </style>
diff --git a/src/components/TableFormatters/DialogDetailFormatter.vue b/src/components/TableFormatters/DialogDetailFormatter.vue
index 099fb2428..db21fc746 100644
--- a/src/components/TableFormatters/DialogDetailFormatter.vue
+++ b/src/components/TableFormatters/DialogDetailFormatter.vue
@@ -68,7 +68,9 @@ export default {
 
 <style lang="scss" scoped>
 .card >>> .el-card__body {
-  padding: 0
+  padding: 0;
+}
+.el-card {
+  border: 0!important;
 }
-
 </style>
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 0f0b891f3..2edd8cafb 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -103,6 +103,7 @@
     "NoSQLProtocol": "NoSQL Protocol"
   },
   "assets": {
+    "AssetAddress": "IP/Host",
     "sshkeyAccount": "ssh key account",
     "passwordAccount": "Password account",
     "SelectTemplate": "Select template",
diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json
index 531d2faa1..5524d0856 100644
--- a/src/i18n/langs/ja.json
+++ b/src/i18n/langs/ja.json
@@ -108,6 +108,7 @@
     "NoSQLProtocol": "非リレーショナルデータベース"
   },
   "assets": {
+    "AssetAddress": "IP/ホスト名",
     "sshkeyAccount": "SSHキー",
     "passwordAccount": "パスワード",
     "SelectTemplate": "テンプレートの選択",
diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json
index 67643b6be..47970d7c1 100644
--- a/src/i18n/langs/zh.json
+++ b/src/i18n/langs/zh.json
@@ -107,6 +107,7 @@
     "NoSQLProtocol": "非关系数据库"
   },
   "assets": {
+    "AssetAddress": "IP/主机名",
     "sshkeyAccount": "密钥账号",
     "passwordAccount": "密码账号",
     "Category": "类别",
diff --git a/src/views/myassets/index.vue b/src/views/myassets/index.vue
index e1c104b8f..18054fc19 100644
--- a/src/views/myassets/index.vue
+++ b/src/views/myassets/index.vue
@@ -59,7 +59,7 @@ export default {
                     value: row.name
                   },
                   {
-                    key: this.$t('assets.Address'),
+                    key: this.$t('assets.AssetAddress'),
                     value: row.address
                   },
                   {
@@ -76,7 +76,7 @@ export default {
                   },
                   {
                     key: this.$t('assets.Platform'),
-                    value: row.platform
+                    value: row.platform?.name || ''
                   },
                   {
                     key: this.$t('common.Active'),