From e4d4bc84b64a4045e97213a9b29599e2273caf20 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 18 Jul 2023 10:24:03 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=20=E8=B5=84=E4=BA=A7?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=9A=84=20card=20=E5=92=8C=20=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E6=A8=A1=E7=89=88=E5=AF=86=E6=96=87=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DetailCard/auto.vue            |  2 +-
 src/components/FormFields/Secret.vue          |  5 ++++
 src/i18n/langs/zh.json                        | 29 ++++++++++---------
 src/router/console/assets.js                  | 18 ++++++------
 src/views/accounts/AccountTemplate/const.js   |  8 +++++
 src/views/assets/Asset/AssetDetail/Detail.vue |  4 +--
 6 files changed, 40 insertions(+), 26 deletions(-)
 create mode 100644 src/components/FormFields/Secret.vue

diff --git a/src/components/DetailCard/auto.vue b/src/components/DetailCard/auto.vue
index e7336dd24..ce27b673d 100644
--- a/src/components/DetailCard/auto.vue
+++ b/src/components/DetailCard/auto.vue
@@ -1,5 +1,5 @@
 <template>
-  <DetailCard v-if="!loading && hasObject" :items="items" v-bind="$attrs" />
+  <DetailCard v-if="!loading && hasObject && items.length > 0" :items="items" v-bind="$attrs" />
 </template>
 
 <script>
diff --git a/src/components/FormFields/Secret.vue b/src/components/FormFields/Secret.vue
new file mode 100644
index 000000000..45a5df6bf
--- /dev/null
+++ b/src/components/FormFields/Secret.vue
@@ -0,0 +1,5 @@
+<template>
+  <div>
+    Todo: 抽象 Secret
+  </div>
+</template>
diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json
index dc15ba6a6..9c34891da 100644
--- a/src/i18n/langs/zh.json
+++ b/src/i18n/langs/zh.json
@@ -267,20 +267,7 @@
     "UpdateAccount": "更新账号",
     "Account": "账号",
     "Defaults": "默认值",
-    "GPTCreate": "创建资产-GPT",
-    "GPTUpdate": "更新资产-GPT",
-    "DatabaseCreate": "创建资产-数据库",
-    "DatabaseUpdate": "更新资产-数据库",
-    "HostCreate": "创建资产-主机",
-    "HostUpdate": "更新资产-主机",
-    "DeviceCreate": "创建资产-网络设备",
-    "DeviceUpdate": "更新资产-网络设备",
-    "CloudCreate": "创建资产-云平台",
-    "CloudUpdate": "更新资产-云平台",
-    "WebCreate": "创建资产-Web",
-    "WebUpdate": "更新资产-Web",
-    "CustomCreate": "创建资产-自定义",
-    "CustomUpdate": "更新资产-自定义",
+
     "Privileged": "特权账号",
     "SelectPlatforms": "选择平台",
     "AppList": "应用列表",
