From a1959fd44af7aec09d109a96667332c3854512c6 Mon Sep 17 00:00:00 2001
From: Eric <xplzv@126.com>
Date: Thu, 9 Apr 2020 19:30:46 +0800
Subject: [PATCH] Session detail view link

---
 .../ListTable/formatters/RouterFormatter.vue  | 23 +++++++++++++++++++
 src/components/ListTable/formatters/index.js  |  2 ++
 src/i18n/langs/cn.js                          |  4 +++-
 src/i18n/langs/en.js                          |  9 ++++++--
 src/router/index.js                           |  7 ++++++
 src/views/sessions/CommandList.vue            |  7 ++++--
 src/views/sessions/SessionDetail.vue          | 13 +++++++++++
 src/views/sessions/SessionOfflineList.vue     |  6 +++--
 src/views/sessions/SessionOnlineList.vue      |  6 +++--
 9 files changed, 68 insertions(+), 9 deletions(-)
 create mode 100644 src/components/ListTable/formatters/RouterFormatter.vue
 create mode 100644 src/views/sessions/SessionDetail.vue

diff --git a/src/components/ListTable/formatters/RouterFormatter.vue b/src/components/ListTable/formatters/RouterFormatter.vue
new file mode 100644
index 000000000..062ab04fa
--- /dev/null
+++ b/src/components/ListTable/formatters/RouterFormatter.vue
@@ -0,0 +1,23 @@
+<template>
+  <el-link class="detail" :type="col.type || 'success'" @click="goDetail">{{ col.linkName }}</el-link>
+</template>
+
+<script>
+import BaseFormatter from './base'
+
+export default {
+  name: 'RouterFormatter',
+  extends: BaseFormatter,
+  methods: {
+    goDetail() {
+      const routeName = this.col.route || ''
+      this.$router.push({ name: routeName, params: { id: this.cellValue }})
+    }
+  }
+
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/ListTable/formatters/index.js b/src/components/ListTable/formatters/index.js
index d92f9ba0f..3af4df17e 100644
--- a/src/components/ListTable/formatters/index.js
+++ b/src/components/ListTable/formatters/index.js
@@ -4,3 +4,5 @@ export { default as BooleanFormatter } from './ChoicesFormatter'
 export { default as ActionsFormatter } from './ActionsFormatter'
 export { default as ExpandPreFormatter } from './ExpandPreFormatter'
 export { default as LengthFormatter } from './LengthFormatter'
+export { default as RouterFormatter } from './RouterFormatter'
+export { default as OutputExpandFormatter } from './OutputExpandFormatter'
diff --git a/src/i18n/langs/cn.js b/src/i18n/langs/cn.js
index 28ec59499..572729fa0 100644
--- a/src/i18n/langs/cn.js
+++ b/src/i18n/langs/cn.js
@@ -87,6 +87,7 @@ const cn = {
     'Sessions': '会话管理',
     'SessionOnline': '在线会话',
     'SessionOffline': '历史会话',
+    'SessionDetail': '会话详情',
     'Commands': '命令记录',
     'WebTerminal': 'Web终端',
     'FileManager': '文件管理',
@@ -380,7 +381,8 @@ const cn = {
     'active': '激活中',
     'alive': '在线',
     'StorageConfiguration': '存储配置',
-    'join': '加入'
+    'join': '加入',
+    'goto': '转到'
   },
   jobcenter: {
     'RunTimes': '执行次数',
diff --git a/src/i18n/langs/en.js b/src/i18n/langs/en.js
index 1c8d7d64c..5359545ef 100644
--- a/src/i18n/langs/en.js
+++ b/src/i18n/langs/en.js
@@ -18,7 +18,11 @@ const en = {
     'assets': 'Assets',
     'applications': 'Applications',
     'perms': 'Perms',
-    'sessions': 'Sessions',
+    'Sessions': 'Sessions',
+    'SessionOnline': 'Session Online',
+    'SessionOffline': 'Session Offline',
+    'SessionDetail': 'Session Detail',
+    'Goto': 'Goto',
     'jobcenter': 'Job Center'
   },
   users: {
@@ -289,7 +293,8 @@ const en = {
     'terminate_session': 'Terminate session',
     'confirm': 'Confirm',
     'commands': 'Commands',
-    'join': 'join'
+    'join': 'join',
+    'goto': 'Goto'
   },
   setting: {
     'setting': 'System Setting',
diff --git a/src/router/index.js b/src/router/index.js
index f2d37a8be..b946eb853 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -274,6 +274,13 @@ export const constantRoutes = [
         component: () => import('@/views/sessions/CommandList'),
         meta: { title: 'Commands' }
       },
+      {
+        path: 'sessions/:id',
+        name: 'SessionDetail',
+        component: () => import('@/views/sessions/SessionDetail'),
+        meta: { title: 'SessionDetail' },
+        hidden: true
+      },
       {
         path: 'luna',
         name: 'WebTerminal',
diff --git a/src/views/sessions/CommandList.vue b/src/views/sessions/CommandList.vue
index 92bcf4400..48c6198b7 100644
--- a/src/views/sessions/CommandList.vue
+++ b/src/views/sessions/CommandList.vue
@@ -5,7 +5,7 @@
 <script>
 import { GenericListPage } from '@/layout/components'
 import { toSafeLocalDateStr } from '@/utils/common'
-import OutputExpandFormatter from '@/components/ListTable/formatters/OutputExpandFormatter'
+import { RouterFormatter, OutputExpandFormatter } from '@/components/ListTable/formatters'
 
 export default {
   components: {
@@ -42,7 +42,10 @@ export default {
             label: this.$t('sessions.systemUser')
           },
           session: {
-            label: this.$t('sessions.session')
+            label: this.$t('sessions.session'),
+            formatter: RouterFormatter,
+            route: 'SessionDetail',
+            linkName: this.$t('sessions.goto')
           },
           timestamp: {
             label: this.$t('sessions.date'),
diff --git a/src/views/sessions/SessionDetail.vue b/src/views/sessions/SessionDetail.vue
new file mode 100644
index 000000000..a159a2e6a
--- /dev/null
+++ b/src/views/sessions/SessionDetail.vue
@@ -0,0 +1,13 @@
+<template>
+  <div>SessionDetail</div>
+</template>
+
+<script>
+export default {
+  name: 'SessionDetail'
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/sessions/SessionOfflineList.vue b/src/views/sessions/SessionOfflineList.vue
index a95a88080..a422fd538 100644
--- a/src/views/sessions/SessionOfflineList.vue
+++ b/src/views/sessions/SessionOfflineList.vue
@@ -22,8 +22,10 @@ export default {
         ],
         columnsMeta: {
           index: {
-            type: 'index',
-            label: this.$t('sessions.id')
+            label: this.$t('sessions.id'),
+            formatter: function(row, column, cellValue, index) {
+              return <a class='detail el-link el-link--success is-underline' href= { '/terminal/sessions/' + row.id }>{ index + 1}</a>
+            }
           },
           command_amount: {
             label: this.$t('sessions.command')
diff --git a/src/views/sessions/SessionOnlineList.vue b/src/views/sessions/SessionOnlineList.vue
index 9facf05a0..fc12c2ef4 100644
--- a/src/views/sessions/SessionOnlineList.vue
+++ b/src/views/sessions/SessionOnlineList.vue
@@ -22,8 +22,10 @@ export default {
         ],
         columnsMeta: {
           index: {
-            type: 'index',
-            label: this.$t('sessions.id')
+            label: this.$t('sessions.id'),
+            formatter: function(row, column, cellValue, index) {
+              return <a class='detail el-link el-link--success is-underline' href= { '/terminal/sessions/' + row.id }>{ index + 1}</a>
+            }
           },
           command_amount: {
             label: this.$t('sessions.command')