From 5df1355b5fe6181f175f28ce6a9e3f54c32b2753 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 16 Jun 2020 13:48:05 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9session=E5=91=BD?=
 =?UTF-8?q?=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/startup.js                          |  2 +-
 src/views/sessions/CommandList.vue            | 30 +++++--------------
 .../formatters/OutputExpandFormatter.vue      |  8 ++---
 3 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/src/utils/startup.js b/src/utils/startup.js
index e90446828..d07ec3e07 100644
--- a/src/utils/startup.js
+++ b/src/utils/startup.js
@@ -100,7 +100,7 @@ export async function generatePageRoutes({ to, from, next }) {
     // note: roles must be a object array! such as: ['admin'] or ,['developer','editor']
     // 不能改名 current_org_roles, 里面返回的就是这个
     const currentRole = store.getters.currentRole
-    console.log('Current org role: ', currentRole, rolec.getRolesDisplay(currentRole))
+    // console.log('Current org role: ', currentRole, rolec.getRolesDisplay(currentRole))
 
     // generate accessible routes map based on roles
     const accessRoutes = await store.dispatch('permission/generateRoutes', currentRole)
diff --git a/src/views/sessions/CommandList.vue b/src/views/sessions/CommandList.vue
index 024e93ebd..ecccae9fb 100644
--- a/src/views/sessions/CommandList.vue
+++ b/src/views/sessions/CommandList.vue
@@ -6,7 +6,7 @@
 import { GenericListPage } from '@/layout/components'
 import { getDaysAgo, toSafeLocalDateStr } from '@/utils/common'
 import { OutputExpandFormatter } from './formatters'
-import { DetailFormatter, BooleanFormatter } from '@/components/ListTable/formatters'
+import { DetailFormatter } from '@/components/ListTable/formatters'
 
 export default {
   components: {
@@ -34,33 +34,17 @@ export default {
             prop: 'output',
             formatter: OutputExpandFormatter
           },
-          input: {
-            label: this.$t('sessions.command')
-          },
           risk_level: {
             label: this.$t('sessions.riskLevel'),
-            formatter: BooleanFormatter,
-            formatterArgs: {
-              hasTips: true,
-              tips(val) {
-                switch (val) {
-                  case 0:
-                    return vm.$t('sessions.riskLevels.common')
-                  default:
-                    return vm.$t('sessions.riskLevels.common')
-                }
+            formatter: (row, col, cellValue) => {
+              const display = row.risk_level_display
+              if (cellValue === 0) {
+                return display
+              } else {
+                return <span class='text-danger'> { display } </span>
               }
             }
           },
-          user: {
-            label: this.$t('sessions.user')
-          },
-          asset: {
-            label: this.$t('sessions.asset')
-          },
-          system_user: {
-            label: this.$t('sessions.systemUser')
-          },
           session: {
             label: this.$t('sessions.session'),
             formatter: DetailFormatter,
diff --git a/src/views/sessions/formatters/OutputExpandFormatter.vue b/src/views/sessions/formatters/OutputExpandFormatter.vue
index 1594ff04f..aee375934 100644
--- a/src/views/sessions/formatters/OutputExpandFormatter.vue
+++ b/src/views/sessions/formatters/OutputExpandFormatter.vue
@@ -1,8 +1,8 @@
 <template>
-  <pre style="border: none; background: none; white-space: pre-wrap">
-      {{ '$ '+ row.input }}
-      <br>
-      {{ row.output }}
+  <pre style="border: none; background: none; white-space: pre-wrap;padding: 10px 20px">
+{{ '$ '+ row.input }}
+<br>
+{{ row.output }}
   </pre>
 </template>