From 3ba81a43cb26cc1f2168ee39597f49422aabad98 Mon Sep 17 00:00:00 2001
From: fit2bot <68588906+fit2bot@users.noreply.github.com>
Date: Mon, 4 Dec 2023 15:20:57 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B5=84=E4=BA=A7=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E5=8E=86=E5=8F=B2=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E5=91=BD=E4=BB=A4=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=20(#3568)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: 资产详情页面添加历史执行命令列表页面

---------

Co-authored-by: wangruidong <940853815@qq.com>
---
 src/router/audit/sessions.js                  |  2 +-
 src/router/console/sessions.js                |  2 +-
 .../assets/Asset/AssetDetail/AssetCommand.vue | 31 +++++++++++++++++++
 .../assets/Asset/AssetDetail/AssetSession.vue | 30 ++++++++++++++++++
 src/views/assets/Asset/AssetDetail/index.vue  | 16 +++++++++-
 .../BaseList.vue}                             | 30 +++++++++++-------
 src/views/sessions/CommandList/index.vue      | 27 ++++++++++++++++
 src/views/sessions/SessionList/BaseList.vue   | 20 +++++++-----
 .../users/User/UserDetail/UserSession.vue     | 15 ++++++---
 9 files changed, 148 insertions(+), 25 deletions(-)
 create mode 100644 src/views/assets/Asset/AssetDetail/AssetCommand.vue
 create mode 100644 src/views/assets/Asset/AssetDetail/AssetSession.vue
 rename src/views/sessions/{CommandList.vue => CommandList/BaseList.vue} (92%)
 create mode 100644 src/views/sessions/CommandList/index.vue