@@ -1173,6 +1160,20 @@
   "route": {
     "": "",
     "Acls": "访问控制",
+    "GPTCreate": "创建资产-GPT",
+    "GPTUpdate": "更新资产-GPT",
+    "DatabaseCreate": "创建资产-数据库",
+    "DatabaseUpdate": "更新资产-数据库",
+    "HostCreate": "创建资产-主机",
+    "HostUpdate": "更新资产-主机",
+    "DeviceCreate": "创建资产-网络设备",
+    "DeviceUpdate": "更新资产-网络设备",
+    "CloudCreate": "创建资产-云平台",
+    "CloudUpdate": "更新资产-云平台",
+    "WebCreate": "创建资产-Web",
+    "WebUpdate": "更新资产-Web",
+    "CustomCreate": "创建资产-自定义",
+    "CustomUpdate": "更新资产-自定义",
     "UserLoginAclCreate": "创建用户登录控制",
     "UserLoginAclList": "用户登录",
     "UserLoginAclDetail": "用户登录控制详情",
diff --git a/src/router/console/assets.js b/src/router/console/assets.js
index f3dec717e..3e59878f0 100644
--- a/src/router/console/assets.js
+++ b/src/router/console/assets.js
@@ -51,7 +51,7 @@ export default [
         name: 'HostCreate',
         component: () => import('@/views/assets/Asset/AssetCreateUpdate/HostCreateUpdate.vue'),
         hidden: true,
-        meta: { title: i18n.t('assets.HostCreate'), activeMenu: '/console/assets/assets' }
+        meta: { title: i18n.t('route.HostCreate'), activeMenu: '/console/assets/assets' }
       },
       {
         path: ':id/update',
@@ -78,7 +78,7 @@ export default [
         name: 'DatabaseCreate',
         component: () => import('@/views/assets/Asset/AssetCreateUpdate/DatabaseCreateUpdate.vue'),
         hidden: true,
-        meta: { title: i18n.t('assets.DatabaseCreate'), activeMenu: '/console/assets/assets' }
+        meta: { title: i18n.t('route.DatabaseCreate'), activeMenu: '/console/assets/assets' }
       },
       {
         path: ':id/update',
@@ -105,7 +105,7 @@ export default [
         name: 'DeviceCreate',
         component: () => import('@/views/assets/Asset/AssetCreateUpdate/DeviceCreateUpdate.vue'),
         hidden: true,
-        meta: { title: i18n.t('assets.DeviceCreate'), activeMenu: '/console/assets/assets' }
+        meta: { title: i18n.t('route.DeviceCreate'), activeMenu: '/console/assets/assets' }
       },
       {
         path: ':id/update',
@@ -132,14 +132,14 @@ export default [
         name: 'CloudCreate',
         component: () => import('@/views/assets/Asset/AssetCreateUpdate/CloudsPlatformCreateUpdate.vue'),
         hidden: true,
-        meta: { title: i18n.t('assets.CloudCreate'), activeMenu: '/console/assets/assets' }
+        meta: { title: i18n.t('route.CloudCreate'), activeMenu: '/console/assets/assets' }
       },
       {
         path: ':id/update',
         name: 'CloudUpdate',
         component: () => import('@/views/assets/Asset/AssetCreateUpdate/CloudsPlatformCreateUpdate.vue'),
         hidden: true,
-        meta: { title: i18n.t('assets.CloudUpdate'), activeMenu: '/console/assets/assets' }
+        meta: { title: i18n.t('route.CloudUpdate'), activeMenu: '/console/assets/assets' }
       }
     ]
   },
@@ -159,7 +159,7 @@ export default [
         name: 'WebCreate',
         component: () => import('@/views/assets/Asset/AssetCreateUpdate/WebCreateUpdate.vue'),
         hidden: true,
-        meta: { title: i18n.t('assets.WebCreate'), activeMenu: '/console/assets/assets' }
+        meta: { title: i18n.t('route.WebCreate'), activeMenu: '/console/assets/assets' }
       },
       {
         path: ':id/update',
@@ -185,13 +185,13 @@ export default [
         path: 'create',
         name: 'GptCreate',
         component: () => import('@/views/assets/Asset/AssetCreateUpdate/GPTCreateUpdate.vue'),
-        meta: { title: i18n.t('assets.GPTCreate'), activeMenu: '/console/assets/assets' }
+        meta: { title: i18n.t('route.GPTCreate'), activeMenu: '/console/assets/assets' }
       },
       {
         path: ':id/update',
         name: 'GptUpdate',
         component: () => import('@/views/assets/Asset/AssetCreateUpdate/GPTCreateUpdate.vue'),
-        meta: { title: i18n.t('assets.GPTUpdate'), activeMenu: '/console/assets/assets' }
+        meta: { title: i18n.t('route.GPTUpdate'), activeMenu: '/console/assets/assets' }
       }
     ]
   },
@@ -211,7 +211,7 @@ export default [
         name: 'CustomCreate',
         component: () => import('@/views/assets/Asset/AssetCreateUpdate/CustomCreateUpdate.vue'),
         hidden: true,
-        meta: { title: i18n.t('assets.CustomCreate'), activeMenu: '/console/assets/assets' }
+        meta: { title: i18n.t('route.CustomCreate'), activeMenu: '/console/assets/assets' }
       },
       {
         path: ':id/update',
diff --git a/src/views/accounts/AccountTemplate/const.js b/src/views/accounts/AccountTemplate/const.js
index 978e9f409..c42b3ee72 100644
--- a/src/views/accounts/AccountTemplate/const.js
+++ b/src/views/accounts/AccountTemplate/const.js
@@ -62,6 +62,14 @@ export const templateFieldsMeta = (vm) => {
         rows: 4
       },
       hidden: (formValue) => formValue.secret_type !== 'access_key'
+    },
+    api_key: {
+      label: vm.$t('assets.ApiKey'),
+      el: {
+        type: 'textarea',
+        rows: 4
+      },
+      hidden: (formValue) => formValue.secret_type !== 'api_key'
     }
   }
 }
diff --git a/src/views/assets/Asset/AssetDetail/Detail.vue b/src/views/assets/Asset/AssetDetail/Detail.vue
index 3c4e7fcfa..6c158aff3 100644
--- a/src/views/assets/Asset/AssetDetail/Detail.vue
+++ b/src/views/assets/Asset/AssetDetail/Detail.vue
@@ -224,7 +224,7 @@ export default {
         url: `/api/v1/assets/assets/${this.object.id}/`,
         object: this.object,
         nested: 'spec_info',
-        showUndefine: false,
+        showUndefine: true,
         excludes: ['script']
       },
       customInfoConfig: {
@@ -248,7 +248,7 @@ export default {
       const object = this.object
       const type = object.type.value
       const autofill = object.spec_info?.autofill
-      return !(type === 'website' && autofill === 'script')
+      return !(type === 'website' && autofill === 'script') && Object.keys(object.spec_info || {}).length > 0
     }
   },
   mounted() {