From 1c80faede42ab65c3cc9fcc594da8917f5f2f7e4 Mon Sep 17 00:00:00 2001
From: Aaron3S <chenyang@fit2cloud.com>
Date: Fri, 2 Dec 2022 17:18:28 +0800
Subject: [PATCH 01/19] =?UTF-8?q?perf:=20=E5=A2=9E=E5=8A=A0celery=E8=BE=93?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tasks/TaskDetail/TaskHistory.vue | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/views/tasks/TaskDetail/TaskHistory.vue b/src/views/tasks/TaskDetail/TaskHistory.vue
index 27e206191..926694bd9 100644
--- a/src/views/tasks/TaskDetail/TaskHistory.vue
+++ b/src/views/tasks/TaskDetail/TaskHistory.vue
@@ -4,6 +4,7 @@
 
 <script type="text/jsx">
 import ListTable from '@/components/ListTable'
+import { openTaskPage } from '@/utils/jms'
 
 export default {
   name: 'TaskHistory',
@@ -21,13 +22,9 @@ export default {
       tableConfig: {
         url: `/api/v1/ops/task-executions/?task_id=${this.object.id}`,
         columns: [
-          'date_start', 'date_finished', 'state', 'is_finished', 'actions'
+          'date_start', 'date_finished', 'is_success', 'is_finished', 'actions'
         ],
         columnsMeta: {
-          state: {
-            formatter: (row) => {
-            }
-          },
           actions: {
             prop: 'id',
             formatterArgs: {
@@ -38,10 +35,10 @@ export default {
               extraActions: [
                 {
                   name: 'detail',
-                  title: this.$t('ops.detail'),
+                  title: this.$t('ops.output'),
                   type: 'primary',
                   callback: function({ row, tableData }) {
-                    return this.$router.push({ name: 'HistoryExecutionDetail', params: { id: row.id }})
+                    openTaskPage(row.id)
                   }
                 }
               ]

From b12aaf003eda6b502cdf110d9bcfa2eded302414 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 11:11:02 +0800
Subject: [PATCH 02/19] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BD=91?=
 =?UTF-8?q?=E5=9F=9F=E5=88=97=E8=A1=A8=E8=B5=84=E4=BA=A7=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=E5=90=8E=E6=9B=B4=E6=96=B0=E6=97=B6=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=80=89=E4=B8=AD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AssetSelect/index.vue | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/components/AssetSelect/index.vue b/src/components/AssetSelect/index.vue
index 327042a67..4b3d149f4 100644
--- a/src/components/AssetSelect/index.vue
+++ b/src/components/AssetSelect/index.vue
@@ -55,8 +55,16 @@ export default {
     }
   },
   data() {
+    const iValue = []
+    for (const item of this.value) {
+      if (typeof item === 'object') {
+        iValue.push(item.id)
+      } else {
+        iValue.push(item)
+      }
+    }
     const select2Config = {
-      value: this.value,
+      value: iValue,
       multiple: true,
       clearable: true,
       ajax: {
@@ -69,7 +77,7 @@ export default {
     const vm = this
     return {
       dialogVisible: false,
-      initialValue: _.cloneDeep(this.value),
+      initialValue: _.cloneDeep(iValue),
       rowSelected: [],
       initSelection: null,
       treeSetting: {
@@ -126,7 +134,7 @@ export default {
           }
         },
         theRowDefaultIsSelected: (row) => {
-          return this.value.indexOf(row.id) > -1
+          return iValue.indexOf(row.id) > -1
         }
       },
       headerActions: {

From 5aec4f3f44ed61497aeccd000790071fddf32617 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 14:13:08 +0800
Subject: [PATCH 03/19] =?UTF-8?q?fix:=20=E9=80=89=E6=8B=A9=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E6=97=B6=E4=BC=9A=E6=A0=B9=E6=8D=AE=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=8A=B6=E6=80=81=E8=AE=BE=E7=BD=AEdisabled?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AssetSelect/index.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/components/AssetSelect/index.vue b/src/components/AssetSelect/index.vue
index 4b3d149f4..8df5a580c 100644
--- a/src/components/AssetSelect/index.vue
+++ b/src/components/AssetSelect/index.vue
@@ -94,8 +94,15 @@ export default {
       tableConfig: {
         url: '/api/v1/assets/assets/?fields_size=mini',
         hasTree: true,
+        hasSelection: false,
         canSelect: this.canSelect,
         columns: [
+          {
+            type: 'selection',
+            selectable(row) {
+              return row.automation_enabled_info.change_secret_enabled
+            }
+          },
           {
             prop: 'name',
             label: this.$t('assets.Name'),

From 1dfe004370b7caecb6871ad0dd482d4fe725b8d0 Mon Sep 17 00:00:00 2001
From: Aaron3S <chenyang@fit2cloud.com>
Date: Mon, 5 Dec 2022 15:11:28 +0800
Subject: [PATCH 04/19] =?UTF-8?q?feat:=20=E8=B5=84=E4=BA=A7=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9form=20=E5=8C=B9=E9=85=8D=E6=AD=A3=E7=A1=AE=E7=9A=84?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AssetSelect/index.vue | 54 +++++++++++++++-------------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/src/components/AssetSelect/index.vue b/src/components/AssetSelect/index.vue
index 8df5a580c..afac172e9 100644
--- a/src/components/AssetSelect/index.vue
+++ b/src/components/AssetSelect/index.vue
@@ -92,7 +92,7 @@ export default {
       select2Config: select2Config,
       dialogSelect2Config: select2Config,
       tableConfig: {
-        url: '/api/v1/assets/assets/?fields_size=mini',
+        url: '/api/v1/assets/assets/',
         hasTree: true,
         hasSelection: false,
         canSelect: this.canSelect,
@@ -114,19 +114,23 @@ export default {
             }
           },
           {
-            prop: 'ip',
+            prop: 'address',
             label: this.$t('assets.ipDomain'),
             sortable: 'custom'
           },
           {
             prop: 'platform',
             label: this.$t('assets.Platform'),
-            sortable: true
+            sortable: true,
+            formatter: function(row) {
+              return row.platform.name
+            }
           },
           {
             prop: 'protocols',
             formatter: function(row) {
-              return <span> {row.protocols?.toString()} </span>
+              const data = row.protocols.map(p => <el-tag size='mini'>{p.name}/{p.port} </el-tag>)
+              return <span> {data} </span>
             },
             label: this.$t('assets.Protocols')
           }
@@ -199,34 +203,34 @@ export default {
 </script>
 
 <style lang='scss' scoped>
-  .el-select {
-    width: 100%;
-  }
+.el-select {
+  width: 100%;
+}
 
-  .page ::v-deep .page-heading {
-    display: none;
-  }
+.page ::v-deep .page-heading {
+  display: none;
+}
 
-  .el-dialog__wrapper ::v-deep .el-dialog__body {
-    padding: 0;
+.el-dialog__wrapper ::v-deep .el-dialog__body {
+  padding: 0;
 
-    .tree-table {
-      .left {
-        padding: 5px;
-      }
+  .tree-table {
+    .left {
+      padding: 5px;
+    }
 
-      .mini {
-        padding-top: 8px;
-      }
+    .mini {
+      padding-top: 8px;
+    }
 
-      .transition-box {
-        padding: 5px;
-      }
+    .transition-box {
+      padding: 5px;
     }
   }
+}
 
-  .page ::v-deep .treebox {
-    height: inherit !important;
-  }
+.page ::v-deep .treebox {
+  height: inherit !important;
+}
 
 </style>

From 5e321e9a27a69371783c3fe4813280e5e33fe98d Mon Sep 17 00:00:00 2001
From: Aaron3S <chenyang@fit2cloud.com>
Date: Mon, 5 Dec 2022 15:28:36 +0800
Subject: [PATCH 05/19] =?UTF-8?q?feat:=20=E8=B5=84=E4=BA=A7=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9form=20=E5=8C=B9=E9=85=8D=E6=AD=A3=E7=A1=AE=E7=9A=84?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AssetSelect/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/AssetSelect/index.vue b/src/components/AssetSelect/index.vue
index afac172e9..6f8400afd 100644
--- a/src/components/AssetSelect/index.vue
+++ b/src/components/AssetSelect/index.vue
@@ -68,7 +68,7 @@ export default {
       multiple: true,
       clearable: true,
       ajax: {
-        url: '/api/v1/assets/assets/?fields_size=mini',
+        url: '/api/v1/assets/assets/',
         transformOption: (item) => {
           return { label: item.name + '(' + item.address + ')', value: item.id }
         }
@@ -84,7 +84,7 @@ export default {
         showMenu: false,
         showRefresh: true,
         showAssets: false,
-        url: '/api/v1/assets/assets/?fields_size=mini',
+        url: '/api/v1/assets/assets/',
         nodeUrl: '/api/v1/assets/nodes/',
         // ?assets=0不显示资产. =1显示资产
         treeUrl: '/api/v1/assets/nodes/children/tree/?assets=0'

From 208c7c0aa85efdb673e1ee13e77eba5c8b434f45 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 15:37:58 +0800
Subject: [PATCH 06/19] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E4=BB=AA?=
 =?UTF-8?q?=E8=A1=A8=E7=9B=98=E7=8E=AF=E5=BD=A2=E5=9B=BE=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/Audit/DataSummary.vue    | 31 ++++++++++++----
 src/views/dashboard/Audit/RightSummary.vue   |  6 +++-
 src/views/dashboard/Console/DataSummary.vue  | 17 +++++----
 src/views/dashboard/components/DataCard.vue  | 37 +++++++++++++-------
 src/views/dashboard/components/RingChart.vue |  2 +-
 5 files changed, 66 insertions(+), 27 deletions(-)

diff --git a/src/views/dashboard/Audit/DataSummary.vue b/src/views/dashboard/Audit/DataSummary.vue
index 1eb831891..c12980152 100644
--- a/src/views/dashboard/Audit/DataSummary.vue
+++ b/src/views/dashboard/Audit/DataSummary.vue
@@ -1,10 +1,24 @@
 <template>
   <el-row :gutter="16">
     <el-col :lg="12" :sm="12" class="margin-top-16">
-      <DataCard :config="logConfig" />
+      <DataCard :config="logConfig">
+        <div class="custom">
+          <span>{{ logConfig.total }}</span>
+          <span>
+            <svg-icon :icon-class="logConfig.icon" class="font" />
+          </span>
+        </div>
+      </DataCard>
     </el-col>
     <el-col :lg="12" :sm="12" class="margin-top-16">
-      <DataCard :config="assetConfig" />
+      <DataCard :config="assetConfig">
+        <div class="custom">
+          <span>{{ assetConfig.total }}</span>
+          <span>
+            <svg-icon :icon-class="assetConfig.icon" class="font" />
+          </span>
+        </div>
+      </DataCard>
     </el-col>
   </el-row>
 </template>
@@ -62,17 +76,22 @@ export default {
           &total_count_commands=1
           &total_count_commands_danger=1
         `)
+      const logActive = data.total_count_user_login_success_logs === 0 ? 0 : ((data.total_count_user_login_success_logs / data.total_count_user_login_logs) * 100).toFixed(0)
+      const logTotal = logActive === 100 ? 0 : 100 - logActive
       const logs = [
-        { name: this.$t('dashboard.ActiveUser'), value: data.total_count_user_login_logs },
-        { name: this.$t('dashboard.InActiveUser'), value: data.total_count_user_login_success_logs }
+        { name: this.$t('dashboard.ActiveUser'), value: logActive },
+        { name: this.$t('dashboard.InActiveUser'), value: logTotal }
       ]
       this.$set(this.logConfig, 'data', logs)
       this.$set(this.logConfig, 'total', data.total_count_user_login_logs)
       this.$set(this.logConfig, 'active', data.total_count_user_login_success_logs)
       this.$set(this.logConfig, 'weekAdd', data.total_count_user_login_success_logs)
+
+      const assetActive = data.total_count_commands_danger === 0 ? 0 : ((data.total_count_commands_danger / data.total_count_commands) * 100).toFixed(0)
+      const assetTotal = assetActive === 100 ? 0 : 100 - assetActive
       const assets = [
-        { name: this.$t('dashboard.ActiveAsset'), value: data.total_count_commands },
-        { name: this.$t('dashboard.InActiveAsset'), value: data.total_count_commands_danger }
+        { name: this.$t('dashboard.ActiveAsset'), value: assetActive },
+        { name: this.$t('dashboard.InActiveAsset'), value: assetTotal }
       ]
       this.$set(this.assetConfig, 'data', assets)
       this.$set(this.assetConfig, 'total', data.total_count_commands)
diff --git a/src/views/dashboard/Audit/RightSummary.vue b/src/views/dashboard/Audit/RightSummary.vue
index ae9a9d28c..ca6037f81 100644
--- a/src/views/dashboard/Audit/RightSummary.vue
+++ b/src/views/dashboard/Audit/RightSummary.vue
@@ -6,7 +6,7 @@
       </div>
       <LineChart v-bind="chartConfig" />
     </div>
-    <SummaryCountCard :config="config" :items="summaryItems" class="margin-top-16" />
+    <SummaryCountCard :config="chartTitleConfig" :items="summaryItems" class="margin-top-16" />
   </div>
 </template>
 
@@ -33,6 +33,10 @@ export default {
         title: this.$t('dashboard.SessionTrend'),
         tip: this.$t('dashboard.SessionTrend')
       },
+      chartTitleConfig: {
+        title: this.$t('route.BatchCommand'),
+        tip: this.$t('route.BatchCommand')
+      },
       chartConfig: {
         datesMetrics: [],
         secondaryName: this.$t('dashboard.IndexName'),
diff --git a/src/views/dashboard/Console/DataSummary.vue b/src/views/dashboard/Console/DataSummary.vue
index e48f3e303..2a0a065a0 100644
--- a/src/views/dashboard/Console/DataSummary.vue
+++ b/src/views/dashboard/Console/DataSummary.vue
@@ -51,22 +51,27 @@ export default {
     async init() {
       const data = await this.$axios.get(`/api/v1/index/?total_count_users=1
           &total_count_users_this_week=1
-          &total_count_today_login_users=1
+          &total_count_login_users=1
           &total_count_assets=1
           &total_count_assets_this_week=1
           &total_count_today_active_assets=1
         `)
+      const userActive = data.total_count_login_users === 0 ? 0 : ((data.total_count_login_users / data.total_count_users) * 100).toFixed(0)
+      const userTotal = userActive === 100 ? 0 : 100 - userActive
       const users = [
-        { name: this.$t('dashboard.ActiveUser'), value: data.total_count_users },
-        { name: this.$t('dashboard.InActiveUser'), value: data.total_count_today_login_users }
+        { name: this.$t('dashboard.ActiveUser'), value: userActive },
+        { name: this.$t('dashboard.InActiveUser'), value: userTotal }
       ]
       this.$set(this.userConfig, 'data', users)
       this.$set(this.userConfig, 'total', data.total_count_users)
-      this.$set(this.userConfig, 'active', data.total_count_today_login_users)
+      this.$set(this.userConfig, 'active', data.total_count_login_users)
       this.$set(this.userConfig, 'weekAdd', data.total_count_users_this_week)
+
+      const assetActive = data.total_count_today_active_assets === 0 ? 0 : ((data.total_count_today_active_assets / data.total_count_assets) * 100).toFixed(0)
+      const assetTotal = assetActive === 100 ? 0 : 100 - assetActive
       const assets = [
-        { name: this.$t('dashboard.ActiveAsset'), value: data.total_count_assets },
-        { name: this.$t('dashboard.InActiveAsset'), value: data.total_count_today_active_assets }
+        { name: this.$t('dashboard.ActiveAsset'), value: assetActive },
+        { name: this.$t('dashboard.InActiveAsset'), value: assetTotal }
       ]
       this.$set(this.assetConfig, 'data', assets)
       this.$set(this.assetConfig, 'total', data.total_count_assets)
diff --git a/src/views/dashboard/components/DataCard.vue b/src/views/dashboard/components/DataCard.vue
index c6d015b58..648daa42c 100644
--- a/src/views/dashboard/components/DataCard.vue
+++ b/src/views/dashboard/components/DataCard.vue
@@ -1,20 +1,22 @@
 <template>
   <div class="card">
-    <div>
+    <div class="card-content">
       <div class="title">
         <Title :config="config" />
       </div>
       <div class="sub">{{ config.subTitle }}</div>
-      <div class="num">{{ config.total }}</div>
-      <div class="add">
-        <span class="add-num">
-          {{ $tc('dashboard.WeekAdd') }}：{{ config.weekAdd }}
-          <svg-icon v-if="config.subIcon" :icon-class="config.subIcon" class="font" />
-        </span>
-        <span class="add-icon">
-          <svg-icon v-if="config.icon" :icon-class="config.icon" class="font" />
-        </span>
-      </div>
+      <slot class="custom">
+        <div class="num">{{ config.total }}</div>
+        <div class="add">
+          <span class="add-num">
+            {{ $tc('dashboard.WeekAdd') }}：{{ config.weekAdd }}
+            <svg-icon v-if="config.subIcon" :icon-class="config.subIcon" class="font" />
+          </span>
+          <span class="add-icon">
+            <svg-icon v-if="config.icon" :icon-class="config.icon" class="font" />
+          </span>
+        </div>
+      </slot>
     </div>
     <div class="ring">
       <RingChart :config="config" />
@@ -48,6 +50,10 @@ export default {
   width: 100%;
   padding: 20px;
   background-color: #FFF;
+  .card-content {
+    padding-bottom: 16px;
+    border-bottom: 1px solid #EFF0F1;
+  }
   .title {
     margin-bottom: 12px;
   }
@@ -67,8 +73,13 @@ export default {
   .add {
     display: flex;
     justify-content: space-between;
-    padding-bottom: 16px;
-    border-bottom: 1px solid #EFF0F1;
+  }
+  .custom {
+    display: flex;
+    justify-content: space-between;
+    font-weight: 500;
+    font-size: 32px;
+    padding-bottom: 18px;
   }
   .ring {
     padding: 26px 0 10px;
diff --git a/src/views/dashboard/components/RingChart.vue b/src/views/dashboard/components/RingChart.vue
index 61cc3c0e6..a10b2dbbb 100644
--- a/src/views/dashboard/components/RingChart.vue
+++ b/src/views/dashboard/components/RingChart.vue
@@ -64,7 +64,7 @@ export default {
         color: [color, 'rgba(43, 147, 124, 0.05)'],
         tooltip: {
           trigger: 'item',
-          formatter: '{a} <br/>{b}: {c} ({d}%)'
+          formatter: '{a} <br/>{b}: {d}%'
         },
         series: [
           {

From 2ec9c02d0ccec65a5ad295d4369ff5a41b93d685 Mon Sep 17 00:00:00 2001
From: Aaron3S <chenyang@fit2cloud.com>
Date: Mon, 5 Dec 2022 15:59:01 +0800
Subject: [PATCH 07/19] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E9=80=89=E6=8B=A9=E7=BB=84=E4=BB=B6=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=88=91=E7=9A=84=E8=B5=84=E4=BA=A7=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AssetSelect/index.vue  | 18 +++++++++++++-----
 src/views/ops/Job/JobUpdateCreate.vue |  2 ++
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/components/AssetSelect/index.vue b/src/components/AssetSelect/index.vue
index 6f8400afd..3bcc3f015 100644
--- a/src/components/AssetSelect/index.vue
+++ b/src/components/AssetSelect/index.vue
@@ -39,6 +39,14 @@ export default {
   componentName: 'AssetSelect',
   components: { TreeTable, Select2, Dialog },
   props: {
+    baseUrl: {
+      type: String,
+      default: '/api/v1/assets/assets/'
+    },
+    baseNodeUrl: {
+      type: String,
+      default: '/api/v1/assets/nodes/'
+    },
     value: {
       type: Array,
       default: () => []
@@ -68,7 +76,7 @@ export default {
       multiple: true,
       clearable: true,
       ajax: {
-        url: '/api/v1/assets/assets/',
+        url: this.baseUrl,
         transformOption: (item) => {
           return { label: item.name + '(' + item.address + ')', value: item.id }
         }
@@ -84,15 +92,15 @@ export default {
         showMenu: false,
         showRefresh: true,
         showAssets: false,
-        url: '/api/v1/assets/assets/',
-        nodeUrl: '/api/v1/assets/nodes/',
+        url: this.baseUrl,
+        nodeUrl: this.baseNodeUrl,
         // ?assets=0不显示资产. =1显示资产
-        treeUrl: '/api/v1/assets/nodes/children/tree/?assets=0'
+        treeUrl: `${this.baseNodeUrl}/children/tree/?assets=0`
       },
       select2Config: select2Config,
       dialogSelect2Config: select2Config,
       tableConfig: {
-        url: '/api/v1/assets/assets/',
+        url: this.baseUrl,
         hasTree: true,
         hasSelection: false,
         canSelect: this.canSelect,
diff --git a/src/views/ops/Job/JobUpdateCreate.vue b/src/views/ops/Job/JobUpdateCreate.vue
index 005702d32..c76bd2954 100644
--- a/src/views/ops/Job/JobUpdateCreate.vue
+++ b/src/views/ops/Job/JobUpdateCreate.vue
@@ -86,6 +86,8 @@ export default {
             required: false
           }],
           el: {
+            baseUrl: '/api/v1/perms/users/self/assets/',
+            baseNodeUrl: '/api/v1/perms/users/self/nodes/',
             value: []
           }
         },

From 94955cb0d89f3e2c404172214a24b86246e5588a 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 16:25:36 +0800
Subject: [PATCH 08/19] =?UTF-8?q?fix:=20=E6=94=B9=E5=AF=86=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E9=80=89=E6=8B=A9=E8=B5=84=E4=BA=A7=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0disabled=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AssetSelect/index.vue                | 7 -------
 src/views/accounts/ChangeSecreAtutomation/fields.js | 5 +++++
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/components/AssetSelect/index.vue b/src/components/AssetSelect/index.vue
index 3bcc3f015..3b890f96f 100644
--- a/src/components/AssetSelect/index.vue
+++ b/src/components/AssetSelect/index.vue
@@ -102,15 +102,8 @@ export default {
       tableConfig: {
         url: this.baseUrl,
         hasTree: true,
-        hasSelection: false,
         canSelect: this.canSelect,
         columns: [
-          {
-            type: 'selection',
-            selectable(row) {
-              return row.automation_enabled_info.change_secret_enabled
-            }
-          },
           {
             prop: 'name',
             label: this.$t('assets.Name'),
diff --git a/src/views/accounts/ChangeSecreAtutomation/fields.js b/src/views/accounts/ChangeSecreAtutomation/fields.js
index 76d4a2ccc..31e10dce1 100644
--- a/src/views/accounts/ChangeSecreAtutomation/fields.js
+++ b/src/views/accounts/ChangeSecreAtutomation/fields.js
@@ -52,6 +52,11 @@ export const getFields = () => {
       rules: [
         { required: false }
       ],
+      el: {
+        canSelect: (row) => {
+          return row.automation_enabled_info.change_secret_enabled
+        }
+      },
       label: i18n.t('xpack.Asset')
     },
     passphrase: {

From 7312a899e1cc9eb2a57abf74fa961628ff1ec3c7 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 16:50:54 +0800
Subject: [PATCH 09/19] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E8=B4=A6=E5=8F=B7=E7=82=B9=E5=87=BB=E8=B5=84=E4=BA=A7?=
 =?UTF-8?q?=E6=A0=91=E6=8E=A5=E5=8F=A3500=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/accounts/AssetAccount/AssetAccountList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/accounts/AssetAccount/AssetAccountList.vue b/src/views/accounts/AssetAccount/AssetAccountList.vue
index a456b156f..239bd9ac5 100644
--- a/src/views/accounts/AssetAccount/AssetAccountList.vue
+++ b/src/views/accounts/AssetAccount/AssetAccountList.vue
@@ -45,7 +45,7 @@ export default {
         url = setUrlParam(url, 'asset', '')
         url = setUrlParam(url, 'node', nodeId)
       } else if (treeNode.meta.type === 'asset') {
-        const assetId = treeNode.meta.data.id
+        const assetId = treeNode.meta.data?.id || treeNode?.id
         url = setUrlParam(url, 'node', '')
         url = setUrlParam(url, 'asset', assetId)
       }

From 7f0924fb52a173732677f0a29d3f67e29f650a7f 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 17:23:12 +0800
Subject: [PATCH 10/19] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E7=BD=91?=
 =?UTF-8?q?=E5=9F=9F=E9=80=89=E6=8B=A9=E8=B5=84=E4=BA=A7=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0disabled=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/accounts/ChangeSecreAtutomation/fields.js | 2 +-
 src/views/assets/Domain/DomainCreateUpdate.vue      | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/accounts/ChangeSecreAtutomation/fields.js b/src/views/accounts/ChangeSecreAtutomation/fields.js
index 31e10dce1..1a79ad646 100644
--- a/src/views/accounts/ChangeSecreAtutomation/fields.js
+++ b/src/views/accounts/ChangeSecreAtutomation/fields.js
@@ -54,7 +54,7 @@ export const getFields = () => {
       ],
       el: {
         canSelect: (row) => {
-          return row.automation_enabled_info.change_secret_enabled
+          return row.enabled_info.change_secret_enabled
         }
       },
       label: i18n.t('xpack.Asset')
diff --git a/src/views/assets/Domain/DomainCreateUpdate.vue b/src/views/assets/Domain/DomainCreateUpdate.vue
index 3a460763b..4a3fac94e 100644
--- a/src/views/assets/Domain/DomainCreateUpdate.vue
+++ b/src/views/assets/Domain/DomainCreateUpdate.vue
@@ -23,7 +23,10 @@ export default {
           component: AssetSelect,
           label: this.$t('assets.Assets'),
           el: {
-            value: []
+            value: [],
+            canSelect: (row) => {
+              return row.enabled_info.domain_enabled
+            }
           }
         }
       },

From 47ef7120f70efc2d1dc8d57996da4685405d8ebb Mon Sep 17 00:00:00 2001
From: Aaron3S <chenyang@fit2cloud.com>
Date: Mon, 5 Dec 2022 17:36:26 +0800
Subject: [PATCH 11/19] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/zh.json                | 1 +
 src/views/ops/Job/AdhocOpenDialog.vue | 5 +++--
 src/views/ops/Job/JobCodeEditor.vue   | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json
index b5bf49e3f..ca2b78193 100644
--- a/src/i18n/langs/zh.json
+++ b/src/i18n/langs/zh.json
@@ -683,6 +683,7 @@
     "Weekly": "按周"
   },
   "ops": {
+    "CommandNotBeNone": "命令内容不能为空",
     "OpenCommand": "打开命令",
     "SaveCommand": "保存命令 ",
     "Log": "日志",
diff --git a/src/views/ops/Job/AdhocOpenDialog.vue b/src/views/ops/Job/AdhocOpenDialog.vue
index 1a647d183..320cc1911 100644
--- a/src/views/ops/Job/AdhocOpenDialog.vue
+++ b/src/views/ops/Job/AdhocOpenDialog.vue
@@ -31,8 +31,9 @@ export default {
         visible: false,
         width: '60%',
         tableConfig: {
+          hasSelection: false,
           url: `/api/v1/ops/adhocs/`,
-          columns: ['name', 'module', 'args', 'actions'],
+          columns: ['name', 'module', 'args', 'comment', 'actions'],
           columnsMeta: {
             actions: {
               formatter: ActionsFormatter,
@@ -42,7 +43,7 @@ export default {
                 hasDelete: false,
                 extraActions: [
                   {
-                    title: '选择',
+                    title: this.$tc('common.Select'),
                     name: 'select',
                     can: true,
                     callback: ({ row }) => {
diff --git a/src/views/ops/Job/JobCodeEditor.vue b/src/views/ops/Job/JobCodeEditor.vue
index 9e2f76dce..320aafd64 100644
--- a/src/views/ops/Job/JobCodeEditor.vue
+++ b/src/views/ops/Job/JobCodeEditor.vue
@@ -65,6 +65,10 @@ export default {
       this.showOpenAdhocDialog = true
     },
     openAdhocSaveDialog() {
+      if (!this.iValue.length > 0) {
+        this.$message.error(this.$tc('ops.CommandNotBeNone'))
+        return
+      }
       this.showOpenAdhocSaveDialog = true
     },
     onSelectAdhoc(adhoc) {

From bef1e8f49a8522b376818445d8dd9c9de63e6b5c Mon Sep 17 00:00:00 2001
From: Bai <baijiangjie@gmail.com>
Date: Mon, 5 Dec 2022 17:44:52 +0800
Subject: [PATCH 12/19] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=20Domain=20?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/assets/Domain/DomainList.vue | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/views/assets/Domain/DomainList.vue b/src/views/assets/Domain/DomainList.vue
index ec50f97c2..c11da18ea 100644
--- a/src/views/assets/Domain/DomainList.vue
+++ b/src/views/assets/Domain/DomainList.vue
@@ -4,7 +4,6 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter } from '@/components/TableFormatters'
 
 export default {
   components: {
@@ -15,28 +14,26 @@ export default {
       tableConfig: {
         url: '/api/v1/assets/domains/',
         columns: [
-          'name', 'asset_count', 'application_count', 'gateway_count', 'date_created',
-          'comment', 'org_name', 'actions'
+          'name', 'asset_count', 'gateway_count', 'comment',
+          'date_created', 'org_name', 'actions'
         ],
         columnsShow: {
           min: ['name', 'actions'],
-          default: ['name', 'asset_count', 'application_count', 'gateway_count', 'comment', 'actions']
+          default: ['name', 'asset_count', 'gateway_count', 'comment', 'actions']
         },
         columnsMeta: {
           asset_count: {
-            label: this.$t('assets.Assets')
-          },
-          application_count: {
-            label: this.$t('assets.Applications')
+            prop: 'assets',
+            label: this.$t('assets.Assets'),
+            formatter: function(row) {
+              return <span> { row.assets.length } </span>
+            }
           },
           gateway_count: {
+            prop: 'gateways',
             label: this.$t('assets.Gateway'),
-            formatter: DetailFormatter,
-            formatterArgs: {
-              permissions: 'assets.view_gateway',
-              routeQuery: {
-                activeTab: 'GatewayList'
-              }
+            formatter: function(row) {
+              return <span> { row.gateways.length } </span>
             }
           }
         }

From 9e3fbbad1018e8ff973f41bee454c20b3faddcae Mon Sep 17 00:00:00 2001
From: Bai <baijiangjie@gmail.com>
Date: Mon, 5 Dec 2022 18:51:46 +0800
Subject: [PATCH 13/19] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=E7=BD=91?=
 =?UTF-8?q?=E5=9F=9F=E5=88=97=E8=A1=A8=E7=BD=91=E5=85=B3=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC?=
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 +
 src/views/assets/Domain/DomainDetail/index.vue |  2 +-
 src/views/assets/Domain/DomainList.vue         | 12 ++++++++++--
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 82a53d5a9..0f0b891f3 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -179,6 +179,7 @@
     "DomainHelpMessage": "The domain function is added to address the fact that some environments (such as the hybrid cloud) cannot be connected directly by jumping on the gateway server.\nJMS => Domain gateway => Target assets",
     "FullName": "Full name",
     "Gateway": "Gateway",
+    "GatewayList": "Gateway",
     "GatewayProtocolHelpText": "SSH protocol gateway, support proxy SSH, RDP, VNC",
     "Hostname": "Hostname",
     "IP": "IP",
diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json
index 9ad30fcd8..531d2faa1 100644
--- a/src/i18n/langs/ja.json
+++ b/src/i18n/langs/ja.json
@@ -181,6 +181,7 @@
     "DomainHelpMessage": "ドメイン機能は、一部の環境 (ハイブリッドクラウドなど) が直接接続できないことを解決するために追加された機能で、ゲートウェイサーバを介してジャンプ登録を行うのが原理です。JMS => ドメインゲートウェイ => ターゲット資産",
     "FullName": "フルネーム",
     "Gateway": "ゲートウェイ",
+    "GatewayList": "ゲートウェイの一覧",
     "GatewayProtocolHelpText": "SSHゲートウェイ、プロキシSSH、RDP、VNCをサポート",
     "Hostname": "ホスト名",
     "IP": "IP",
diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json
index ca2b78193..67643b6be 100644
--- a/src/i18n/langs/zh.json
+++ b/src/i18n/langs/zh.json
@@ -189,6 +189,7 @@
     "DomainHelpMessage": "网域功能是为了解决部分环境（如：混合云）无法直接连接而新增的功能，原理是通过网关服务器进行跳转登录。JMS => 网域网关 => 目标资产",
     "FullName": "全称",
     "Gateway": "网关",
+    "GatewayList": "网关列表",
     "GatewayProtocolHelpText": "SSH网关，支持代理SSH,RDP和VNC",
     "Hostname": "主机名",
     "IP": "IP",
diff --git a/src/views/assets/Domain/DomainDetail/index.vue b/src/views/assets/Domain/DomainDetail/index.vue
index e25168b52..2a1d0ba78 100644
--- a/src/views/assets/Domain/DomainDetail/index.vue
+++ b/src/views/assets/Domain/DomainDetail/index.vue
@@ -28,7 +28,7 @@ export default {
             name: 'Detail'
           },
           {
-            title: this.$t('assets.Gateway'),
+            title: this.$t('assets.GatewayList'),
             name: 'GatewayList',
             hidden: () => !this.$hasPerm('assets.view_gateway')
           }
diff --git a/src/views/assets/Domain/DomainList.vue b/src/views/assets/Domain/DomainList.vue
index c11da18ea..fa84408ca 100644
--- a/src/views/assets/Domain/DomainList.vue
+++ b/src/views/assets/Domain/DomainList.vue
@@ -4,6 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
+import { DetailFormatter } from '@/components/TableFormatters'
 
 export default {
   components: {
@@ -32,8 +33,15 @@ export default {
           gateway_count: {
             prop: 'gateways',
             label: this.$t('assets.Gateway'),
-            formatter: function(row) {
-              return <span> { row.gateways.length } </span>
+            formatter: DetailFormatter,
+            formatterArgs: {
+              permissions: 'assets.view_gateway',
+              routeQuery: {
+                activeTab: 'GatewayList'
+              },
+              getTitle: function({ cellValue }) {
+                return cellValue.length
+              }
             }
           }
         }

From d66c6b59a20f54eb8ce303e71f01ebc07261cff0 Mon Sep 17 00:00:00 2001
From: Bai <baijiangjie@gmail.com>
Date: Mon, 5 Dec 2022 19:11:49 +0800
Subject: [PATCH 14/19] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=20GatewayList?=
 =?UTF-8?q?=20=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Domain/DomainDetail/GatewayList.vue       | 31 +------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/src/views/assets/Domain/DomainDetail/GatewayList.vue b/src/views/assets/Domain/DomainDetail/GatewayList.vue
index 3170f6b17..f22cd95c0 100644
--- a/src/views/assets/Domain/DomainDetail/GatewayList.vue
+++ b/src/views/assets/Domain/DomainDetail/GatewayList.vue
@@ -55,8 +55,7 @@ export default {
       tableConfig: {
         url: `/api/v1/assets/gateways/?domain=${this.$route.params.id}`,
         columns: [
-          'name', 'address', 'platform', 'password_account',
-          'ssh_key_account', 'connectivity', 'is_active', 'actions'
+          'name', 'address', 'platform', 'connectivity', 'is_active', 'actions'
         ],
         columnsMeta: {
           name: {
@@ -72,34 +71,6 @@ export default {
           address: {
             width: '140px'
           },
-          password_account: {
-            label: this.$t('assets.passwordAccount'),
-            formatter: function(row) {
-              const [accountInfo] = row.effective_accounts.filter(
-                item => item.secret_type === 'password'
-              )
-              if (!accountInfo) return <span>-</span>
-              const to = {
-                name: 'AssetAccountDetail',
-                params: { id: accountInfo.id }
-              }
-              return <router-link to={ to } >{ accountInfo.username }</router-link>
-            }
-          },
-          ssh_key_account: {
-            label: this.$t('assets.sshkeyAccount'),
-            formatter: function(row) {
-              const [accountInfo] = row.effective_accounts.filter(
-                item => item.secret_type === 'ssh_key'
-              )
-              if (!accountInfo) return <span>-</span>
-              const to = {
-                name: 'AssetAccountDetail',
-                params: { id: accountInfo.id }
-              }
-              return <router-link to={ to } >{ accountInfo.username }</router-link>
-            }
-          },
           actions: {
             formatterArgs: {
               updateRoute: 'GatewayUpdate',

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 15/19] =?UTF-8?q?perf:=20=E9=80=89=E6=8B=A9=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E7=BB=84=E4=BB=B6=E5=BC=B9=E7=AA=97=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E8=B5=84=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'),

From d6518019dd8f4b94c166bad825a18c83d9f773bb Mon Sep 17 00:00:00 2001
From: Bai <baijiangjie@gmail.com>
Date: Mon, 5 Dec 2022 19:31:00 +0800
Subject: [PATCH 16/19] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E8=AF=A6=E6=83=85=E8=B4=A6=E5=8F=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AccountListTable/index.vue | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/components/AccountListTable/index.vue b/src/components/AccountListTable/index.vue
index 119959943..15eec5cda 100644
--- a/src/components/AccountListTable/index.vue
+++ b/src/components/AccountListTable/index.vue
@@ -98,11 +98,24 @@ export default {
         columnsShow: {
           min: ['name', 'username', 'actions'],
           default: [
-            'name', 'hostname', 'ip', 'username',
-            'version', 'privileged', 'actions'
+            'name', 'username', 'version', 'privileged', 'actions', 'secret_type', 'actions'
           ]
         },
         columnsMeta: {
+          name: {
+            showOverflowTooltip: true,
+            formatter: function(row) {
+              const to = {
+                name: 'AssetAccountDetail',
+                params: { id: row.id }
+              }
+              if (vm.$hasPerm('assets.view_account')) {
+                return <router-link to={ to } >{ row.name }</router-link>
+              } else {
+                return <span>{ row.name }</span>
+              }
+            }
+          },
           asset: {
             label: this.$t('assets.Asset'),
             showOverflowTooltip: true,

From b2e87d74570d8aadb4209fff3db7683342124626 Mon Sep 17 00:00:00 2001
From: Bai <baijiangjie@gmail.com>
Date: Mon, 5 Dec 2022 19:42:46 +0800
Subject: [PATCH 17/19] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E8=B4=A6=E5=8F=B7=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/accounts/AssetAccount/AssetAccountDetail/Detail.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/accounts/AssetAccount/AssetAccountDetail/Detail.vue b/src/views/accounts/AssetAccount/AssetAccountDetail/Detail.vue
index 78c1aec3d..3c12c18b6 100644
--- a/src/views/accounts/AssetAccount/AssetAccountDetail/Detail.vue
+++ b/src/views/accounts/AssetAccount/AssetAccountDetail/Detail.vue
@@ -32,7 +32,7 @@ export default {
     return {
       quickActions: [
         {
-          title: this.$t('assets.PrivilegedTemplate'),
+          title: this.$t('assets.Privileged'),
           type: 'switcher',
           attrs: {
             model: vm.object.privileged,
@@ -83,7 +83,7 @@ export default {
         },
         {
           key: this.$t('assets.SecretType'),
-          value: this.object.secret_type
+          value: this.object.secret_type.label
         },
         {
           key: this.$t('xpack.ChangeAuthPlan.DateJoined'),

From ca9c467644d4a677273553dd0a3a573dd75bdbea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Tue, 6 Dec 2022 10:36:10 +0800
Subject: [PATCH 18/19] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=94=B9?=
 =?UTF-8?q?=E5=AF=86=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E6=8F=90=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ChangeSecreAtutomationDetail/index.vue                    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/accounts/ChangeSecreAtutomation/ChangeSecreAtutomationDetail/index.vue b/src/views/accounts/ChangeSecreAtutomation/ChangeSecreAtutomationDetail/index.vue
index 419b813b4..ba89c2889 100644
--- a/src/views/accounts/ChangeSecreAtutomation/ChangeSecreAtutomationDetail/index.vue
+++ b/src/views/accounts/ChangeSecreAtutomation/ChangeSecreAtutomationDetail/index.vue
@@ -23,8 +23,8 @@ export default {
     return {
       plan: { name: '', username: '', comment: '' },
       config: {
-        activeMenu: 'ChangeAuthPlanInfo',
-        url: '/api/v1/assets/change-secret-automations/',
+        activeMenu: 'ChangeSecreAtutomationInfo',
+        url: '/api/v1/assets/change-secret-automations',
         submenu: [
           {
             title: this.$t('common.BasicInfo'),

From 6349ae2c171a22d4f31af18452c41ab19aa1a6cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Tue, 6 Dec 2022 11:14:54 +0800
Subject: [PATCH 19/19] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E6=A0=91=E7=82=B9=E5=87=BB=E8=B5=84=E4=BA=A7=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AutoDataZTree/index.vue       | 4 ++--
 src/views/assets/Asset/AssetList/AllList.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/AutoDataZTree/index.vue b/src/components/AutoDataZTree/index.vue
index 238a6b855..3d5ea6c92 100644
--- a/src/components/AutoDataZTree/index.vue
+++ b/src/components/AutoDataZTree/index.vue
@@ -120,9 +120,9 @@ export default {
         query['asset'] = ''
         url = `${this.setting.url}${combinator}node_id=${objectId}&show_current_asset=${show_current_asset}`
       } else if (treeNode.meta.type === 'asset') {
-        query['asset'] = treeNode.meta.data.id
+        query['asset'] = treeNode.meta.data?.id || treeNode.id
         query['node'] = ''
-        url = `${this.setting.url}${combinator}asset_id=${objectId}&show_current_asset=${show_current_asset}`
+        url = `${this.setting.url}${combinator}asset_id=${query.asset}&show_current_asset=${show_current_asset}`
       }
       this.$router.push({ query })
       this.$emit('urlChange', url)
diff --git a/src/views/assets/Asset/AssetList/AllList.vue b/src/views/assets/Asset/AssetList/AllList.vue
index 2ddd40dac..8f652f936 100644
--- a/src/views/assets/Asset/AssetList/AllList.vue
+++ b/src/views/assets/Asset/AssetList/AllList.vue
@@ -98,7 +98,7 @@ export default {
         url = setUrlParam(url, 'asset', '')
         url = setUrlParam(url, 'node', nodeId)
       } else if (treeNode.meta.type === 'asset') {
-        const assetId = treeNode.meta.data.id
+        const assetId = treeNode.meta.data?.id || treeNode.id
         url = setUrlParam(url, 'node', '')
         url = setUrlParam(url, 'asset', assetId)
       }