diff --git a/src/router/audit/sessions.js b/src/router/audit/sessions.js
index c84ae812f..5675ec732 100644
--- a/src/router/audit/sessions.js
+++ b/src/router/audit/sessions.js
@@ -34,7 +34,7 @@ export default [
   {
     path: 'command',
     name: 'CommandList',
-    component: () => import('@/views/sessions/CommandList'),
+    component: () => import('@/views/sessions/CommandList/index'),
     meta: {
       title: i18n.t('route.Commands'),
       permissions: ['terminal.view_command']
diff --git a/src/router/console/sessions.js b/src/router/console/sessions.js
index 6997519c3..bec33ed55 100644
--- a/src/router/console/sessions.js
+++ b/src/router/console/sessions.js
@@ -26,7 +26,7 @@ export default [
   {
     path: 'commands',
     name: 'CommandList',
-    component: () => import('@/views/sessions/CommandList'),
+    component: () => import('@/views/sessions/CommandList/index'),
     meta: { title: i18n.t('route.Commands'), permissions: [] }
   },
   {
diff --git a/src/views/assets/Asset/AssetDetail/AssetCommand.vue b/src/views/assets/Asset/AssetDetail/AssetCommand.vue
new file mode 100644
index 000000000..fda0e783d
--- /dev/null
+++ b/src/views/assets/Asset/AssetDetail/AssetCommand.vue
@@ -0,0 +1,31 @@
+<template>
+  <el-row :gutter="10">
+    <el-col :span="18">
+      <BaseList :asset-id="object.id" :is-page="false" />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import BaseList from '@/views/sessions/CommandList/index.vue'
+
+export default {
+  name: 'AssetCommand',
+  components: {
+    BaseList
+  },
+  props: {
+    object: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      title: '',
+      url: `/api/v1/terminal/command-storages/tree/?real=1&asset_id=${this.object.id}&order=-date_end&is_finished=1`
+    }
+  }
+
+}
+</script>
diff --git a/src/views/assets/Asset/AssetDetail/AssetSession.vue b/src/views/assets/Asset/AssetDetail/AssetSession.vue
new file mode 100644
index 000000000..88e747568
--- /dev/null
+++ b/src/views/assets/Asset/AssetDetail/AssetSession.vue
@@ -0,0 +1,30 @@
+<template>
+  <el-row :gutter="10">
+    <el-col :span="18">
+      <OfflineList :url="url" />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import OfflineList from '@/views/sessions/SessionList/OfflineList.vue'
+
+export default {
+  name: 'AssetsSession',
+  components: {
+    OfflineList
+  },
+  props: {
+    object: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      url: `/api/v1/terminal/sessions/?asset_id=${this.object.id}&order=-date_end&is_finished=1`
+    }
+  }
+
+}
+</script>
diff --git a/src/views/assets/Asset/AssetDetail/index.vue b/src/views/assets/Asset/AssetDetail/index.vue
index 293e7d0cf..5462c2d2a 100644
--- a/src/views/assets/Asset/AssetDetail/index.vue
+++ b/src/views/assets/Asset/AssetDetail/index.vue
@@ -16,6 +16,8 @@ import { GenericDetailPage, TabPage } from '@/layout/components'
 import Detail from './Detail.vue'
 import Account from './Account.vue'
 import PermUserList from './PermUser.vue'
+import AssetSession from './AssetSession.vue'
+import AssetCommand from './AssetCommand.vue'
 
 export default {
   name: 'AssetListDetail',
@@ -24,7 +26,9 @@ export default {
     TabPage,
     Detail,
     Account,
-    PermUserList
+    PermUserList,
+    AssetSession,
+    AssetCommand
   },
   data() {
     return {
@@ -45,6 +49,16 @@ export default {
             title: this.$t('assets.PermUserList'),
             name: 'PermUserList',
             hidden: () => !this.$hasPerm('perms.view_assetpermission')
+          },
+          {
+            title: this.$t('route.SessionList'),
+            name: 'AssetSession',
+            hidden: () => !this.$hasPerm('terminal.view_session')
+          },
+          {
+            title: this.$t('route.Commands'),
+            name: 'AssetCommand',
+            hidden: () => !this.$hasPerm('terminal.view_command')
           }
         ],
         hasRightSide: true,
diff --git a/src/views/sessions/CommandList.vue b/src/views/sessions/CommandList/BaseList.vue
similarity index 92%
rename from src/views/sessions/CommandList.vue
rename to src/views/sessions/CommandList/BaseList.vue
index 5f58fed44..72fc2b419 100644
--- a/src/views/sessions/CommandList.vue
+++ b/src/views/sessions/CommandList/BaseList.vue
@@ -1,6 +1,6 @@
 <template>
-  <GenericTreeListPage
-    ref="GenericTreeListPage"
+  <TreeTable
+    ref="CommandTreeTable"
     v-loading="loading"
     :header-actions="headerActions"
     :table-config="tableConfig"
@@ -14,9 +14,9 @@
 </template>
 
 <script>
-import GenericTreeListPage from '@/layout/components/GenericTreeListPage/index'
+import TreeTable from '@/components/Table/TreeTable/index.vue'
 import { getDayEnd, getDaysAgo, toSafeLocalDateStr } from '@/utils/common'
-import { OutputExpandFormatter } from './formatters'
+import { OutputExpandFormatter } from '../formatters'
 import { DetailFormatter } from '@/components/Table/TableFormatters'
 import isFalsey from '@/components/Table/DataTable/compenents/el-data-table/utils/is-falsey'
 import deepmerge from 'deepmerge'
@@ -24,8 +24,15 @@ import * as queryUtil from '@/components/Table/DataTable/compenents/el-data-tabl
 import { createSourceIdCache } from '@/api/common'
 
 export default {
+  name: 'CommandList',
   components: {
-    GenericTreeListPage
+    TreeTable
+  },
+  props: {
+    assetId: {
+      type: String,
+      default: () => ''
+    }
   },
   data() {
     const vm = this
@@ -118,16 +125,14 @@ export default {
         },
         canExportSelected: true,
         exportOptions: {
-          // Todo: 优化这里，和抽象组件重复了
           performExport: async(selectRows, exportOption, q, exportTypeOption) => {
             let url = this.tableConfig.url
             url = (process.env.VUE_APP_ENV === 'production') ? (`${url}`) : (`${process.env.VUE_APP_BASE_API}${url}`)
-            const query = Object.assign({}, q)
+            const query = { ...q }
             if (exportOption === 'selected') {
               const resources = []
-              const data = selectRows
-              for (let index = 0; index < data.length; index++) {
-                resources.push(data[index].id)
+              for (const item of selectRows) {
+                resources.push(item.id)
               }
               const spm = await createSourceIdCache(resources)
               query['spm'] = spm.spm
@@ -171,6 +176,9 @@ export default {
               return
             }
             this.tableConfig.url = `/api/v1/terminal/commands/?command_storage_id=${treeNode.id}&order=-timestamp`
+            if (this.assetId) {
+              this.tableConfig.url += `&asset_id=${this.assetId}`
+            }
           }
         }
       }
@@ -178,7 +186,7 @@ export default {
   },
   computed: {
     treeTable() {
-      return this.$refs.GenericTreeListPage.$refs.TreeTable
+      return this.$refs.CommandTreeTable
     }
   },
   watch: {},
diff --git a/src/views/sessions/CommandList/index.vue b/src/views/sessions/CommandList/index.vue
new file mode 100644
index 000000000..cb177820a
--- /dev/null
+++ b/src/views/sessions/CommandList/index.vue
@@ -0,0 +1,27 @@
+<template>
+  <Page v-if="isPage" v-bind="$attrs">
+    <CommandList v-bind="$attrs" />
+  </Page>
+  <div v-else>
+    <CommandList v-bind="$attrs" />
+  </div>
+</template>
+
+<script>
+import { Page } from '@/layout/components'
+import CommandList from './BaseList.vue'
+
+export default {
+  name: 'BaseList',
+  components: {
+    Page,
+    CommandList
+  },
+  props: {
+    isPage: {
+      type: Boolean,
+      default: () => true
+    }
+  }
+}
+</script>
diff --git a/src/views/sessions/SessionList/BaseList.vue b/src/views/sessions/SessionList/BaseList.vue
index 9d6794342..2e8bb6764 100644
--- a/src/views/sessions/SessionList/BaseList.vue
+++ b/src/views/sessions/SessionList/BaseList.vue
@@ -20,6 +20,18 @@ export default {
     extraActions: {
       type: Array,
       default: () => []
+    },
+    columnsShow: {
+      type: Object,
+      default: () => {
+        return {
+          min: ['id', 'actions'],
+          default: [
+            'id', 'user', 'asset', 'account', 'remote_addr', 'protocol',
+            'command_amount', 'date_start', 'duration', 'actions'
+          ]
+        }
+      }
     }
   },
   data() {
@@ -28,13 +40,7 @@ export default {
         url: this.url,
         columnsExtra: ['index', 'duration'],
         columnsExclude: ['terminal'],
-        columnsShow: {
-          min: ['id', 'actions'],
-          default: [
-            'id', 'user', 'asset', 'account', 'remote_addr', 'protocol',
-            'command_amount', 'date_start', 'duration', 'actions'
-          ]
-        },
+        columnsShow: this.columnsShow,
         columnsMeta: {
           id: {
             prop: 'id',
diff --git a/src/views/users/User/UserDetail/UserSession.vue b/src/views/users/User/UserDetail/UserSession.vue
index b3334a1d1..1fa0f1016 100644
--- a/src/views/users/User/UserDetail/UserSession.vue
+++ b/src/views/users/User/UserDetail/UserSession.vue
@@ -1,18 +1,18 @@
 <template>
   <el-row :gutter="10">
     <el-col :span="18">
-      <OfflineList :url="url" />
+      <BaseList :url="url" :columns-show="columnsShow" />
     </el-col>
   </el-row>
 </template>
 
 <script>
-import OfflineList from '@/views/sessions/SessionList/OfflineList.vue'
+import BaseList from '@/views/sessions/SessionList/BaseList.vue'
 
 export default {
   name: 'UserSession',
   components: {
-    OfflineList
+    BaseList
   },
   props: {
     object: {
@@ -22,7 +22,14 @@ export default {
   },
   data() {
     return {
-      url: `/api/v1/terminal/sessions/?user_id=${this.object.id}&order=-date_end&is_finished=1`
+      url: `/api/v1/terminal/sessions/?user_id=${this.object.id}&order=is_finished,-date_end`,
+      columnsShow: {
+        min: ['id'],
+        default: [
+          'id', 'user', 'asset', 'account', 'remote_addr', 'protocol',
+          'command_amount', 'date_start', 'duration'
+        ]
+      }
     }
   }