From 5254018426a8ea5b5d2a96d9c767514b99f630d6 Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Thu, 2 Apr 2020 15:36:05 +0800
Subject: [PATCH 01/26] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/assets/AdminUserList.vue | 46 ++++++++++++------------------
 1 file changed, 19 insertions(+), 27 deletions(-)

diff --git a/src/views/assets/AdminUserList.vue b/src/views/assets/AdminUserList.vue
index c805d6ac4..60152ee5a 100644
--- a/src/views/assets/AdminUserList.vue
+++ b/src/views/assets/AdminUserList.vue
@@ -1,57 +1,49 @@
 <template>
-  <Page>
-    <template slot="content">
-      <el-alert type="success"> 这里是一个成功的文案 </el-alert>
-      <el-card>
-        <tables v-bind="tableConfig" />
-      </el-card>
-    </template>
-  </Page>
+  <GenericListPage :table-config="tableConfig" :header-actions="headerActions" />
 </template>
 
 <script>
-import { Page } from '@/layout/components'
-import Tables from '@/components/ListTable/index'
-import { getAdminUserList } from '@/api/asset'
+import { GenericListPage } from '@/layout/components'
+import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
 
 export default {
   components: {
-    Page,
-    Tables
+    GenericListPage
   },
   data() {
     return {
       tableConfig: {
-        getData: getAdminUserList,
-        hasSelect: true,
+        url: '/api/v1/assets/admin-users/',
         columns: [
           {
             prop: 'name',
             label: this.$t('common.name'),
-            key: 'name',
-            link: 'AdminUserDetail',
-            sortable: true
+            formatter: DetailFormatter,
+            sortable: true,
+            route: 'AdminUserDetail'
           },
           {
             prop: 'username',
-            label: this.$t('common.username'),
-            key: 'username'
+            label: this.$t('common.username')
           },
           {
             prop: 'assets',
-            label: this.$t('assets.asset'),
-            key: 'assets_amount'
+            label: this.$t('assets.asset')
           },
           {
             prop: 'comment',
-            label: this.$t('assets.comment'),
-            key: 'comment'
+            label: this.$t('assets.comment')
           }
         ],
-        action: {
-          hasEdit: 'AdminUserEdit',
-          newClick: 'AdminUserEdit'
+        tableActions: {
+          hasEdit: true,
+          editRoute: '404'
         }
+      },
+      headerActions: {
+        hasDelete: false,
+        hasUpdate: false,
+        createRoute: 'AdminUserCreate'
       }
     }
   }

From 4140801eeece4652e8917642367eacca8926131c Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Thu, 2 Apr 2020 15:52:39 +0800
Subject: [PATCH 02/26] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E5=88=97=E8=A1=A8=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/assets/AssetList.vue | 47 +++++++++++++++++++++++++++++++---
 1 file changed, 44 insertions(+), 3 deletions(-)

diff --git a/src/views/assets/AssetList.vue b/src/views/assets/AssetList.vue
index 980a522a4..cb2a98d69 100644
--- a/src/views/assets/AssetList.vue
+++ b/src/views/assets/AssetList.vue
@@ -1,13 +1,54 @@
 <template>
-  <h1>这是组件AssetList</h1>
+  <GenericListPage :table-config="tableConfig" :header-actions="headerActions" />
 </template>
 
 <script>
+import { GenericListPage } from '@/layout/components'
+import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
+
 export default {
-  name: 'AssetList'
+  components: {
+    GenericListPage
+  },
+  data() {
+    return {
+      showTree: true,
+      tableConfig: {
+        url: '/api/v1/assets/assets/',
+        columns: [
+          {
+            prop: 'hostname',
+            label: this.$t('assets.hostname'),
+            formatter: DetailFormatter,
+            sortable: true,
+            route: 'AssetDetail'
+          },
+          {
+            prop: 'ip',
+            label: this.$t('assets.ip')
+          },
+          {
+            prop: 'hardware_info',
+            label: this.$t('assets.hardware')
+          },
+          {
+            prop: 'reachable',
+            label: this.$t('assets.reachable')
+          }
+        ],
+        tableActions: {
+          hasEdit: true,
+          editRoute: '404'
+        }
+      },
+      headerActions: {
+        createRoute: 'AssetCreate'
+      }
+    }
+  }
 }
 </script>
 
-<style scoped>
+<style>
 
 </style>

From 13b9449645769b5fd1c79c9d893896ce5c110b44 Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Thu, 2 Apr 2020 16:00:15 +0800
Subject: [PATCH 03/26] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E7=BD=91?=
 =?UTF-8?q?=E5=9F=9F=E5=88=97=E8=A1=A8=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/assets/DomainList.vue | 53 ++++++++++++++-------------------
 1 file changed, 23 insertions(+), 30 deletions(-)

diff --git a/src/views/assets/DomainList.vue b/src/views/assets/DomainList.vue
index 96b878db6..34c2fb687 100644
--- a/src/views/assets/DomainList.vue
+++ b/src/views/assets/DomainList.vue
@@ -1,57 +1,50 @@
 <template>
-  <Page>
-    <template slot="content">
-      <el-alert type="success"> 这里是一个成功的文案 </el-alert>
-      <el-card>
-        <tables v-bind="tableConfig" />
-      </el-card>
-    </template>
-  </Page>
+  <GenericListPage :table-config="tableConfig" :header-actions="headerActions" />
 </template>
 
 <script>
-import { Page } from '@/layout/components'
-import Tables from '@/components/ListTable/index'
-import { getDomainList } from '@/api/asset'
+import { GenericListPage } from '@/layout/components'
+import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
 
 export default {
   components: {
-    Page,
-    Tables
+    GenericListPage
   },
   data() {
     return {
+      showTree: true,
       tableConfig: {
-        getData: getDomainList,
-        hasSelect: true,
+        url: '/api/v1/assets/domains/',
         columns: [
           {
             prop: 'name',
-            label: this.$t('common.name'),
-            key: 'name',
-            link: 'DomainDetail',
-            sortable: true
+            label: this.$t('assets.name'),
+            formatter: DetailFormatter,
+            sortable: true,
+            route: 'DomainDetail'
           },
           {
-            prop: 'asset',
-            label: this.$t('assets.asset'),
-            key: 'asset_count'
+            prop: 'asset_count',
+            label: this.$t('assets.asset')
           },
           {
-            prop: 'gateway',
-            label: this.$t('assets.gateway'),
-            key: 'gateway_count'
+            prop: 'gateway_count',
+            label: this.$t('assets.gateway')
           },
           {
             prop: 'comment',
-            label: this.$t('assets.comment'),
-            key: 'comment'
+            label: this.$t('assets.comment')
           }
         ],
-        action: {
-          hasEdit: 'DomainEdit',
-          newClick: 'DomainEdit'
+        tableActions: {
+          hasEdit: true,
+          editRoute: '404'
         }
+      },
+      headerActions: {
+        hasDelete: false,
+        hasUpdate: false,
+        createRoute: 'DomainCreate'
       }
     }
   }

From b3e390f571e6e988341e1b332e00a2e1273e06ec Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Thu, 2 Apr 2020 16:04:26 +0800
Subject: [PATCH 04/26] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/assets/SystemUserList.vue | 59 ++++++++++++-----------------
 1 file changed, 25 insertions(+), 34 deletions(-)

diff --git a/src/views/assets/SystemUserList.vue b/src/views/assets/SystemUserList.vue
index 5e1f90751..c9a160dcc 100644
--- a/src/views/assets/SystemUserList.vue
+++ b/src/views/assets/SystemUserList.vue
@@ -1,72 +1,63 @@
 <template>
-  <Page>
-    <template slot="content">
-      <el-alert type="success"> 这里是一个成功的文案 </el-alert>
-      <el-card>
-        <tables v-bind="tableConfig" />
-      </el-card>
-    </template>
-  </Page>
+  <GenericListPage :table-config="tableConfig" :header-actions="headerActions" />
 </template>
+
 <script>
-import { Page } from '@/layout/components'
-import Tables from '@/components/ListTable/index'
-import { getSystemUserList } from '@/api/asset'
+import { GenericListPage } from '@/layout/components'
+import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
 
 export default {
   components: {
-    Page,
-    Tables
+    GenericListPage
   },
   data() {
     return {
       tableConfig: {
-        getData: getSystemUserList,
-        hasSelect: true,
+        url: '/api/v1/assets/system-users/',
         columns: [
           {
             prop: 'name',
             label: this.$t('common.name'),
-            key: 'name',
-            link: 'DomainDetail',
-            sortable: true
+            formatter: DetailFormatter,
+            sortable: true,
+            route: 'SystemUserDetail'
           },
           {
             prop: 'username',
-            label: this.$t('common.username'),
-            key: 'assets_amount'
+            label: this.$t('common.username')
           },
           {
             prop: 'protocol',
-            label: this.$t('assets.protocol'),
-            key: 'protocol'
+            label: this.$t('assets.protocol')
           },
           {
-            prop: 'loginMode',
-            label: this.$t('assets.loginMode'),
-            key: 'login_mode_display'
+            prop: 'login_mode_display',
+            label: this.$t('assets.loginMode')
           },
           {
-            prop: 'asset',
-            label: this.$t('assets.asset'),
-            key: 'assets_amount'
+            prop: 'assets_amount',
+            label: this.$t('assets.asset')
           },
           {
             prop: 'comment',
-            label: this.$t('assets.comment'),
-            key: 'comment'
+            label: this.$t('assets.comment')
           }
         ],
-        action: {
-          hasEdit: 'SystemUserEdit',
-          newClick: 'SystemUserEdit'
+        tableActions: {
+          hasEdit: true,
+          editRoute: '404'
         }
+      },
+      headerActions: {
+        hasDelete: false,
+        hasUpdate: false,
+        createRoute: 'SystemUserCreate'
       }
     }
   }
 }
 </script>
 
-<style lang="less" scoped>
+<style>
 
 </style>

From 32e9a69aca075e5b88c6dff6338c0a6ef92a2531 Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Thu, 2 Apr 2020 16:07:29 +0800
Subject: [PATCH 05/26] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E5=88=97=E8=A1=A8=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/assets/LabelList.vue | 56 ++++++++++++++--------------------
 1 file changed, 23 insertions(+), 33 deletions(-)

diff --git a/src/views/assets/LabelList.vue b/src/views/assets/LabelList.vue
index 5257a61c8..82a7360c4 100644
--- a/src/views/assets/LabelList.vue
+++ b/src/views/assets/LabelList.vue
@@ -1,62 +1,52 @@
 <template>
-  <Page>
-    <template slot="content">
-      <el-alert type="success"> 这里是一个成功的文案 </el-alert>
-      <el-card>
-        <tables v-bind="tableConfig" />
-      </el-card>
-    </template>
-  </Page>
+  <GenericListPage :table-config="tableConfig" :header-actions="headerActions" />
 </template>
 
 <script>
-import { Page } from '@/layout/components'
-import Tables from '@/components/ListTable/index'
-import { getLabelList } from '@/api/asset'
+import { GenericListPage } from '@/layout/components'
+import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
+
 export default {
   components: {
-    Page,
-    Tables
+    GenericListPage
   },
   data() {
     return {
+      showTree: true,
       tableConfig: {
-        getData: getLabelList,
-        hasSelect: true,
+        url: '/api/v1/assets/labels/',
         columns: [
           {
             prop: 'name',
-            label: this.$t('common.name'),
-            key: 'name',
-            link: 'LabelDetail',
-            sortable: true
+            label: this.$t('assets.name'),
+            formatter: DetailFormatter,
+            sortable: true,
+            route: 'LabelDetail'
           },
           {
             prop: 'value',
-            label: this.$t('assets.value'),
-            key: 'value'
+            label: this.$t('assets.value')
           },
           {
-            prop: 'asset',
-            label: this.$t('assets.asset'),
-            key: 'asset_count'
-          },
-          {
-            prop: 'comment',
-            label: this.$t('assets.comment'),
-            key: 'comment'
+            prop: 'asset_count',
+            label: this.$t('assets.asset')
           }
         ],
-        action: {
-          hasEdit: 'LabelEdit',
-          newClick: 'LabelEdit'
+        tableActions: {
+          hasEdit: true,
+          editRoute: '404'
         }
+      },
+      headerActions: {
+        hasDelete: false,
+        hasUpdate: false,
+        createRoute: 'LabelCreate'
       }
     }
   }
 }
 </script>
 
-<style lang="less" scoped>
+<style>
 
 </style>

From 911df84460cd47a99c8d39c02afbfa9e421f4c47 Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Thu, 2 Apr 2020 16:25:29 +0800
Subject: [PATCH 06/26] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E5=91=BD?=
 =?UTF-8?q?=E4=BB=A4=E5=88=97=E8=A1=A8=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.js                   |  2 +-
 src/views/assets/CommandFilterList.vue | 53 +++++++++++---------------
 2 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/src/i18n/langs/cn.js b/src/i18n/langs/cn.js
index 33d519e75..172d45300 100644
--- a/src/i18n/langs/cn.js
+++ b/src/i18n/langs/cn.js
@@ -244,7 +244,7 @@ const cn = {
     'update_command_filter': '更新命令过滤器',
     'command_filter_detail': '命令过滤器详情',
     'rules': '规则',
-    'system_user': '系统用户',
+    'systemUser': '系统用户',
     'date_updated': '更新日期',
     'binding_to_system_user': '绑定到系统用户',
     // 系统平台
diff --git a/src/views/assets/CommandFilterList.vue b/src/views/assets/CommandFilterList.vue
index ddd98ef89..75abd3b4a 100644
--- a/src/views/assets/CommandFilterList.vue
+++ b/src/views/assets/CommandFilterList.vue
@@ -1,63 +1,56 @@
 <template>
-  <Page>
-    <template slot="content">
-      <el-alert type="success"> 这里是一个成功的文案 </el-alert>
-      <el-card>
-        <tables v-bind="tableConfig" />
-      </el-card>
-    </template>
-  </Page>
+  <GenericListPage :table-config="tableConfig" :header-actions="headerActions" />
 </template>
 
 <script>
-import { Page } from '@/layout/components'
-import Tables from '@/components/ListTable/index'
-import { getCommandFilterList } from '@/api/asset'
+import { GenericListPage } from '@/layout/components'
+import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
 
 export default {
   components: {
-    Page,
-    Tables
+    GenericListPage
   },
   data() {
     return {
+      showTree: true,
       tableConfig: {
-        getData: getCommandFilterList,
-        hasSelect: true,
+        url: '/api/v1/assets/cmd-filters/',
         columns: [
           {
             prop: 'name',
-            label: this.$t('common.name'),
-            key: 'name',
-            link: 'CommandFilterDetail',
-            sortable: true
+            label: this.$t('assets.name'),
+            formatter: DetailFormatter,
+            sortable: true,
+            route: 'CommandFilterDetail'
           },
           {
             prop: 'rules',
-            label: this.$t('assets.rules'),
-            key: 'rules'
+            label: this.$t('assets.rules')
           },
           {
             prop: 'system_users',
-            label: this.$t('assets.system_user'),
-            key: 'system_users'
+            label: this.$t('assets.systemUser')
           },
           {
-            prop: 'comment',
-            label: this.$t('assets.comment'),
-            key: 'comment'
+            prop: '',
+            label: this.$t('assets.comment')
           }
         ],
-        action: {
-          hasEdit: 'CommandFilterEdit',
-          newClick: 'CommandFilterEdit'
+        tableActions: {
+          hasEdit: true,
+          editRoute: '404'
         }
+      },
+      headerActions: {
+        hasDelete: false,
+        hasUpdate: false,
+        createRoute: 'CommandFilterCreate'
       }
     }
   }
 }
 </script>
 
-<style lang="less" scoped>
+<style>
 
 </style>

From cbfc52adfef52536f30dfa155f47650238b490b8 Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Thu, 2 Apr 2020 16:31:34 +0800
Subject: [PATCH 07/26] =?UTF-8?q?[Update]=20=E5=A2=9E=E5=8A=A0=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E5=88=97=E8=A1=A8=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.js              |  2 +-
 src/router/index.js               |  2 +-
 src/views/assets/PlatformList.vue | 52 +++++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 src/views/assets/PlatformList.vue

diff --git a/src/i18n/langs/cn.js b/src/i18n/langs/cn.js
index 172d45300..0ef98da19 100644
--- a/src/i18n/langs/cn.js
+++ b/src/i18n/langs/cn.js
@@ -252,7 +252,7 @@ const cn = {
     'create_platform': '创建系统平台',
     'update_platform': '更新系统平台',
     'platform_detail': '平台详情',
-    'base_platform': '基础平台',
+    'BasePlatform': '基础平台',
     'charset': '编码',
     'meta': '元数据'
   },
diff --git a/src/router/index.js b/src/router/index.js
index 4b9e8623a..39d9e027d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -161,7 +161,7 @@ export const constantRoutes = [
       {
         path: 'platforms',
         name: 'PlatformList',
-        component: () => import('@/views/tree/index'),
+        component: () => import('@/views/assets/PlatformList'),
         meta: { title: 'PlatformList' }
       }
     ]
diff --git a/src/views/assets/PlatformList.vue b/src/views/assets/PlatformList.vue
new file mode 100644
index 000000000..5baa88a9a
--- /dev/null
+++ b/src/views/assets/PlatformList.vue
@@ -0,0 +1,52 @@
+<template>
+  <GenericListPage :table-config="tableConfig" :header-actions="headerActions" />
+</template>
+
+<script>
+import { GenericListPage } from '@/layout/components'
+import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
+
+export default {
+  components: {
+    GenericListPage
+  },
+  data() {
+    return {
+      showTree: true,
+      tableConfig: {
+        url: '/api/v1/assets/platforms/',
+        columns: [
+          {
+            prop: 'name',
+            label: this.$t('assets.name'),
+            formatter: DetailFormatter,
+            sortable: true,
+            route: 'CommandFilterDetail'
+          },
+          {
+            prop: 'base',
+            label: this.$t('assets.BasePlatform')
+          },
+          {
+            prop: '',
+            label: this.$t('assets.comment')
+          }
+        ],
+        tableActions: {
+          hasEdit: true,
+          editRoute: '404'
+        }
+      },
+      headerActions: {
+        hasDelete: false,
+        hasUpdate: false,
+        createRoute: 'CommandFilterCreate'
+      }
+    }
+  }
+}
+</script>
+
+<style>
+
+</style>

From 3793c484ecd19d698ac596f993f9bfb14ee4a727 Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Thu, 2 Apr 2020 16:44:01 +0800
Subject: [PATCH 08/26] =?UTF-8?q?[Update]=20=E5=A2=9E=E5=8A=A0=E8=BF=9C?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=94=E7=94=A8=E5=88=97=E8=A1=A8=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.js                       |  2 +-
 src/router/index.js                        |  6 +-
 src/views/applications/DatabaseAppList.vue | 64 ++++++++++++++++++++++
 src/views/applications/RemoteAppList.vue   | 56 +++++++++++++++++++
 src/views/assets/CommandFilterList.vue     |  2 +-
 src/views/assets/PlatformList.vue          |  6 +-
 6 files changed, 128 insertions(+), 8 deletions(-)
 create mode 100644 src/views/applications/DatabaseAppList.vue
 create mode 100644 src/views/applications/RemoteAppList.vue

diff --git a/src/i18n/langs/cn.js b/src/i18n/langs/cn.js
index 0ef98da19..75921f479 100644
--- a/src/i18n/langs/cn.js
+++ b/src/i18n/langs/cn.js
@@ -263,7 +263,7 @@ const cn = {
     'remote_app_detail': '远程应用详情',
     'update_remote_app': '更新远程应用',
     'name': '名称',
-    'app_type': '应用类型',
+    'appType': '应用类型',
     'asset': '资产',
     'action': '操作',
     'update': '更新',
diff --git a/src/router/index.js b/src/router/index.js
index 39d9e027d..d6d7f8ed3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -175,14 +175,14 @@ export const constantRoutes = [
     children: [
       {
         path: 'remote-apps',
-        name: 'remoteAppList',
-        component: () => import('@/views/tree/index'),
+        name: 'RemoteAppList',
+        component: () => import('@/views/applications/RemoteAppList'),
         meta: { title: 'RemoteApp' }
       },
       {
         path: 'database-apps',
         name: 'DatabaseAppList',
-        component: () => import('@/views/tree/index'),
+        component: () => import('@/views/applications/DatabaseAppList'),
         meta: { title: 'DatabaseApp' }
       }
     ]
diff --git a/src/views/applications/DatabaseAppList.vue b/src/views/applications/DatabaseAppList.vue
new file mode 100644
index 000000000..fa47350ed
--- /dev/null
+++ b/src/views/applications/DatabaseAppList.vue
@@ -0,0 +1,64 @@
+<template>
+  <GenericListPage :table-config="tableConfig" :header-actions="headerActions" />
+</template>
+
+<script>
+import { GenericListPage } from '@/layout/components'
+import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
+
+export default {
+  components: {
+    GenericListPage
+  },
+  data() {
+    return {
+      showTree: true,
+      tableConfig: {
+        url: '/api/v1/applications/database-apps/',
+        columns: [
+          {
+            prop: 'name',
+            label: this.$t('applications.name'),
+            formatter: DetailFormatter,
+            sortable: true,
+            route: 'DatabaseAppDetail'
+          },
+          {
+            prop: 'get_type_display',
+            label: this.$t('applications.appType')
+          },
+          {
+            prop: 'host',
+            label: this.$t('applications.host')
+          },
+          {
+            prop: 'port',
+            label: this.$t('applications.port')
+          },
+          {
+            prop: 'database',
+            label: this.$t('applications.database')
+          },
+          {
+            prop: 'comment',
+            label: this.$t('applications.comment')
+          }
+        ],
+        tableActions: {
+          hasEdit: true,
+          editRoute: '404'
+        }
+      },
+      headerActions: {
+        hasDelete: false,
+        hasUpdate: false,
+        createRoute: 'DatabaseAppCreate'
+      }
+    }
+  }
+}
+</script>
+
+<style>
+
+</style>
diff --git a/src/views/applications/RemoteAppList.vue b/src/views/applications/RemoteAppList.vue
new file mode 100644
index 000000000..c959291c0
--- /dev/null
+++ b/src/views/applications/RemoteAppList.vue
@@ -0,0 +1,56 @@
+<template>
+  <GenericListPage :table-config="tableConfig" :header-actions="headerActions" />
+</template>
+
+<script>
+import { GenericListPage } from '@/layout/components'
+import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
+
+export default {
+  components: {
+    GenericListPage
+  },
+  data() {
+    return {
+      showTree: true,
+      tableConfig: {
+        url: '/api/v1/applications/remote-apps/',
+        columns: [
+          {
+            prop: 'name',
+            label: this.$t('applications.name'),
+            formatter: DetailFormatter,
+            sortable: true,
+            route: 'RemoteAppDetail'
+          },
+          {
+            prop: 'get_type_display',
+            label: this.$t('applications.appType')
+          },
+          {
+            prop: 'asset_info',
+            label: this.$t('applications.asset')
+          },
+          {
+            prop: 'comment',
+            label: this.$t('applications.comment')
+          }
+        ],
+        tableActions: {
+          hasEdit: true,
+          editRoute: '404'
+        }
+      },
+      headerActions: {
+        hasDelete: false,
+        hasUpdate: false,
+        createRoute: 'RemoteAppCreate'
+      }
+    }
+  }
+}
+</script>
+
+<style>
+
+</style>
diff --git a/src/views/assets/CommandFilterList.vue b/src/views/assets/CommandFilterList.vue
index 75abd3b4a..1d8dea975 100644
--- a/src/views/assets/CommandFilterList.vue
+++ b/src/views/assets/CommandFilterList.vue
@@ -32,7 +32,7 @@ export default {
             label: this.$t('assets.systemUser')
           },
           {
-            prop: '',
+            prop: 'comment',
             label: this.$t('assets.comment')
           }
         ],
diff --git a/src/views/assets/PlatformList.vue b/src/views/assets/PlatformList.vue
index 5baa88a9a..8945b8c6e 100644
--- a/src/views/assets/PlatformList.vue
+++ b/src/views/assets/PlatformList.vue
@@ -21,14 +21,14 @@ export default {
             label: this.$t('assets.name'),
             formatter: DetailFormatter,
             sortable: true,
-            route: 'CommandFilterDetail'
+            route: 'PlatformDetail'
           },
           {
             prop: 'base',
             label: this.$t('assets.BasePlatform')
           },
           {
-            prop: '',
+            prop: 'comment',
             label: this.$t('assets.comment')
           }
         ],
@@ -40,7 +40,7 @@ export default {
       headerActions: {
         hasDelete: false,
         hasUpdate: false,
-        createRoute: 'CommandFilterCreate'
+        createRoute: 'PlatformCreate'
       }
     }
   }

From f2bc4c6bb73c2b684c8624894457bcb0917b8d52 Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Thu, 2 Apr 2020 17:05:20 +0800
Subject: [PATCH 09/26] =?UTF-8?q?[Update]=20=E5=A2=9E=E5=8A=A0=E6=8E=88?=
 =?UTF-8?q?=E6=9D=83=E5=88=97=E8=A1=A8=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.js                          |  8 +--
 src/router/index.js                           |  8 +--
 src/views/perms/AssetPermissionList.vue       | 68 +++++++++++++++++++
 src/views/perms/DatabaseAppPermissionList.vue | 64 +++++++++++++++++
 src/views/perms/RemoteAppPermissionList.vue   | 64 +++++++++++++++++
 5 files changed, 204 insertions(+), 8 deletions(-)
 create mode 100644 src/views/perms/AssetPermissionList.vue
 create mode 100644 src/views/perms/DatabaseAppPermissionList.vue
 create mode 100644 src/views/perms/RemoteAppPermissionList.vue

diff --git a/src/i18n/langs/cn.js b/src/i18n/langs/cn.js
index 75921f479..d148d8504 100644
--- a/src/i18n/langs/cn.js
+++ b/src/i18n/langs/cn.js
@@ -291,10 +291,10 @@ const cn = {
     'Asset permissions': '资产授权',
     'name': '名称',
     'user': '用户',
-    'user_group': '用户组',
+    'userGroup': '用户组',
     'asset': '资产',
     'node': '节点',
-    'system_user': '系统用户',
+    'systemUser': '系统用户',
     'validity': '有效',
     'action': '动作',
     'update': '更新',
@@ -315,14 +315,14 @@ const cn = {
     'users_and_user_groups': '用户或用户组',
     'assets_and_node': '资产或节点',
     //
-    'remote_app': '远程应用',
+    'RemoteApp': '远程应用',
     'remote_app_permission_list': '远程应用授权列表',
     'remote_app_permission_detail': '远程应用授权详情',
     'create_remote_app_permission': '创建远程应用授权规则',
     'update_remote_app_permission': '更新远程应用授权规则',
     'remote_app_count': '远程应用数量',
     //
-    'database_app': '数据库应用',
+    'DatabaseaApp': '数据库应用',
     'database_app_permission_list': '数据库应用授权列表',
     'database_app_permission_detail': '数据库应用授权详情',
     'create_database_app_permission': '创建数据库应用授权规则',
diff --git a/src/router/index.js b/src/router/index.js
index d6d7f8ed3..f228e8c08 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -190,26 +190,26 @@ export const constantRoutes = [
   {
     path: '/perms/',
     component: Layout,
-    redirect: '/perms/asset-permission/',
+    redirect: '/perms/asset-permissions/',
     name: 'Perms',
     meta: { title: 'Perms', icon: 'edit' },
     children: [
       {
         path: 'asset-permissions',
         name: 'AssetPermissionList',
-        component: import('@/views/tree/index'),
+        component: () => import('@/views/perms/AssetPermissionList'),
         meta: { title: 'AssetPermission' }
       },
       {
         path: 'remote-app-permissions',
         name: 'RemoteAppPermissionList',
-        component: () => import('@/views/tree/index'),
+        component: () => import('@/views/perms/RemoteAppPermissionList'),
         meta: { title: 'RemoteAppPermission' }
       },
       {
         path: 'database-app-permissions',
         name: 'DatabaseAppPermissionList',
-        component: () => import('@/views/tree/index'),
+        component: () => import('@/views/perms/DatabaseAppPermissionList'),
         meta: { title: 'DatabaseAppPermission' }
       }
     ]
diff --git a/src/views/perms/AssetPermissionList.vue b/src/views/perms/AssetPermissionList.vue
new file mode 100644
index 000000000..9f81d835e
--- /dev/null
+++ b/src/views/perms/AssetPermissionList.vue
@@ -0,0 +1,68 @@
+<template>
+  <GenericListPage :table-config="tableConfig" :header-actions="headerActions" />
+</template>
+
+<script>
+import { GenericListPage } from '@/layout/components'
+import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
+
+export default {
+  components: {
+    GenericListPage
+  },
+  data() {
+    return {
+      showTree: true,
+      tableConfig: {
+        url: '/api/v1/perms/asset-permissions/',
+        columns: [
+          {
+            prop: 'name',
+            label: this.$t('common.name'),
+            formatter: DetailFormatter,
+            sortable: true,
+            route: 'AssetPermissionDetail'
+          },
+          {
+            prop: 'users',
+            label: this.$t('perms.user')
+          },
+          {
+            prop: 'user_groups',
+            label: this.$t('perms.userGroup')
+          },
+          {
+            prop: 'assets',
+            label: this.$t('perms.asset')
+          },
+          {
+            prop: 'nodes',
+            label: this.$t('perms.node')
+          },
+          {
+            prop: 'system_users',
+            label: this.$t('perms.systemUser')
+          },
+          {
+            prop: 'is_active',
+            label: this.$t('perms.validity')
+          }
+        ],
+        tableActions: {
+          hasEdit: true,
+          editRoute: '404'
+        }
+      },
+      headerActions: {
+        hasDelete: false,
+        hasUpdate: false,
+        createRoute: 'AssetPermissionCreate'
+      }
+    }
+  }
+}
+</script>
+
+<style>
+
+</style>
diff --git a/src/views/perms/DatabaseAppPermissionList.vue b/src/views/perms/DatabaseAppPermissionList.vue
new file mode 100644
index 000000000..8b5581ccf
--- /dev/null
+++ b/src/views/perms/DatabaseAppPermissionList.vue
@@ -0,0 +1,64 @@
+<template>
+  <GenericListPage :table-config="tableConfig" :header-actions="headerActions" />
+</template>
+
+<script>
+import { GenericListPage } from '@/layout/components'
+import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
+
+export default {
+  components: {
+    GenericListPage
+  },
+  data() {
+    return {
+      showTree: true,
+      tableConfig: {
+        url: '/api/v1/perms/database-app-permissions/',
+        columns: [
+          {
+            prop: 'name',
+            label: this.$t('perms.name'),
+            formatter: DetailFormatter,
+            sortable: true,
+            route: 'DatabaseAppPermissionDetail'
+          },
+          {
+            prop: 'users',
+            label: this.$t('perms.user')
+          },
+          {
+            prop: 'user_groups',
+            label: this.$t('perms.userGroup')
+          },
+          {
+            prop: 'database_apps',
+            label: this.$t('perms.DatabaseApp')
+          },
+          {
+            prop: 'system_users',
+            label: this.$t('perms.systemUser')
+          },
+          {
+            prop: 'is_valid',
+            label: this.$t('perms.validity')
+          }
+        ],
+        tableActions: {
+          hasEdit: true,
+          editRoute: '404'
+        }
+      },
+      headerActions: {
+        hasDelete: false,
+        hasUpdate: false,
+        createRoute: 'DatabaseAppPermissionCreate'
+      }
+    }
+  }
+}
+</script>
+
+<style>
+
+</style>
diff --git a/src/views/perms/RemoteAppPermissionList.vue b/src/views/perms/RemoteAppPermissionList.vue
new file mode 100644
index 000000000..fe6291070
--- /dev/null
+++ b/src/views/perms/RemoteAppPermissionList.vue
@@ -0,0 +1,64 @@
+<template>
+  <GenericListPage :table-config="tableConfig" :header-actions="headerActions" />
+</template>
+
+<script>
+import { GenericListPage } from '@/layout/components'
+import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
+
+export default {
+  components: {
+    GenericListPage
+  },
+  data() {
+    return {
+      showTree: true,
+      tableConfig: {
+        url: '/api/v1/perms/remote-app-permissions/',
+        columns: [
+          {
+            prop: 'name',
+            label: this.$t('perms.name'),
+            formatter: DetailFormatter,
+            sortable: true,
+            route: 'RemoteAppPermissionDetail'
+          },
+          {
+            prop: 'users',
+            label: this.$t('perms.user')
+          },
+          {
+            prop: 'user_groups',
+            label: this.$t('perms.userGroup')
+          },
+          {
+            prop: 'remote_apps',
+            label: this.$t('perms.RemoteApp')
+          },
+          {
+            prop: 'system_users',
+            label: this.$t('perms.systemUser')
+          },
+          {
+            prop: 'is_valid',
+            label: this.$t('perms.validity')
+          }
+        ],
+        tableActions: {
+          hasEdit: true,
+          editRoute: '404'
+        }
+      },
+      headerActions: {
+        hasDelete: false,
+        hasUpdate: false,
+        createRoute: 'RemoteAppPermissionCreate'
+      }
+    }
+  }
+}
+</script>
+
+<style>
+
+</style>

From 6729defb1e23fa55de2d728a398ae27d8085e520 Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Thu, 2 Apr 2020 17:12:06 +0800
Subject: [PATCH 10/26] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E7=BF=BB?=
 =?UTF-8?q?=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/langs/cn.js b/src/i18n/langs/cn.js
index d148d8504..305b250d1 100644
--- a/src/i18n/langs/cn.js
+++ b/src/i18n/langs/cn.js
@@ -322,7 +322,7 @@ const cn = {
     'update_remote_app_permission': '更新远程应用授权规则',
     'remote_app_count': '远程应用数量',
     //
-    'DatabaseaApp': '数据库应用',
+    'DatabaseApp': '数据库应用',
     'database_app_permission_list': '数据库应用授权列表',
     'database_app_permission_detail': '数据库应用授权详情',
     'create_database_app_permission': '创建数据库应用授权规则',

From 45dcb1e9f5823384a73d564f4f0e99c0fc46536e Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Thu, 2 Apr 2020 18:07:26 +0800
Subject: [PATCH 11/26] =?UTF-8?q?[Update]=20=E5=A2=9E=E5=8A=A0=E5=9C=A8?=
 =?UTF-8?q?=E7=BA=BF=E4=BC=9A=E8=AF=9D=E5=92=8C=E5=8E=86=E5=8F=B2=E4=BC=9A?=
 =?UTF-8?q?=E8=AF=9D=E5=88=97=E8=A1=A8=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.js                      |  8 +--
 src/router/index.js                       |  4 +-
 src/views/sessions/SessionOfflineList.vue | 82 +++++++++++++++++++++++
 src/views/sessions/SessionOnlineList.vue  | 81 ++++++++++++++++++++++
 4 files changed, 169 insertions(+), 6 deletions(-)
 create mode 100644 src/views/sessions/SessionOfflineList.vue
 create mode 100644 src/views/sessions/SessionOnlineList.vue

diff --git a/src/i18n/langs/cn.js b/src/i18n/langs/cn.js
index 305b250d1..ac17643df 100644
--- a/src/i18n/langs/cn.js
+++ b/src/i18n/langs/cn.js
@@ -336,12 +336,12 @@ const cn = {
     'id': 'ID',
     'user': '用户',
     'asset': '资产',
-    'system_user': '系统用户',
-    'remote_addr': '远端地址',
+    'systemUser': '系统用户',
+    'remoteAddr': '远端地址',
     'protocol': '协议',
-    'login_form': '登录来源',
+    'loginForm': '登录来源',
     'command': '命令',
-    'date_start': '开始日期',
+    'dateStart': '开始日期',
     'duration': '时长',
     'action': '动作',
     'search': '搜索',
diff --git a/src/router/index.js b/src/router/index.js
index f228e8c08..71aa8a490 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -224,13 +224,13 @@ export const constantRoutes = [
       {
         path: 'session-online',
         name: 'SessionOnlineList',
-        component: () => import('@/views/tree/index'),
+        component: () => import('@/views/sessions/SessionOnlineList'),
         meta: { title: 'SessionOnline' }
       },
       {
         path: 'session-offline',
         name: 'SessionOfflineList',
-        component: () => import('@/views/tree/index'),
+        component: () => import('@/views/sessions/SessionOfflineList'),
         meta: { title: 'SessionOffline' }
       },
       {
diff --git a/src/views/sessions/SessionOfflineList.vue b/src/views/sessions/SessionOfflineList.vue
new file mode 100644
index 000000000..784aef657
--- /dev/null
+++ b/src/views/sessions/SessionOfflineList.vue
@@ -0,0 +1,82 @@
+<template>
+  <GenericListPage :table-config="tableConfig" :header-actions="headerActions" />
+</template>
+
+<script>
+import { GenericListPage } from '@/layout/components'
+// import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
+
+export default {
+  components: {
+    GenericListPage
+  },
+  data() {
+    return {
+      showTree: true,
+      tableConfig: {
+        axiosConfig: {
+          raw: 1,
+          params: {
+            display: 1,
+            is_finished: 1
+          }
+        },
+        url: '/api/v1/terminal/sessions/',
+        columns: [
+          { type: 'index' },
+          {
+            prop: 'user',
+            label: this.$t('sessions.user'),
+            sortable: true
+          },
+          {
+            prop: 'asset',
+            label: this.$t('sessions.asset')
+          },
+          {
+            prop: 'system_user',
+            label: this.$t('sessions.systemUser')
+          },
+          {
+            prop: 'remote_addr',
+            label: this.$t('sessions.remoteAddr')
+          },
+          {
+            prop: 'protocol',
+            label: this.$t('sessions.protocol')
+          },
+          {
+            prop: 'login_from_display',
+            label: this.$t('sessions.loginForm')
+          },
+          {
+            prop: 'command',
+            label: this.$t('sessions.command')
+          },
+          {
+            prop: 'date_start',
+            label: this.$t('sessions.dateStart')
+          },
+          {
+            prop: 'duration',
+            label: this.$t('sessions.duration')
+          }
+        ],
+        tableActions: {
+          hasEdit: false,
+          hadDelete: false
+        }
+      },
+      headerActions: {
+        hasCreate: false,
+        hasDelete: false,
+        hasUpdate: false
+      }
+    }
+  }
+}
+</script>
+
+<style>
+
+</style>
diff --git a/src/views/sessions/SessionOnlineList.vue b/src/views/sessions/SessionOnlineList.vue
new file mode 100644
index 000000000..39a8d7b5b
--- /dev/null
+++ b/src/views/sessions/SessionOnlineList.vue
@@ -0,0 +1,81 @@
+<template>
+  <GenericListPage :table-config="tableConfig" :header-actions="headerActions" />
+</template>
+
+<script>
+import { GenericListPage } from '@/layout/components'
+// import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
+
+export default {
+  components: {
+    GenericListPage
+  },
+  data() {
+    return {
+      showTree: true,
+      tableConfig: {
+        axiosConfig: {
+          raw: 1,
+          params: {
+            display: 1,
+            is_finished: 0
+          }
+        },
+        url: '/api/v1/terminal/sessions/',
+        columns: [
+          {
+            prop: 'user',
+            label: this.$t('sessions.user'),
+            sortable: true
+          },
+          {
+            prop: 'asset',
+            label: this.$t('sessions.asset')
+          },
+          {
+            prop: 'system_user',
+            label: this.$t('sessions.systemUser')
+          },
+          {
+            prop: 'remote_addr',
+            label: this.$t('sessions.remoteAddr')
+          },
+          {
+            prop: 'protocol',
+            label: this.$t('sessions.protocol')
+          },
+          {
+            prop: 'login_from_display',
+            label: this.$t('sessions.loginForm')
+          },
+          {
+            prop: 'command',
+            label: this.$t('sessions.command')
+          },
+          {
+            prop: 'date_start',
+            label: this.$t('sessions.dateStart')
+          },
+          {
+            prop: 'duration',
+            label: this.$t('sessions.duration')
+          }
+        ],
+        tableActions: {
+          hasEdit: false,
+          hadDelete: false
+        }
+      },
+      headerActions: {
+        hasCreate: false,
+        hasDelete: false,
+        hasUpdate: false
+      }
+    }
+  }
+}
+</script>
+
+<style>
+
+</style>

From 36af2d0ea8db8bfaf972adb8c78673e641662d64 Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Thu, 2 Apr 2020 18:15:54 +0800
Subject: [PATCH 12/26] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E4=BC=9A?=
 =?UTF-8?q?=E8=AF=9D=E5=88=97=E8=A1=A8=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.js                      |  4 +++-
 src/views/sessions/SessionOfflineList.vue | 26 ++++++++++++++++++++---
 src/views/sessions/SessionOnlineList.vue  | 14 ++++++++++--
 3 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/src/i18n/langs/cn.js b/src/i18n/langs/cn.js
index ac17643df..5d74acc5f 100644
--- a/src/i18n/langs/cn.js
+++ b/src/i18n/langs/cn.js
@@ -354,7 +354,9 @@ const cn = {
     'quick_modify': '快速修改',
     'terminate_session': '终止会话',
     'confirm': '确认',
-    'commands': '命令记录'
+    'commands': '命令记录',
+    'replay': '回放',
+    'download': '下载'
   },
   setting: {
     'setting': '系统设置',
diff --git a/src/views/sessions/SessionOfflineList.vue b/src/views/sessions/SessionOfflineList.vue
index 784aef657..a339325d5 100644
--- a/src/views/sessions/SessionOfflineList.vue
+++ b/src/views/sessions/SessionOfflineList.vue
@@ -23,7 +23,10 @@ export default {
         },
         url: '/api/v1/terminal/sessions/',
         columns: [
-          { type: 'index' },
+          {
+            label: this.$t('sessions.id'),
+            type: 'index'
+          },
           {
             prop: 'user',
             label: this.$t('sessions.user'),
@@ -64,8 +67,25 @@ export default {
         ],
         tableActions: {
           hasEdit: false,
-          hadDelete: false
-        }
+          hasDelete: false
+        },
+        extraButtons: [
+          {
+            type: 'warning',
+            text: this.$t('sessions.replay'),
+            // 必须使用箭头函数
+            atClick: (row) => {
+              this.$router.push({ name: '404' })
+            }
+          },
+          {
+            type: 'primary',
+            text: this.$t('sessions.download'),
+            atClick: (row) => {
+              this.$router.push({ name: '404' })
+            }
+          }
+        ]
       },
       headerActions: {
         hasCreate: false,
diff --git a/src/views/sessions/SessionOnlineList.vue b/src/views/sessions/SessionOnlineList.vue
index 39a8d7b5b..9002191ad 100644
--- a/src/views/sessions/SessionOnlineList.vue
+++ b/src/views/sessions/SessionOnlineList.vue
@@ -63,8 +63,18 @@ export default {
         ],
         tableActions: {
           hasEdit: false,
-          hadDelete: false
-        }
+          hasDelete: false
+        },
+        extraButtons: [
+          {
+            type: 'danger',
+            text: this.$t('sessions.terminate'),
+            // 必须使用箭头函数
+            atClick: (row) => {
+              this.$router.push({ name: '404' })
+            }
+          }
+        ]
       },
       headerActions: {
         hasCreate: false,

From 904100cadd7c334f3725706a49e8a8cdd95a8505 Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Fri, 3 Apr 2020 10:24:18 +0800
Subject: [PATCH 13/26] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=BB=84=E4=BB=B6=E7=9A=84=E9=BB=98=E8=AE=A4=E5=A4=8D?=
 =?UTF-8?q?=E9=80=89=E6=A1=86=E5=AF=B9=E5=85=B6=E5=B1=9E=E6=80=A7=E4=B8=BA?=
 =?UTF-8?q?selectionAlign?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataTable/compenents/el-data-table/el-data-table.vue    | 6 +++++-
 src/views/sessions/SessionOnlineList.vue                    | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/DataTable/compenents/el-data-table/el-data-table.vue b/src/components/DataTable/compenents/el-data-table/el-data-table.vue
index c375ead5f..72a3e0aa7 100644
--- a/src/components/DataTable/compenents/el-data-table/el-data-table.vue
+++ b/src/components/DataTable/compenents/el-data-table/el-data-table.vue
@@ -90,7 +90,7 @@
 
         <!--非树-->
         <template v-else>
-          <el-data-table-column v-if="hasSelection" type="selection" :align="columnsAlign"></el-data-table-column>
+          <el-data-table-column v-if="hasSelection" type="selection" :align="selectionAlign"></el-data-table-column>
           <el-data-table-column
             v-for="col in columns"
             :key="col.prop"
@@ -759,6 +759,10 @@ export default {
       type: String,
       default: 'center'
     },
+    selectionAlign: {
+      type: String,
+      default: 'center'
+    },
     paginationBackground: {
       type: Boolean,
       default: true
diff --git a/src/views/sessions/SessionOnlineList.vue b/src/views/sessions/SessionOnlineList.vue
index 9002191ad..e43345cd7 100644
--- a/src/views/sessions/SessionOnlineList.vue
+++ b/src/views/sessions/SessionOnlineList.vue
@@ -23,6 +23,10 @@ export default {
         },
         url: '/api/v1/terminal/sessions/',
         columns: [
+          {
+            label: this.$t('sessions.id'),
+            type: 'index'
+          },
           {
             prop: 'user',
             label: this.$t('sessions.user'),

From 7ce614d72ed35db22ba8d41f94f7197f50140134 Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Fri, 3 Apr 2020 12:04:02 +0800
Subject: [PATCH 14/26] =?UTF-8?q?[Update]=20=E5=A2=9E=E5=8A=A0=E5=91=BD?=
 =?UTF-8?q?=E4=BB=A4=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E5=8E=BB=E6=8E=89=E4=B8=80=E4=BA=9B=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=9A=E4=BD=99=E7=9A=84=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.js                          | 17 +---
 src/router/index.js                           |  4 +-
 src/views/applications/DatabaseAppList.vue    |  1 -
 src/views/applications/RemoteAppList.vue      |  1 -
 src/views/assets/AssetList.vue                |  1 -
 src/views/assets/CommandFilterList.vue        |  1 -
 src/views/assets/DomainList.vue               |  1 -
 src/views/assets/LabelList.vue                |  1 -
 src/views/assets/PlatformList.vue             |  1 -
 src/views/perms/AssetPermissionList.vue       |  1 -
 src/views/perms/DatabaseAppPermissionList.vue |  1 -
 src/views/perms/RemoteAppPermissionList.vue   |  1 -
 src/views/sessions/CommandList.vue            | 82 +++++++++++++++++++
 src/views/sessions/SessionOfflineList.vue     |  1 -
 src/views/sessions/SessionOnlineList.vue      |  1 -
 15 files changed, 88 insertions(+), 27 deletions(-)
 create mode 100644 src/views/sessions/CommandList.vue

diff --git a/src/i18n/langs/cn.js b/src/i18n/langs/cn.js
index 5d74acc5f..2d038dbe6 100644
--- a/src/i18n/langs/cn.js
+++ b/src/i18n/langs/cn.js
@@ -330,9 +330,6 @@ const cn = {
     'database_app_count': '数据库应用数量'
   },
   sessions: {
-    'session_online': '在线会话',
-    'session_online_list': '在线会话',
-    'session_detail': '会话详情',
     'id': 'ID',
     'user': '用户',
     'asset': '资产',
@@ -343,20 +340,14 @@ const cn = {
     'command': '命令',
     'dateStart': '开始日期',
     'duration': '时长',
-    'action': '动作',
-    'search': '搜索',
-    'terminate_selected': '终断所选',
-    'confirm_finished': '确认已完成',
-    'submit': '提交',
     'terminate': '终断',
-    'command_list': '命令记录列表',
     'date_end': '结束日期',
-    'quick_modify': '快速修改',
-    'terminate_session': '终止会话',
-    'confirm': '确认',
     'commands': '命令记录',
     'replay': '回放',
-    'download': '下载'
+    'download': '下载',
+    'RiskLevel': '风险等级',
+    'session': '会话',
+    'date': '日期'
   },
   setting: {
     'setting': '系统设置',
diff --git a/src/router/index.js b/src/router/index.js
index 71aa8a490..eab5c3513 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -235,8 +235,8 @@ export const constantRoutes = [
       },
       {
         path: 'command',
-        name: 'CommandsList',
-        component: () => import('@/views/tree/index'),
+        name: 'CommandList',
+        component: () => import('@/views/sessions/CommandList'),
         meta: { title: 'Commands' }
       },
       {
diff --git a/src/views/applications/DatabaseAppList.vue b/src/views/applications/DatabaseAppList.vue
index fa47350ed..c8df7d6d5 100644
--- a/src/views/applications/DatabaseAppList.vue
+++ b/src/views/applications/DatabaseAppList.vue
@@ -12,7 +12,6 @@ export default {
   },
   data() {
     return {
-      showTree: true,
       tableConfig: {
         url: '/api/v1/applications/database-apps/',
         columns: [
diff --git a/src/views/applications/RemoteAppList.vue b/src/views/applications/RemoteAppList.vue
index c959291c0..98c5f70fb 100644
--- a/src/views/applications/RemoteAppList.vue
+++ b/src/views/applications/RemoteAppList.vue
@@ -12,7 +12,6 @@ export default {
   },
   data() {
     return {
-      showTree: true,
       tableConfig: {
         url: '/api/v1/applications/remote-apps/',
         columns: [
diff --git a/src/views/assets/AssetList.vue b/src/views/assets/AssetList.vue
index cb2a98d69..152cdfff4 100644
--- a/src/views/assets/AssetList.vue
+++ b/src/views/assets/AssetList.vue
@@ -12,7 +12,6 @@ export default {
   },
   data() {
     return {
-      showTree: true,
       tableConfig: {
         url: '/api/v1/assets/assets/',
         columns: [
diff --git a/src/views/assets/CommandFilterList.vue b/src/views/assets/CommandFilterList.vue
index 1d8dea975..34f00c74a 100644
--- a/src/views/assets/CommandFilterList.vue
+++ b/src/views/assets/CommandFilterList.vue
@@ -12,7 +12,6 @@ export default {
   },
   data() {
     return {
-      showTree: true,
       tableConfig: {
         url: '/api/v1/assets/cmd-filters/',
         columns: [
diff --git a/src/views/assets/DomainList.vue b/src/views/assets/DomainList.vue
index 34c2fb687..255cfad64 100644
--- a/src/views/assets/DomainList.vue
+++ b/src/views/assets/DomainList.vue
@@ -12,7 +12,6 @@ export default {
   },
   data() {
     return {
-      showTree: true,
       tableConfig: {
         url: '/api/v1/assets/domains/',
         columns: [
diff --git a/src/views/assets/LabelList.vue b/src/views/assets/LabelList.vue
index 82a7360c4..ed0b18d15 100644
--- a/src/views/assets/LabelList.vue
+++ b/src/views/assets/LabelList.vue
@@ -12,7 +12,6 @@ export default {
   },
   data() {
     return {
-      showTree: true,
       tableConfig: {
         url: '/api/v1/assets/labels/',
         columns: [
diff --git a/src/views/assets/PlatformList.vue b/src/views/assets/PlatformList.vue
index 8945b8c6e..20b2ca5ed 100644
--- a/src/views/assets/PlatformList.vue
+++ b/src/views/assets/PlatformList.vue
@@ -12,7 +12,6 @@ export default {
   },
   data() {
     return {
-      showTree: true,
       tableConfig: {
         url: '/api/v1/assets/platforms/',
         columns: [
diff --git a/src/views/perms/AssetPermissionList.vue b/src/views/perms/AssetPermissionList.vue
index 9f81d835e..6853931fc 100644
--- a/src/views/perms/AssetPermissionList.vue
+++ b/src/views/perms/AssetPermissionList.vue
@@ -12,7 +12,6 @@ export default {
   },
   data() {
     return {
-      showTree: true,
       tableConfig: {
         url: '/api/v1/perms/asset-permissions/',
         columns: [
diff --git a/src/views/perms/DatabaseAppPermissionList.vue b/src/views/perms/DatabaseAppPermissionList.vue
index 8b5581ccf..79d2b4535 100644
--- a/src/views/perms/DatabaseAppPermissionList.vue
+++ b/src/views/perms/DatabaseAppPermissionList.vue
@@ -12,7 +12,6 @@ export default {
   },
   data() {
     return {
-      showTree: true,
       tableConfig: {
         url: '/api/v1/perms/database-app-permissions/',
         columns: [
diff --git a/src/views/perms/RemoteAppPermissionList.vue b/src/views/perms/RemoteAppPermissionList.vue
index fe6291070..6447d58ff 100644
--- a/src/views/perms/RemoteAppPermissionList.vue
+++ b/src/views/perms/RemoteAppPermissionList.vue
@@ -12,7 +12,6 @@ export default {
   },
   data() {
     return {
-      showTree: true,
       tableConfig: {
         url: '/api/v1/perms/remote-app-permissions/',
         columns: [
diff --git a/src/views/sessions/CommandList.vue b/src/views/sessions/CommandList.vue
new file mode 100644
index 000000000..4a731e12a
--- /dev/null
+++ b/src/views/sessions/CommandList.vue
@@ -0,0 +1,82 @@
+<template>
+  <GenericListPage :table-config="tableConfig" :header-actions="headerActions" />
+</template>
+
+<script>
+import { GenericListPage } from '@/layout/components'
+// import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
+
+export default {
+  components: {
+    GenericListPage
+  },
+  data() {
+    return {
+      tableConfig: {
+        axiosConfig: {
+          raw: 1,
+          params: {
+            display: 1,
+            is_finished: 0
+          }
+        },
+        hasSelection: false,
+        hasOperation: false,
+        url: '/api/v1/terminal/commands/',
+        columns: [
+          {
+            type: 'expand'
+          },
+          {
+            prop: 'input',
+            label: this.$t('sessions.command')
+          },
+          {
+            prop: 'output',
+            label: '命令输出结果 (怎么放到隐藏内容 ？？)',
+            expand: true
+          },
+          {
+            prop: 'risk_level',
+            label: this.$t('sessions.RiskLevel')
+          },
+          {
+            prop: 'user',
+            label: this.$t('sessions.user'),
+            sortable: true
+          },
+          {
+            prop: 'asset',
+            label: this.$t('sessions.asset')
+          },
+          {
+            prop: 'system_user',
+            label: this.$t('sessions.systemUser')
+          },
+          {
+            prop: 'session',
+            label: this.$t('sessions.session')
+          },
+          {
+            prop: 'timestamp',
+            label: this.$t('sessions.date')
+          }
+        ],
+        tableActions: {
+          hasEdit: false,
+          hasDelete: false
+        }
+      },
+      headerActions: {
+        hasCreate: false,
+        hasDelete: false,
+        hasUpdate: false
+      }
+    }
+  }
+}
+</script>
+
+<style>
+
+</style>
diff --git a/src/views/sessions/SessionOfflineList.vue b/src/views/sessions/SessionOfflineList.vue
index a339325d5..08237b325 100644
--- a/src/views/sessions/SessionOfflineList.vue
+++ b/src/views/sessions/SessionOfflineList.vue
@@ -12,7 +12,6 @@ export default {
   },
   data() {
     return {
-      showTree: true,
       tableConfig: {
         axiosConfig: {
           raw: 1,
diff --git a/src/views/sessions/SessionOnlineList.vue b/src/views/sessions/SessionOnlineList.vue
index e43345cd7..1a0ffd04d 100644
--- a/src/views/sessions/SessionOnlineList.vue
+++ b/src/views/sessions/SessionOnlineList.vue
@@ -12,7 +12,6 @@ export default {
   },
   data() {
     return {
-      showTree: true,
       tableConfig: {
         axiosConfig: {
           raw: 1,

From 8cffa2a3e8043d3afdaf50e2e5b121e50fcd728a Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Fri, 3 Apr 2020 12:42:16 +0800
Subject: [PATCH 15/26] =?UTF-8?q?[Update]=20=E5=A2=9E=E5=8A=A0=E7=BB=88?=
 =?UTF-8?q?=E7=AB=AF=E7=AE=A1=E7=90=86=E5=88=97=E8=A1=A8=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.js                |  5 ++-
 src/router/index.js                 |  2 +-
 src/views/sessions/TerminalList.vue | 67 +++++++++++++++++++++++++++++
 3 files changed, 72 insertions(+), 2 deletions(-)
 create mode 100644 src/views/sessions/TerminalList.vue

diff --git a/src/i18n/langs/cn.js b/src/i18n/langs/cn.js
index 2d038dbe6..c64b3c6f1 100644
--- a/src/i18n/langs/cn.js
+++ b/src/i18n/langs/cn.js
@@ -347,7 +347,10 @@ const cn = {
     'download': '下载',
     'RiskLevel': '风险等级',
     'session': '会话',
-    'date': '日期'
+    'date': '日期',
+    'addr': '地址',
+    'active': '激活中',
+    'alive': '在线'
   },
   setting: {
     'setting': '系统设置',
diff --git a/src/router/index.js b/src/router/index.js
index eab5c3513..a1775fa52 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -254,7 +254,7 @@ export const constantRoutes = [
       {
         path: 'terminal',
         name: 'TerminalList',
-        component: () => import('@/views/tree/index'),
+        component: () => import('@/views/sessions/TerminalList'),
         meta: { title: 'Terminal' }
       }
     ]
diff --git a/src/views/sessions/TerminalList.vue b/src/views/sessions/TerminalList.vue
new file mode 100644
index 000000000..a01de8162
--- /dev/null
+++ b/src/views/sessions/TerminalList.vue
@@ -0,0 +1,67 @@
+<template>
+  <GenericListPage :table-config="tableConfig" :header-actions="headerActions" />
+</template>
+
+<script>
+import { GenericListPage } from '@/layout/components'
+import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
+
+export default {
+  components: {
+    GenericListPage
+  },
+  data() {
+    return {
+      tableConfig: {
+        axiosConfig: {
+          raw: 1,
+          params: {
+            display: 1,
+            is_finished: 0
+          }
+        },
+        url: '/api/v1/terminal/terminals/',
+        columns: [
+          {
+            prop: 'name',
+            label: this.$tc('Name'),
+            key: 'name',
+            formatter: DetailFormatter,
+            sortable: true,
+            route: 'TerminalDetail'
+          },
+          {
+            prop: 'remote_addr',
+            label: this.$t('sessions.addr')
+          },
+          {
+            prop: 'session_online',
+            label: this.$t('sessions.session'),
+            sortable: true
+          },
+          {
+            prop: 'is_active',
+            label: this.$t('sessions.active')
+          },
+          {
+            prop: 'is_alive',
+            label: this.$t('sessions.alive')
+          }
+        ],
+        tableActions: {
+          editRoute: '404'
+        }
+      },
+      headerActions: {
+        hasCreate: true,
+        hasDelete: false,
+        hasUpdate: false
+      }
+    }
+  }
+}
+</script>
+
+<style>
+
+</style>

From 5d0f221f929bb312083c44c728ab02b7594926f7 Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Fri, 3 Apr 2020 15:04:56 +0800
Subject: [PATCH 16/26] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=BB=84=E4=BB=B6=E7=9A=84=E6=93=8D=E4=BD=9C=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/applications/DatabaseAppList.vue    | 32 ++++++++++++++++-
 src/views/applications/RemoteAppList.vue      | 32 ++++++++++++++++-
 src/views/assets/AdminUserList.vue            | 32 ++++++++++++++++-
 src/views/assets/AssetList.vue                | 34 +++++++++++++++++--
 src/views/assets/CommandFilterList.vue        | 32 ++++++++++++++++-
 src/views/assets/DomainList.vue               | 32 ++++++++++++++++-
 src/views/assets/LabelList.vue                | 32 ++++++++++++++++-
 src/views/assets/PlatformList.vue             | 32 ++++++++++++++++-
 src/views/assets/SystemUserList.vue           | 32 ++++++++++++++++-
 src/views/perms/AssetPermissionList.vue       | 32 ++++++++++++++++-
 src/views/perms/DatabaseAppPermissionList.vue | 32 ++++++++++++++++-
 src/views/perms/RemoteAppPermissionList.vue   | 32 ++++++++++++++++-
 12 files changed, 373 insertions(+), 13 deletions(-)

diff --git a/src/views/applications/DatabaseAppList.vue b/src/views/applications/DatabaseAppList.vue
index c8df7d6d5..cff77a5f1 100644
--- a/src/views/applications/DatabaseAppList.vue
+++ b/src/views/applications/DatabaseAppList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
+import { DetailFormatter, ActionsFormatter } from '@/components/DataTable/formatters/index'
 
 export default {
   components: {
@@ -41,6 +41,36 @@ export default {
           {
             prop: 'comment',
             label: this.$t('applications.comment')
+          },
+          {
+            prop: 'id',
+            label: this.$tc('Action'),
+            align: 'center',
+            formatter: ActionsFormatter,
+            actions: {
+              hasUpdate: (row, cellValue) => {
+                return true
+              },
+              canUpdate: (row, cellValue) => {
+                console.log('On table update')
+                return true
+              },
+              hasDelete: true,
+              canDelete: (row, cellValue) => {
+                return true
+              },
+              onDelete: (row, cellValue) => {
+                this.$confirm('你好啊', '提示', {
+                  type: 'warning',
+                  confirmButtonClass: 'el-button--danger',
+                  beforeClose: async(action, instance, done) => {
+                  }
+                }).catch(() => {
+                  /* 取消*/
+                })
+              },
+              order: []
+            }
           }
         ],
         tableActions: {
diff --git a/src/views/applications/RemoteAppList.vue b/src/views/applications/RemoteAppList.vue
index 98c5f70fb..1008101b9 100644
--- a/src/views/applications/RemoteAppList.vue
+++ b/src/views/applications/RemoteAppList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
+import { DetailFormatter, ActionsFormatter } from '@/components/DataTable/formatters/index'
 
 export default {
   components: {
@@ -33,6 +33,36 @@ export default {
           {
             prop: 'comment',
             label: this.$t('applications.comment')
+          },
+          {
+            prop: 'id',
+            label: this.$tc('Action'),
+            align: 'center',
+            formatter: ActionsFormatter,
+            actions: {
+              hasUpdate: (row, cellValue) => {
+                return true
+              },
+              canUpdate: (row, cellValue) => {
+                console.log('On table update')
+                return true
+              },
+              hasDelete: true,
+              canDelete: (row, cellValue) => {
+                return true
+              },
+              onDelete: (row, cellValue) => {
+                this.$confirm('你好啊', '提示', {
+                  type: 'warning',
+                  confirmButtonClass: 'el-button--danger',
+                  beforeClose: async(action, instance, done) => {
+                  }
+                }).catch(() => {
+                  /* 取消*/
+                })
+              },
+              order: []
+            }
           }
         ],
         tableActions: {
diff --git a/src/views/assets/AdminUserList.vue b/src/views/assets/AdminUserList.vue
index 60152ee5a..3ad1296e5 100644
--- a/src/views/assets/AdminUserList.vue
+++ b/src/views/assets/AdminUserList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
+import { DetailFormatter, ActionsFormatter } from '@/components/DataTable/formatters/index'
 
 export default {
   components: {
@@ -33,6 +33,36 @@ export default {
           {
             prop: 'comment',
             label: this.$t('assets.comment')
+          },
+          {
+            prop: 'id',
+            label: this.$tc('Action'),
+            align: 'center',
+            formatter: ActionsFormatter,
+            actions: {
+              hasUpdate: (row, cellValue) => {
+                return true
+              },
+              canUpdate: (row, cellValue) => {
+                console.log('On table update')
+                return true
+              },
+              hasDelete: true,
+              canDelete: (row, cellValue) => {
+                return true
+              },
+              onDelete: (row, cellValue) => {
+                this.$confirm('你好啊', '提示', {
+                  type: 'warning',
+                  confirmButtonClass: 'el-button--danger',
+                  beforeClose: async(action, instance, done) => {
+                  }
+                }).catch(() => {
+                  /* 取消*/
+                })
+              },
+              order: []
+            }
           }
         ],
         tableActions: {
diff --git a/src/views/assets/AssetList.vue b/src/views/assets/AssetList.vue
index 152cdfff4..ec4198a9d 100644
--- a/src/views/assets/AssetList.vue
+++ b/src/views/assets/AssetList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
+import { DetailFormatter, ActionsFormatter } from '@/components/DataTable/formatters/index'
 
 export default {
   components: {
@@ -33,10 +33,40 @@ export default {
           {
             prop: 'reachable',
             label: this.$t('assets.reachable')
+          },
+          {
+            prop: 'id',
+            label: this.$tc('Action'),
+            align: 'center',
+            formatter: ActionsFormatter,
+            actions: {
+              hasUpdate: (row, cellValue) => {
+                return true
+              },
+              canUpdate: (row, cellValue) => {
+                console.log('On table update')
+                return true
+              },
+              hasDelete: true,
+              canDelete: (row, cellValue) => {
+                return true
+              },
+              onDelete: (row, cellValue) => {
+                this.$confirm('你好啊', '提示', {
+                  type: 'warning',
+                  confirmButtonClass: 'el-button--danger',
+                  beforeClose: async(action, instance, done) => {
+                  }
+                }).catch(() => {
+                  /* 取消*/
+                })
+              },
+              order: []
+            }
           }
         ],
         tableActions: {
-          hasEdit: true,
+          // hasEdit: true,
           editRoute: '404'
         }
       },
diff --git a/src/views/assets/CommandFilterList.vue b/src/views/assets/CommandFilterList.vue
index 34f00c74a..b0a0ecf95 100644
--- a/src/views/assets/CommandFilterList.vue
+++ b/src/views/assets/CommandFilterList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
+import { DetailFormatter, ActionsFormatter } from '@/components/DataTable/formatters/index'
 
 export default {
   components: {
@@ -33,6 +33,36 @@ export default {
           {
             prop: 'comment',
             label: this.$t('assets.comment')
+          },
+          {
+            prop: 'id',
+            label: this.$tc('Action'),
+            align: 'center',
+            formatter: ActionsFormatter,
+            actions: {
+              hasUpdate: (row, cellValue) => {
+                return true
+              },
+              canUpdate: (row, cellValue) => {
+                console.log('On table update')
+                return true
+              },
+              hasDelete: true,
+              canDelete: (row, cellValue) => {
+                return true
+              },
+              onDelete: (row, cellValue) => {
+                this.$confirm('你好啊', '提示', {
+                  type: 'warning',
+                  confirmButtonClass: 'el-button--danger',
+                  beforeClose: async(action, instance, done) => {
+                  }
+                }).catch(() => {
+                  /* 取消*/
+                })
+              },
+              order: []
+            }
           }
         ],
         tableActions: {
diff --git a/src/views/assets/DomainList.vue b/src/views/assets/DomainList.vue
index 255cfad64..f9c65455d 100644
--- a/src/views/assets/DomainList.vue
+++ b/src/views/assets/DomainList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
+import { DetailFormatter, ActionsFormatter } from '@/components/DataTable/formatters/index'
 
 export default {
   components: {
@@ -33,6 +33,36 @@ export default {
           {
             prop: 'comment',
             label: this.$t('assets.comment')
+          },
+          {
+            prop: 'id',
+            label: this.$tc('Action'),
+            align: 'center',
+            formatter: ActionsFormatter,
+            actions: {
+              hasUpdate: (row, cellValue) => {
+                return true
+              },
+              canUpdate: (row, cellValue) => {
+                console.log('On table update')
+                return true
+              },
+              hasDelete: true,
+              canDelete: (row, cellValue) => {
+                return true
+              },
+              onDelete: (row, cellValue) => {
+                this.$confirm('你好啊', '提示', {
+                  type: 'warning',
+                  confirmButtonClass: 'el-button--danger',
+                  beforeClose: async(action, instance, done) => {
+                  }
+                }).catch(() => {
+                  /* 取消*/
+                })
+              },
+              order: []
+            }
           }
         ],
         tableActions: {
diff --git a/src/views/assets/LabelList.vue b/src/views/assets/LabelList.vue
index ed0b18d15..e2c614e60 100644
--- a/src/views/assets/LabelList.vue
+++ b/src/views/assets/LabelList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
+import { DetailFormatter, ActionsFormatter } from '@/components/DataTable/formatters/index'
 
 export default {
   components: {
@@ -29,6 +29,36 @@ export default {
           {
             prop: 'asset_count',
             label: this.$t('assets.asset')
+          },
+          {
+            prop: 'id',
+            label: this.$tc('Action'),
+            align: 'center',
+            formatter: ActionsFormatter,
+            actions: {
+              hasUpdate: (row, cellValue) => {
+                return true
+              },
+              canUpdate: (row, cellValue) => {
+                console.log('On table update')
+                return true
+              },
+              hasDelete: true,
+              canDelete: (row, cellValue) => {
+                return true
+              },
+              onDelete: (row, cellValue) => {
+                this.$confirm('你好啊', '提示', {
+                  type: 'warning',
+                  confirmButtonClass: 'el-button--danger',
+                  beforeClose: async(action, instance, done) => {
+                  }
+                }).catch(() => {
+                  /* 取消*/
+                })
+              },
+              order: []
+            }
           }
         ],
         tableActions: {
diff --git a/src/views/assets/PlatformList.vue b/src/views/assets/PlatformList.vue
index 20b2ca5ed..d6f34c468 100644
--- a/src/views/assets/PlatformList.vue
+++ b/src/views/assets/PlatformList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
+import { DetailFormatter, ActionsFormatter } from '@/components/DataTable/formatters/index'
 
 export default {
   components: {
@@ -29,6 +29,36 @@ export default {
           {
             prop: 'comment',
             label: this.$t('assets.comment')
+          },
+          {
+            prop: 'id',
+            label: this.$tc('Action'),
+            align: 'center',
+            formatter: ActionsFormatter,
+            actions: {
+              hasUpdate: (row, cellValue) => {
+                return true
+              },
+              canUpdate: (row, cellValue) => {
+                console.log('On table update')
+                return true
+              },
+              hasDelete: true,
+              canDelete: (row, cellValue) => {
+                return true
+              },
+              onDelete: (row, cellValue) => {
+                this.$confirm('你好啊', '提示', {
+                  type: 'warning',
+                  confirmButtonClass: 'el-button--danger',
+                  beforeClose: async(action, instance, done) => {
+                  }
+                }).catch(() => {
+                  /* 取消*/
+                })
+              },
+              order: []
+            }
           }
         ],
         tableActions: {
diff --git a/src/views/assets/SystemUserList.vue b/src/views/assets/SystemUserList.vue
index c9a160dcc..3d398c507 100644
--- a/src/views/assets/SystemUserList.vue
+++ b/src/views/assets/SystemUserList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
+import { DetailFormatter, ActionsFormatter } from '@/components/DataTable/formatters/index'
 
 export default {
   components: {
@@ -41,6 +41,36 @@ export default {
           {
             prop: 'comment',
             label: this.$t('assets.comment')
+          },
+          {
+            prop: 'id',
+            label: this.$tc('Action'),
+            align: 'center',
+            formatter: ActionsFormatter,
+            actions: {
+              hasUpdate: (row, cellValue) => {
+                return true
+              },
+              canUpdate: (row, cellValue) => {
+                console.log('On table update')
+                return true
+              },
+              hasDelete: true,
+              canDelete: (row, cellValue) => {
+                return true
+              },
+              onDelete: (row, cellValue) => {
+                this.$confirm('你好啊', '提示', {
+                  type: 'warning',
+                  confirmButtonClass: 'el-button--danger',
+                  beforeClose: async(action, instance, done) => {
+                  }
+                }).catch(() => {
+                  /* 取消*/
+                })
+              },
+              order: []
+            }
           }
         ],
         tableActions: {
diff --git a/src/views/perms/AssetPermissionList.vue b/src/views/perms/AssetPermissionList.vue
index 6853931fc..676ac486e 100644
--- a/src/views/perms/AssetPermissionList.vue
+++ b/src/views/perms/AssetPermissionList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
+import { DetailFormatter, ActionsFormatter } from '@/components/DataTable/formatters/index'
 
 export default {
   components: {
@@ -45,6 +45,36 @@ export default {
           {
             prop: 'is_active',
             label: this.$t('perms.validity')
+          },
+          {
+            prop: 'id',
+            label: this.$tc('Action'),
+            align: 'center',
+            formatter: ActionsFormatter,
+            actions: {
+              hasUpdate: (row, cellValue) => {
+                return true
+              },
+              canUpdate: (row, cellValue) => {
+                console.log('On table update')
+                return true
+              },
+              hasDelete: true,
+              canDelete: (row, cellValue) => {
+                return true
+              },
+              onDelete: (row, cellValue) => {
+                this.$confirm('你好啊', '提示', {
+                  type: 'warning',
+                  confirmButtonClass: 'el-button--danger',
+                  beforeClose: async(action, instance, done) => {
+                  }
+                }).catch(() => {
+                  /* 取消*/
+                })
+              },
+              order: []
+            }
           }
         ],
         tableActions: {
diff --git a/src/views/perms/DatabaseAppPermissionList.vue b/src/views/perms/DatabaseAppPermissionList.vue
index 79d2b4535..e57d5e0d4 100644
--- a/src/views/perms/DatabaseAppPermissionList.vue
+++ b/src/views/perms/DatabaseAppPermissionList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
+import { DetailFormatter, ActionsFormatter } from '@/components/DataTable/formatters/index'
 
 export default {
   components: {
@@ -41,6 +41,36 @@ export default {
           {
             prop: 'is_valid',
             label: this.$t('perms.validity')
+          },
+          {
+            prop: 'id',
+            label: this.$tc('Action'),
+            align: 'center',
+            formatter: ActionsFormatter,
+            actions: {
+              hasUpdate: (row, cellValue) => {
+                return true
+              },
+              canUpdate: (row, cellValue) => {
+                console.log('On table update')
+                return true
+              },
+              hasDelete: true,
+              canDelete: (row, cellValue) => {
+                return true
+              },
+              onDelete: (row, cellValue) => {
+                this.$confirm('你好啊', '提示', {
+                  type: 'warning',
+                  confirmButtonClass: 'el-button--danger',
+                  beforeClose: async(action, instance, done) => {
+                  }
+                }).catch(() => {
+                  /* 取消*/
+                })
+              },
+              order: []
+            }
           }
         ],
         tableActions: {
diff --git a/src/views/perms/RemoteAppPermissionList.vue b/src/views/perms/RemoteAppPermissionList.vue
index 6447d58ff..c630fd405 100644
--- a/src/views/perms/RemoteAppPermissionList.vue
+++ b/src/views/perms/RemoteAppPermissionList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
+import { DetailFormatter, ActionsFormatter } from '@/components/DataTable/formatters/index'
 
 export default {
   components: {
@@ -41,6 +41,36 @@ export default {
           {
             prop: 'is_valid',
             label: this.$t('perms.validity')
+          },
+          {
+            prop: 'id',
+            label: this.$tc('Action'),
+            align: 'center',
+            formatter: ActionsFormatter,
+            actions: {
+              hasUpdate: (row, cellValue) => {
+                return true
+              },
+              canUpdate: (row, cellValue) => {
+                console.log('On table update')
+                return true
+              },
+              hasDelete: true,
+              canDelete: (row, cellValue) => {
+                return true
+              },
+              onDelete: (row, cellValue) => {
+                this.$confirm('你好啊', '提示', {
+                  type: 'warning',
+                  confirmButtonClass: 'el-button--danger',
+                  beforeClose: async(action, instance, done) => {
+                  }
+                }).catch(() => {
+                  /* 取消*/
+                })
+              },
+              order: []
+            }
           }
         ],
         tableActions: {

From ffa21acfbaeb2001428d52ccdcd1805f476dd09b Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Fri, 3 Apr 2020 15:56:48 +0800
Subject: [PATCH 17/26] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E4=B8=80=E4=BA=9B=E5=AD=97=E6=AE=B5=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.js                          |  1 +
 src/views/applications/RemoteAppList.vue      |  3 ++-
 src/views/assets/AdminUserList.vue            |  2 +-
 src/views/assets/AssetList.vue                |  5 +++--
 src/views/assets/CommandFilterList.vue        |  6 +++--
 src/views/perms/AssetPermissionList.vue       | 22 +++++++++++++------
 src/views/perms/DatabaseAppPermissionList.vue | 19 +++++++++++-----
 src/views/perms/RemoteAppPermissionList.vue   | 19 +++++++++++-----
 8 files changed, 52 insertions(+), 25 deletions(-)

diff --git a/src/i18n/langs/cn.js b/src/i18n/langs/cn.js
index e25410c52..79aa99d1c 100644
--- a/src/i18n/langs/cn.js
+++ b/src/i18n/langs/cn.js
@@ -18,6 +18,7 @@ const cn = {
     'name': '名称',
     'Name': '名称',
     'action': '动作',
+    'Action': '动作',
     'role': '角色',
     'username': '用户名',
     'Language': '语言',
diff --git a/src/views/applications/RemoteAppList.vue b/src/views/applications/RemoteAppList.vue
index 1008101b9..1a60db3c2 100644
--- a/src/views/applications/RemoteAppList.vue
+++ b/src/views/applications/RemoteAppList.vue
@@ -28,7 +28,8 @@ export default {
           },
           {
             prop: 'asset_info',
-            label: this.$t('applications.asset')
+            label: this.$t('applications.asset'),
+            formatter: row => (<span>{row.asset_info.hostname}</span>)
           },
           {
             prop: 'comment',
diff --git a/src/views/assets/AdminUserList.vue b/src/views/assets/AdminUserList.vue
index 3ad1296e5..17a741a62 100644
--- a/src/views/assets/AdminUserList.vue
+++ b/src/views/assets/AdminUserList.vue
@@ -27,7 +27,7 @@ export default {
             label: this.$t('common.username')
           },
           {
-            prop: 'assets',
+            prop: 'assets_amount',
             label: this.$t('assets.asset')
           },
           {
diff --git a/src/views/assets/AssetList.vue b/src/views/assets/AssetList.vue
index ec4198a9d..88bceb516 100644
--- a/src/views/assets/AssetList.vue
+++ b/src/views/assets/AssetList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, ActionsFormatter } from '@/components/DataTable/formatters/index'
+import { DetailFormatter, ActionsFormatter, ChoicesFormatter } from '@/components/DataTable/formatters/index'
 
 export default {
   components: {
@@ -32,7 +32,8 @@ export default {
           },
           {
             prop: 'reachable',
-            label: this.$t('assets.reachable')
+            label: this.$t('assets.reachable'),
+            formatter: ChoicesFormatter
           },
           {
             prop: 'id',
diff --git a/src/views/assets/CommandFilterList.vue b/src/views/assets/CommandFilterList.vue
index b0a0ecf95..437ea4348 100644
--- a/src/views/assets/CommandFilterList.vue
+++ b/src/views/assets/CommandFilterList.vue
@@ -24,11 +24,13 @@ export default {
           },
           {
             prop: 'rules',
-            label: this.$t('assets.rules')
+            label: this.$t('assets.rules'),
+            formatter: row => (<span>{row.rules.length}</span>)
           },
           {
             prop: 'system_users',
-            label: this.$t('assets.systemUser')
+            label: this.$t('assets.systemUser'),
+            formatter: row => (<span>{row.system_users.length}</span>)
           },
           {
             prop: 'comment',
diff --git a/src/views/perms/AssetPermissionList.vue b/src/views/perms/AssetPermissionList.vue
index 676ac486e..ca276f9e9 100644
--- a/src/views/perms/AssetPermissionList.vue
+++ b/src/views/perms/AssetPermissionList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, ActionsFormatter } from '@/components/DataTable/formatters/index'
+import { DetailFormatter, ActionsFormatter, ChoicesFormatter } from '@/components/DataTable/formatters/index'
 
 export default {
   components: {
@@ -24,27 +24,35 @@ export default {
           },
           {
             prop: 'users',
-            label: this.$t('perms.user')
+            label: this.$t('perms.user'),
+            formatter: row => (<span>{row.users.length}</span>)
           },
           {
             prop: 'user_groups',
-            label: this.$t('perms.userGroup')
+            label: this.$t('perms.userGroup'),
+            formatter: row => (<span>{row.user_groups.length}</span>)
           },
           {
             prop: 'assets',
-            label: this.$t('perms.asset')
+            label: this.$t('perms.asset'),
+            formatter: row => (<span>{row.assets.length}</span>)
           },
           {
             prop: 'nodes',
-            label: this.$t('perms.node')
+            label: this.$t('perms.node'),
+            formatter: row => (<span>{row.nodes.length}</span>)
           },
           {
             prop: 'system_users',
-            label: this.$t('perms.systemUser')
+            label: this.$t('perms.systemUser'),
+            formatter: row => (<span>{row.system_users.length}</span>)
           },
           {
             prop: 'is_active',
-            label: this.$t('perms.validity')
+            label: this.$t('perms.validity'),
+            formatter: ChoicesFormatter,
+            align: 'center',
+            width: '80px'
           },
           {
             prop: 'id',
diff --git a/src/views/perms/DatabaseAppPermissionList.vue b/src/views/perms/DatabaseAppPermissionList.vue
index e57d5e0d4..252f9a354 100644
--- a/src/views/perms/DatabaseAppPermissionList.vue
+++ b/src/views/perms/DatabaseAppPermissionList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, ActionsFormatter } from '@/components/DataTable/formatters/index'
+import { DetailFormatter, ActionsFormatter, ChoicesFormatter } from '@/components/DataTable/formatters/index'
 
 export default {
   components: {
@@ -24,23 +24,30 @@ export default {
           },
           {
             prop: 'users',
-            label: this.$t('perms.user')
+            label: this.$t('perms.user'),
+            formatter: row => (<span>{row.users.length}</span>)
           },
           {
             prop: 'user_groups',
-            label: this.$t('perms.userGroup')
+            label: this.$t('perms.userGroup'),
+            formatter: row => (<span>{row.user_groups.length}</span>)
           },
           {
             prop: 'database_apps',
-            label: this.$t('perms.DatabaseApp')
+            label: this.$t('perms.DatabaseApp'),
+            formatter: row => (<span>{row.database_apps.length}</span>)
           },
           {
             prop: 'system_users',
-            label: this.$t('perms.systemUser')
+            label: this.$t('perms.systemUser'),
+            formatter: row => (<span>{row.system_users.length}</span>)
           },
           {
             prop: 'is_valid',
-            label: this.$t('perms.validity')
+            label: this.$t('perms.validity'),
+            formatter: ChoicesFormatter,
+            align: 'center',
+            width: '80px'
           },
           {
             prop: 'id',
diff --git a/src/views/perms/RemoteAppPermissionList.vue b/src/views/perms/RemoteAppPermissionList.vue
index c630fd405..f54f8f8fa 100644
--- a/src/views/perms/RemoteAppPermissionList.vue
+++ b/src/views/perms/RemoteAppPermissionList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, ActionsFormatter } from '@/components/DataTable/formatters/index'
+import { DetailFormatter, ActionsFormatter, ChoicesFormatter } from '@/components/DataTable/formatters/index'
 
 export default {
   components: {
@@ -24,23 +24,30 @@ export default {
           },
           {
             prop: 'users',
-            label: this.$t('perms.user')
+            label: this.$t('perms.user'),
+            formatter: row => (<span>{row.users.length}</span>)
           },
           {
             prop: 'user_groups',
-            label: this.$t('perms.userGroup')
+            label: this.$t('perms.userGroup'),
+            formatter: row => (<span>{row.user_groups.length}</span>)
           },
           {
             prop: 'remote_apps',
-            label: this.$t('perms.RemoteApp')
+            label: this.$t('perms.RemoteApp'),
+            formatter: row => (<span>{row.remote_apps.length}</span>)
           },
           {
             prop: 'system_users',
-            label: this.$t('perms.systemUser')
+            label: this.$t('perms.systemUser'),
+            formatter: row => (<span>{row.system_users.length}</span>)
           },
           {
             prop: 'is_valid',
-            label: this.$t('perms.validity')
+            label: this.$t('perms.validity'),
+            formatter: ChoicesFormatter,
+            align: 'center',
+            width: '80px'
           },
           {
             prop: 'id',

From e24d3c021dffd026d777ee5dda56b418f0478996 Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Tue, 7 Apr 2020 11:03:00 +0800
Subject: [PATCH 18/26] =?UTF-8?q?[Update]=20=E5=A2=9E=E5=8A=A0=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=88=97=E8=A1=A8=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.js             |  8 +++
 src/router/index.js              |  2 +-
 src/views/jobcenter/TaskList.vue | 95 ++++++++++++++++++++++++++++++++
 3 files changed, 104 insertions(+), 1 deletion(-)
 create mode 100644 src/views/jobcenter/TaskList.vue

diff --git a/src/i18n/langs/cn.js b/src/i18n/langs/cn.js
index 79aa99d1c..0ace7b838 100644
--- a/src/i18n/langs/cn.js
+++ b/src/i18n/langs/cn.js
@@ -358,6 +358,14 @@ const cn = {
     'active': '激活中',
     'alive': '在线'
   },
+  jobcenter: {
+    'RunTimes': '执行次数',
+    'hosts': '主机',
+    'success': '成功',
+    'date': '日期',
+    'time': '时间',
+    'run': '执行'
+  },
   setting: {
     'setting': '系统设置',
     'basicsetting': '基本设置'
diff --git a/src/router/index.js b/src/router/index.js
index cb51b8802..24913e7b7 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -269,7 +269,7 @@ export const constantRoutes = [
       {
         path: 'task',
         name: 'TaskList',
-        component: () => import('@/views/tree/index'),
+        component: () => import('@/views/jobcenter/TaskList'),
         meta: { title: 'TaskList' }
       },
       {
diff --git a/src/views/jobcenter/TaskList.vue b/src/views/jobcenter/TaskList.vue
new file mode 100644
index 000000000..953e8baa3
--- /dev/null
+++ b/src/views/jobcenter/TaskList.vue
@@ -0,0 +1,95 @@
+<template>
+  <GenericListPage :table-config="tableConfig" :header-actions="headerActions" />
+</template>
+
+<script>
+import { GenericListPage } from '@/layout/components'
+import { DetailFormatter, ActionsFormatter } from '@/components/DataTable/formatters/index'
+
+export default {
+  components: {
+    GenericListPage,
+  },
+  data() {
+    return {
+      tableConfig: {
+        url: '/api/v1/ops/tasks/',
+        columns: [
+          {
+            prop: 'name',
+            label: this.$tc('Name'),
+            formatter: DetailFormatter,
+            sortable: 'custom',
+            route: 'UserDetail'
+          },
+          {
+            prop: 'latest_execution',
+            label: this.$t('jobcenter.RunTimes')
+          },
+          {
+            prop: 'latest_execution.hosts_amount',
+            label: this.$t('jobcenter.hosts')
+          },
+          {
+            prop: 'latest_execution.is_success',
+            label: this.$t('jobcenter.success')
+          },
+          {
+            prop: 'latest_execution.date_start',
+            label: this.$t('jobcenter.date'),
+            sortable: 'custom'
+          },
+          {
+            prop: 'latest_execution.timedelta',
+            label: this.$t('jobcenter.time'),
+            sortable: 'custom'
+          },
+          {
+            prop: 'id',
+            label: this.$tc('Action'),
+            align: 'center',
+            formatter: ActionsFormatter,
+            actions: {
+              hasUpdate: (row, cellValue) => {
+                return false
+              },
+              canUpdate: (row, cellValue) => {
+                console.log('On table update')
+                return false
+              },
+              hasDelete: true,
+              canDelete: (row, cellValue) => {
+                return true
+              },
+              onDelete: (row, cellValue) => {
+                this.$confirm('你好啊', '提示', {
+                  type: 'warning',
+                  confirmButtonClass: 'el-button--danger',
+                  beforeClose: async(action, instance, done) => {
+                  }
+                }).catch(() => {
+                  /* 取消*/
+                })
+              },
+              order: []
+            }
+          }
+        ],
+        // 写路由名字，table组件会自动传作为参数
+        tableActions: {
+          editRoute: '404'
+        }
+      },
+      headerActions: {
+        hasDelete: false,
+        hasUpdate: false,
+        hasCreate: false
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+
+</style>

From e7af26e2c0b2906facbfce28dfb8720ed0970895 Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Tue, 7 Apr 2020 11:12:14 +0800
Subject: [PATCH 19/26] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=8E=B7=E5=8F=96=E9=95=BF=E5=BA=A6=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E7=82=B9length?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../el-data-table/el-data-table.vue           |  1 +
 src/views/applications/RemoteAppList.vue      |  5 ++--
 src/views/assets/CommandFilterList.vue        | 10 +++-----
 src/views/perms/AssetPermissionList.vue       | 25 ++++++++-----------
 src/views/perms/DatabaseAppPermissionList.vue | 20 ++++++---------
 src/views/perms/RemoteAppPermissionList.vue   | 20 ++++++---------
 6 files changed, 33 insertions(+), 48 deletions(-)

diff --git a/src/components/DataTable/compenents/el-data-table/el-data-table.vue b/src/components/DataTable/compenents/el-data-table/el-data-table.vue
index 87ad646a5..24fc42a3e 100644
--- a/src/components/DataTable/compenents/el-data-table/el-data-table.vue
+++ b/src/components/DataTable/compenents/el-data-table/el-data-table.vue
@@ -908,6 +908,7 @@ export default {
           }
 
           this.data = data
+          console.log(this.data)
 
           // 树形结构逻辑
           if (this.isTree) {
diff --git a/src/views/applications/RemoteAppList.vue b/src/views/applications/RemoteAppList.vue
index 1a60db3c2..4efa29602 100644
--- a/src/views/applications/RemoteAppList.vue
+++ b/src/views/applications/RemoteAppList.vue
@@ -27,9 +27,8 @@ export default {
             label: this.$t('applications.appType')
           },
           {
-            prop: 'asset_info',
-            label: this.$t('applications.asset'),
-            formatter: row => (<span>{row.asset_info.hostname}</span>)
+            prop: 'asset_info.hostname',
+            label: this.$t('applications.asset')
           },
           {
             prop: 'comment',
diff --git a/src/views/assets/CommandFilterList.vue b/src/views/assets/CommandFilterList.vue
index 437ea4348..7c0a594d0 100644
--- a/src/views/assets/CommandFilterList.vue
+++ b/src/views/assets/CommandFilterList.vue
@@ -23,14 +23,12 @@ export default {
             route: 'CommandFilterDetail'
           },
           {
-            prop: 'rules',
-            label: this.$t('assets.rules'),
-            formatter: row => (<span>{row.rules.length}</span>)
+            prop: 'rules.length',
+            label: this.$t('assets.rules')
           },
           {
-            prop: 'system_users',
-            label: this.$t('assets.systemUser'),
-            formatter: row => (<span>{row.system_users.length}</span>)
+            prop: 'system_users.length',
+            label: this.$t('assets.systemUser')
           },
           {
             prop: 'comment',
diff --git a/src/views/perms/AssetPermissionList.vue b/src/views/perms/AssetPermissionList.vue
index ca276f9e9..5acd45c76 100644
--- a/src/views/perms/AssetPermissionList.vue
+++ b/src/views/perms/AssetPermissionList.vue
@@ -23,29 +23,24 @@ export default {
             route: 'AssetPermissionDetail'
           },
           {
-            prop: 'users',
-            label: this.$t('perms.user'),
-            formatter: row => (<span>{row.users.length}</span>)
+            prop: 'users.length',
+            label: this.$t('perms.user')
           },
           {
-            prop: 'user_groups',
-            label: this.$t('perms.userGroup'),
-            formatter: row => (<span>{row.user_groups.length}</span>)
+            prop: 'user_groups.length',
+            label: this.$t('perms.userGroup')
           },
           {
-            prop: 'assets',
-            label: this.$t('perms.asset'),
-            formatter: row => (<span>{row.assets.length}</span>)
+            prop: 'assets.length',
+            label: this.$t('perms.asset')
           },
           {
-            prop: 'nodes',
-            label: this.$t('perms.node'),
-            formatter: row => (<span>{row.nodes.length}</span>)
+            prop: 'nodes.length',
+            label: this.$t('perms.node')
           },
           {
-            prop: 'system_users',
-            label: this.$t('perms.systemUser'),
-            formatter: row => (<span>{row.system_users.length}</span>)
+            prop: 'system_users.length',
+            label: this.$t('perms.systemUser')
           },
           {
             prop: 'is_active',
diff --git a/src/views/perms/DatabaseAppPermissionList.vue b/src/views/perms/DatabaseAppPermissionList.vue
index 252f9a354..a3d67024c 100644
--- a/src/views/perms/DatabaseAppPermissionList.vue
+++ b/src/views/perms/DatabaseAppPermissionList.vue
@@ -23,24 +23,20 @@ export default {
             route: 'DatabaseAppPermissionDetail'
           },
           {
-            prop: 'users',
-            label: this.$t('perms.user'),
-            formatter: row => (<span>{row.users.length}</span>)
+            prop: 'users.length',
+            label: this.$t('perms.user')
           },
           {
-            prop: 'user_groups',
-            label: this.$t('perms.userGroup'),
-            formatter: row => (<span>{row.user_groups.length}</span>)
+            prop: 'user_groups.length',
+            label: this.$t('perms.userGroup')
           },
           {
-            prop: 'database_apps',
-            label: this.$t('perms.DatabaseApp'),
-            formatter: row => (<span>{row.database_apps.length}</span>)
+            prop: 'database_apps.length',
+            label: this.$t('perms.DatabaseApp')
           },
           {
-            prop: 'system_users',
-            label: this.$t('perms.systemUser'),
-            formatter: row => (<span>{row.system_users.length}</span>)
+            prop: 'system_users.length',
+            label: this.$t('perms.systemUser')
           },
           {
             prop: 'is_valid',
diff --git a/src/views/perms/RemoteAppPermissionList.vue b/src/views/perms/RemoteAppPermissionList.vue
index f54f8f8fa..064ebace2 100644
--- a/src/views/perms/RemoteAppPermissionList.vue
+++ b/src/views/perms/RemoteAppPermissionList.vue
@@ -23,24 +23,20 @@ export default {
             route: 'RemoteAppPermissionDetail'
           },
           {
-            prop: 'users',
-            label: this.$t('perms.user'),
-            formatter: row => (<span>{row.users.length}</span>)
+            prop: 'users.length',
+            label: this.$t('perms.user')
           },
           {
-            prop: 'user_groups',
-            label: this.$t('perms.userGroup'),
-            formatter: row => (<span>{row.user_groups.length}</span>)
+            prop: 'user_groups.length',
+            label: this.$t('perms.userGroup')
           },
           {
-            prop: 'remote_apps',
-            label: this.$t('perms.RemoteApp'),
-            formatter: row => (<span>{row.remote_apps.length}</span>)
+            prop: 'remote_apps.length',
+            label: this.$t('perms.RemoteApp')
           },
           {
-            prop: 'system_users',
-            label: this.$t('perms.systemUser'),
-            formatter: row => (<span>{row.system_users.length}</span>)
+            prop: 'system_users.length',
+            label: this.$t('perms.systemUser')
           },
           {
             prop: 'is_valid',

From 7bd7317f41c1dc718c7944c795b56e4ebe0a9b63 Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Tue, 7 Apr 2020 12:04:27 +0800
Subject: [PATCH 20/26] =?UTF-8?q?[Update]=20=E5=A2=9E=E5=8A=A0=E7=BD=91?=
 =?UTF-8?q?=E5=85=B3=E5=88=97=E8=A1=A8=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../el-data-table/el-data-table.vue           |   1 -
 src/i18n/langs/cn.js                          |   1 +
 src/router/index.js                           |   6 ++
 src/views/assets/DomainList.vue               |   4 +-
 src/views/assets/GatewayList.vue              | 100 ++++++++++++++++++
 5 files changed, 110 insertions(+), 2 deletions(-)
 create mode 100644 src/views/assets/GatewayList.vue

diff --git a/src/components/DataTable/compenents/el-data-table/el-data-table.vue b/src/components/DataTable/compenents/el-data-table/el-data-table.vue
index 24fc42a3e..87ad646a5 100644
--- a/src/components/DataTable/compenents/el-data-table/el-data-table.vue
+++ b/src/components/DataTable/compenents/el-data-table/el-data-table.vue
@@ -908,7 +908,6 @@ export default {
           }
 
           this.data = data
-          console.log(this.data)
 
           // 树形结构逻辑
           if (this.isTree) {
diff --git a/src/i18n/langs/cn.js b/src/i18n/langs/cn.js
index 0ace7b838..569d8752a 100644
--- a/src/i18n/langs/cn.js
+++ b/src/i18n/langs/cn.js
@@ -221,6 +221,7 @@ const cn = {
     'asset': '资产',
     'gateway': '网关',
     'date_created': '创建日期',
+    'port': '端口',
     // 管理用户
     'AdminUserList': '管理用户列表',
     'AdminUserDetail': '管理用户详情',
diff --git a/src/router/index.js b/src/router/index.js
index 24913e7b7..41d211064 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -127,6 +127,12 @@ export const constantRoutes = [
         component: () => import('@/views/assets/DomainList.vue'),
         meta: { title: 'DomainList' }
       },
+      {
+        path: 'domains/:id/gateway',
+        name: 'GatewayList',
+        component: () => import('@/views/assets/GatewayList'),
+        // meta: { title: 'GatewayList' }
+      },
       {
         path: 'admin-users',
         name: 'AdminUserList',
diff --git a/src/views/assets/DomainList.vue b/src/views/assets/DomainList.vue
index f9c65455d..2cc350616 100644
--- a/src/views/assets/DomainList.vue
+++ b/src/views/assets/DomainList.vue
@@ -28,7 +28,9 @@ export default {
           },
           {
             prop: 'gateway_count',
-            label: this.$t('assets.gateway')
+            label: this.$t('assets.gateway'),
+            formatter: DetailFormatter,
+            route: 'GatewayList'
           },
           {
             prop: 'comment',
diff --git a/src/views/assets/GatewayList.vue b/src/views/assets/GatewayList.vue
new file mode 100644
index 000000000..1e2acda65
--- /dev/null
+++ b/src/views/assets/GatewayList.vue
@@ -0,0 +1,100 @@
+<template>
+  <GenericListPage :table-config="tableConfig" :header-actions="headerActions" />
+</template>
+
+<script>
+import { GenericListPage } from '@/layout/components'
+import { ActionsFormatter } from '@/components/DataTable/formatters/index'
+
+export default {
+  components: {
+    GenericListPage
+  },
+  data() {
+    return {
+      tableConfig: {
+        url: '/api/v1/assets/gateways/?domain=' + this.$route.params.id,
+        columns: [
+          {
+            prop: 'name',
+            label: this.$t('assets.name'),
+            sortable: true
+          },
+          {
+            prop: 'ip',
+            label: this.$t('assets.ip'),
+            sortable: true
+          },
+          {
+            prop: 'port',
+            label: this.$t('assets.port'),
+            sortable: true
+          },
+          {
+            prop: 'protocol',
+            label: this.$t('assets.protocol'),
+            sortable: true
+          },
+          {
+            prop: 'username',
+            label: this.$t('assets.username'),
+            sortable: true
+          },
+          {
+            prop: 'comment',
+            label: this.$t('assets.comment'),
+            sortable: true
+          },
+          {
+            prop: 'id',
+            label: this.$tc('Action'),
+            align: 'center',
+            formatter: ActionsFormatter,
+            actions: {
+              hasUpdate: (row, cellValue) => {
+                return true
+              },
+              canUpdate: (row, cellValue) => {
+                console.log('On table update')
+                return true
+              },
+              hasDelete: true,
+              canDelete: (row, cellValue) => {
+                return true
+              },
+              onDelete: (row, cellValue) => {
+                this.$confirm('你好啊', '提示', {
+                  type: 'warning',
+                  confirmButtonClass: 'el-button--danger',
+                  beforeClose: async(action, instance, done) => {
+                  }
+                }).catch(() => {
+                  /* 取消*/
+                })
+              },
+              order: []
+            }
+          }
+        ],
+        tableActions: {
+          hasEdit: true,
+          editRoute: '404'
+        }
+      },
+      headerActions: {
+        hasDelete: false,
+        hasUpdate: false,
+        createRoute: 'DomainCreate'
+      }
+    }
+  },
+  created() {
+    console.log('111111')
+    console.log('/api/v1/assets/gateways/?domain=' + this.$route.params.id)
+  }
+}
+</script>
+
+<style>
+
+</style>

From 9739306a9eb940cddce4f62101424b9eb531274c Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Tue, 7 Apr 2020 15:41:27 +0800
Subject: [PATCH 21/26] =?UTF-8?q?[Update]=20=E5=A2=9E=E5=8A=A0=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E7=AE=A1=E7=90=86=E5=88=97=E8=A1=A8=E9=A1=B5=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.js              |  9 ++++
 src/router/index.js               |  4 +-
 src/views/tickets/TicketsList.vue | 75 +++++++++++++++++++++++++++++++
 3 files changed, 86 insertions(+), 2 deletions(-)
 create mode 100644 src/views/tickets/TicketsList.vue

diff --git a/src/i18n/langs/cn.js b/src/i18n/langs/cn.js
index 569d8752a..ffbce5b55 100644
--- a/src/i18n/langs/cn.js
+++ b/src/i18n/langs/cn.js
@@ -367,6 +367,15 @@ const cn = {
     'time': '时间',
     'run': '执行'
   },
+  tickets: {
+    'title': '标题',
+    'user': '用户',
+    'type': '类型',
+    'status': '状态',
+    'date': '日期',
+    'MyTickets': '我的工单',
+    'AssignedMe': '待处理'
+  },
   setting: {
     'setting': '系统设置',
     'basicsetting': '基本设置'
diff --git a/src/router/index.js b/src/router/index.js
index 41d211064..a02957656 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -298,8 +298,8 @@ export const constantRoutes = [
     redirect: '/tickets/tickets/',
     children: [{
       path: 'tickets',
-      name: 'Tickets',
-      component: () => import('@/views/tree/index'),
+      name: 'TicketsList',
+      component: () => import('@/views/tickets/TicketsList'),
       meta: { title: 'Tickets', icon: 'check-square-o' }
     }]
   },
diff --git a/src/views/tickets/TicketsList.vue b/src/views/tickets/TicketsList.vue
new file mode 100644
index 000000000..36ce80727
--- /dev/null
+++ b/src/views/tickets/TicketsList.vue
@@ -0,0 +1,75 @@
+<template>
+  <el-tabs>
+    <el-tab-pane :label="this.$t('tickets.MyTickets')">
+      <GenericListPage :table-config="tableConfig" :header-actions="headerActions" />
+    </el-tab-pane>
+    <el-tab-pane :label="this.$t('tickets.AssignedMe')">
+    </el-tab-pane>
+
+  </el-tabs>
+</template>
+
+<script>
+import { GenericListPage } from '@/layout/components'
+import { DetailFormatter } from '@/components/DataTable/formatters/index'
+
+export default {
+  components: {
+    GenericListPage
+  },
+  data() {
+    return {
+      tableConfig: {
+        url: '/api/v1/tickets/tickets/',
+        axiosConfig: {
+          raw: 1,
+          params: {
+            assign: 0,
+            display: 1,
+            draw: 1,
+          }
+        },
+        columns: [
+          {
+            prop: 'title',
+            label: this.$t('tickets.title'),
+            formatter: DetailFormatter,
+            sortable: 'custom',
+            route: 'UserDetail'
+          },
+          {
+            prop: 'user_display',
+            label: this.$t('tickets.user')
+          },
+          {
+            prop: 'type_display',
+            label: this.$t('tickets.type')
+          },
+          {
+            prop: 'status',
+            label: this.$t('tickets.status')
+          },
+          {
+            prop: 'date_created',
+            label: this.$t('tickets.date'),
+            sortable: 'custom'
+          }
+        ],
+        // 写路由名字，table组件会自动传作为参数
+        tableActions: {
+          editRoute: '404'
+        }
+      },
+      headerActions: {
+        hasDelete: false,
+        hasUpdate: false,
+        hasCreate: false
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+
+</style>

From fba0a4f7b6e012f0e7ea0ffd5ee28affd89d0818 Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Tue, 7 Apr 2020 16:09:01 +0800
Subject: [PATCH 22/26] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/applications/DatabaseAppList.vue | 15 ++++++++++-----
 src/views/applications/RemoteAppList.vue   |  3 ++-
 src/views/assets/AdminUserList.vue         |  6 ++++--
 src/views/assets/AssetList.vue             |  3 ++-
 src/views/assets/CommandFilterList.vue     |  3 ++-
 src/views/assets/DomainList.vue            |  3 ++-
 src/views/assets/GatewayList.vue           | 10 +++++-----
 src/views/assets/LabelList.vue             |  3 ++-
 src/views/assets/PlatformList.vue          |  6 ++++--
 src/views/assets/SystemUserList.vue        | 15 ++++++++++-----
 src/views/jobcenter/TaskList.vue           |  3 +--
 src/views/sessions/SessionOfflineList.vue  | 17 +++++++++++------
 src/views/sessions/SessionOnlineList.vue   | 19 ++++++++++++-------
 src/views/sessions/TerminalList.vue        |  6 ++++--
 src/views/tickets/TicketsList.vue          |  9 ++++++---
 15 files changed, 77 insertions(+), 44 deletions(-)

diff --git a/src/views/applications/DatabaseAppList.vue b/src/views/applications/DatabaseAppList.vue
index cff77a5f1..a85649223 100644
--- a/src/views/applications/DatabaseAppList.vue
+++ b/src/views/applications/DatabaseAppList.vue
@@ -24,23 +24,28 @@ export default {
           },
           {
             prop: 'get_type_display',
-            label: this.$t('applications.appType')
+            label: this.$t('applications.appType'),
+            sortable: 'custom'
           },
           {
             prop: 'host',
-            label: this.$t('applications.host')
+            label: this.$t('applications.host'),
+            sortable: 'custom'
           },
           {
             prop: 'port',
-            label: this.$t('applications.port')
+            label: this.$t('applications.port'),
+            sortable: 'custom'
           },
           {
             prop: 'database',
-            label: this.$t('applications.database')
+            label: this.$t('applications.database'),
+            sortable: 'custom'
           },
           {
             prop: 'comment',
-            label: this.$t('applications.comment')
+            label: this.$t('applications.comment'),
+            sortable: 'custom'
           },
           {
             prop: 'id',
diff --git a/src/views/applications/RemoteAppList.vue b/src/views/applications/RemoteAppList.vue
index 4efa29602..d436c6471 100644
--- a/src/views/applications/RemoteAppList.vue
+++ b/src/views/applications/RemoteAppList.vue
@@ -32,7 +32,8 @@ export default {
           },
           {
             prop: 'comment',
-            label: this.$t('applications.comment')
+            label: this.$t('applications.comment'),
+            sortable: 'custom'
           },
           {
             prop: 'id',
diff --git a/src/views/assets/AdminUserList.vue b/src/views/assets/AdminUserList.vue
index 17a741a62..cc81df960 100644
--- a/src/views/assets/AdminUserList.vue
+++ b/src/views/assets/AdminUserList.vue
@@ -24,7 +24,8 @@ export default {
           },
           {
             prop: 'username',
-            label: this.$t('common.username')
+            label: this.$t('common.username'),
+            sortable: 'custom'
           },
           {
             prop: 'assets_amount',
@@ -32,7 +33,8 @@ export default {
           },
           {
             prop: 'comment',
-            label: this.$t('assets.comment')
+            label: this.$t('assets.comment'),
+            sortable: 'custom'
           },
           {
             prop: 'id',
diff --git a/src/views/assets/AssetList.vue b/src/views/assets/AssetList.vue
index 88bceb516..a644951c3 100644
--- a/src/views/assets/AssetList.vue
+++ b/src/views/assets/AssetList.vue
@@ -24,7 +24,8 @@ export default {
           },
           {
             prop: 'ip',
-            label: this.$t('assets.ip')
+            label: this.$t('assets.ip'),
+            sortable: 'custom'
           },
           {
             prop: 'hardware_info',
diff --git a/src/views/assets/CommandFilterList.vue b/src/views/assets/CommandFilterList.vue
index 7c0a594d0..b705bb410 100644
--- a/src/views/assets/CommandFilterList.vue
+++ b/src/views/assets/CommandFilterList.vue
@@ -32,7 +32,8 @@ export default {
           },
           {
             prop: 'comment',
-            label: this.$t('assets.comment')
+            label: this.$t('assets.comment'),
+            sortable: 'custom'
           },
           {
             prop: 'id',
diff --git a/src/views/assets/DomainList.vue b/src/views/assets/DomainList.vue
index 2cc350616..7de8cde6e 100644
--- a/src/views/assets/DomainList.vue
+++ b/src/views/assets/DomainList.vue
@@ -34,7 +34,8 @@ export default {
           },
           {
             prop: 'comment',
-            label: this.$t('assets.comment')
+            label: this.$t('assets.comment'),
+            sortable: 'custom'
           },
           {
             prop: 'id',
diff --git a/src/views/assets/GatewayList.vue b/src/views/assets/GatewayList.vue
index 1e2acda65..6ab0248cd 100644
--- a/src/views/assets/GatewayList.vue
+++ b/src/views/assets/GatewayList.vue
@@ -18,17 +18,17 @@ export default {
           {
             prop: 'name',
             label: this.$t('assets.name'),
-            sortable: true
+            sortable: 'custom'
           },
           {
             prop: 'ip',
             label: this.$t('assets.ip'),
-            sortable: true
+            sortable: 'custom'
           },
           {
             prop: 'port',
             label: this.$t('assets.port'),
-            sortable: true
+            sortable: 'custom'
           },
           {
             prop: 'protocol',
@@ -38,12 +38,12 @@ export default {
           {
             prop: 'username',
             label: this.$t('assets.username'),
-            sortable: true
+            sortable: 'custom'
           },
           {
             prop: 'comment',
             label: this.$t('assets.comment'),
-            sortable: true
+            sortable: 'custom'
           },
           {
             prop: 'id',
diff --git a/src/views/assets/LabelList.vue b/src/views/assets/LabelList.vue
index e2c614e60..3663461f5 100644
--- a/src/views/assets/LabelList.vue
+++ b/src/views/assets/LabelList.vue
@@ -24,7 +24,8 @@ export default {
           },
           {
             prop: 'value',
-            label: this.$t('assets.value')
+            label: this.$t('assets.value'),
+            sortable: 'custom'
           },
           {
             prop: 'asset_count',
diff --git a/src/views/assets/PlatformList.vue b/src/views/assets/PlatformList.vue
index d6f34c468..9b6b68e18 100644
--- a/src/views/assets/PlatformList.vue
+++ b/src/views/assets/PlatformList.vue
@@ -24,11 +24,13 @@ export default {
           },
           {
             prop: 'base',
-            label: this.$t('assets.BasePlatform')
+            label: this.$t('assets.BasePlatform'),
+            sortable: 'custom'
           },
           {
             prop: 'comment',
-            label: this.$t('assets.comment')
+            label: this.$t('assets.comment'),
+            sortable: 'custom'
           },
           {
             prop: 'id',
diff --git a/src/views/assets/SystemUserList.vue b/src/views/assets/SystemUserList.vue
index 3d398c507..979eaa30b 100644
--- a/src/views/assets/SystemUserList.vue
+++ b/src/views/assets/SystemUserList.vue
@@ -24,23 +24,28 @@ export default {
           },
           {
             prop: 'username',
-            label: this.$t('common.username')
+            label: this.$t('common.username'),
+            sortable: 'custom'
           },
           {
             prop: 'protocol',
-            label: this.$t('assets.protocol')
+            label: this.$t('assets.protocol'),
+            sortable: 'custom'
           },
           {
             prop: 'login_mode_display',
-            label: this.$t('assets.loginMode')
+            label: this.$t('assets.loginMode'),
+            sortable: 'custom'
           },
           {
             prop: 'assets_amount',
-            label: this.$t('assets.asset')
+            label: this.$t('assets.asset'),
+            sortable: 'custom'
           },
           {
             prop: 'comment',
-            label: this.$t('assets.comment')
+            label: this.$t('assets.comment'),
+            sortable: 'custom'
           },
           {
             prop: 'id',
diff --git a/src/views/jobcenter/TaskList.vue b/src/views/jobcenter/TaskList.vue
index 953e8baa3..774c57779 100644
--- a/src/views/jobcenter/TaskList.vue
+++ b/src/views/jobcenter/TaskList.vue
@@ -41,8 +41,7 @@ export default {
           },
           {
             prop: 'latest_execution.timedelta',
-            label: this.$t('jobcenter.time'),
-            sortable: 'custom'
+            label: this.$t('jobcenter.time')
           },
           {
             prop: 'id',
diff --git a/src/views/sessions/SessionOfflineList.vue b/src/views/sessions/SessionOfflineList.vue
index 08237b325..fd32830a1 100644
--- a/src/views/sessions/SessionOfflineList.vue
+++ b/src/views/sessions/SessionOfflineList.vue
@@ -29,23 +29,27 @@ export default {
           {
             prop: 'user',
             label: this.$t('sessions.user'),
-            sortable: true
+            sortable: 'custom'
           },
           {
             prop: 'asset',
-            label: this.$t('sessions.asset')
+            label: this.$t('sessions.asset'),
+            sortable: 'custom'
           },
           {
             prop: 'system_user',
-            label: this.$t('sessions.systemUser')
+            label: this.$t('sessions.systemUser'),
+            sortable: 'custom'
           },
           {
             prop: 'remote_addr',
-            label: this.$t('sessions.remoteAddr')
+            label: this.$t('sessions.remoteAddr'),
+            sortable: 'custom'
           },
           {
             prop: 'protocol',
-            label: this.$t('sessions.protocol')
+            label: this.$t('sessions.protocol'),
+            sortable: 'custom'
           },
           {
             prop: 'login_from_display',
@@ -57,7 +61,8 @@ export default {
           },
           {
             prop: 'date_start',
-            label: this.$t('sessions.dateStart')
+            label: this.$t('sessions.dateStart'),
+            sortable: 'custom'
           },
           {
             prop: 'duration',
diff --git a/src/views/sessions/SessionOnlineList.vue b/src/views/sessions/SessionOnlineList.vue
index 1a0ffd04d..0de8a8e38 100644
--- a/src/views/sessions/SessionOnlineList.vue
+++ b/src/views/sessions/SessionOnlineList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-// import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
+import { DetailFormatter } from '@/components/DataTable/formatters/index'
 
 export default {
   components: {
@@ -29,23 +29,27 @@ export default {
           {
             prop: 'user',
             label: this.$t('sessions.user'),
-            sortable: true
+            sortable: 'custom'
           },
           {
             prop: 'asset',
-            label: this.$t('sessions.asset')
+            label: this.$t('sessions.asset'),
+            sortable: 'custom'
           },
           {
             prop: 'system_user',
-            label: this.$t('sessions.systemUser')
+            label: this.$t('sessions.systemUser'),
+            sortable: 'custom'
           },
           {
             prop: 'remote_addr',
-            label: this.$t('sessions.remoteAddr')
+            label: this.$t('sessions.remoteAddr'),
+            sortable: 'custom'
           },
           {
             prop: 'protocol',
-            label: this.$t('sessions.protocol')
+            label: this.$t('sessions.protocol'),
+            sortable: 'custom'
           },
           {
             prop: 'login_from_display',
@@ -57,7 +61,8 @@ export default {
           },
           {
             prop: 'date_start',
-            label: this.$t('sessions.dateStart')
+            label: this.$t('sessions.dateStart'),
+            sortable: 'custom'
           },
           {
             prop: 'duration',
diff --git a/src/views/sessions/TerminalList.vue b/src/views/sessions/TerminalList.vue
index a01de8162..47a69db26 100644
--- a/src/views/sessions/TerminalList.vue
+++ b/src/views/sessions/TerminalList.vue
@@ -32,7 +32,8 @@ export default {
           },
           {
             prop: 'remote_addr',
-            label: this.$t('sessions.addr')
+            label: this.$t('sessions.addr'),
+            sortable: 'custom'
           },
           {
             prop: 'session_online',
@@ -45,7 +46,8 @@ export default {
           },
           {
             prop: 'is_alive',
-            label: this.$t('sessions.alive')
+            label: this.$t('sessions.alive'),
+            sortable: 'custom'
           }
         ],
         tableActions: {
diff --git a/src/views/tickets/TicketsList.vue b/src/views/tickets/TicketsList.vue
index 36ce80727..f50e6a505 100644
--- a/src/views/tickets/TicketsList.vue
+++ b/src/views/tickets/TicketsList.vue
@@ -39,15 +39,18 @@ export default {
           },
           {
             prop: 'user_display',
-            label: this.$t('tickets.user')
+            label: this.$t('tickets.user'),
+            sortable: 'custom'
           },
           {
             prop: 'type_display',
-            label: this.$t('tickets.type')
+            label: this.$t('tickets.type'),
+            sortable: 'custom'
           },
           {
             prop: 'status',
-            label: this.$t('tickets.status')
+            label: this.$t('tickets.status'),
+            sortable: 'custom'
           },
           {
             prop: 'date_created',

From 2d087183406da567211a14d3ffba8e0f19dff99e Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Tue, 7 Apr 2020 16:38:17 +0800
Subject: [PATCH 23/26] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/applications/DatabaseAppList.vue    | 2 +-
 src/views/applications/RemoteAppList.vue      | 2 +-
 src/views/assets/AdminUserList.vue            | 2 +-
 src/views/assets/AssetList.vue                | 2 +-
 src/views/assets/CommandFilterList.vue        | 2 +-
 src/views/assets/DomainList.vue               | 2 +-
 src/views/assets/GatewayList.vue              | 2 +-
 src/views/assets/LabelList.vue                | 2 +-
 src/views/assets/PlatformList.vue             | 2 +-
 src/views/assets/SystemUserList.vue           | 2 +-
 src/views/jobcenter/TaskList.vue              | 2 +-
 src/views/perms/AssetPermissionList.vue       | 2 +-
 src/views/perms/DatabaseAppPermissionList.vue | 2 +-
 src/views/perms/RemoteAppPermissionList.vue   | 2 +-
 src/views/sessions/CommandList.vue            | 1 -
 src/views/sessions/SessionOfflineList.vue     | 1 -
 src/views/sessions/SessionOnlineList.vue      | 1 -
 src/views/sessions/TerminalList.vue           | 2 +-
 src/views/tickets/TicketsList.vue             | 2 +-
 19 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/views/applications/DatabaseAppList.vue b/src/views/applications/DatabaseAppList.vue
index a85649223..3aaea25d1 100644
--- a/src/views/applications/DatabaseAppList.vue
+++ b/src/views/applications/DatabaseAppList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, ActionsFormatter } from '@/components/DataTable/formatters/index'
+import { DetailFormatter, ActionsFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
diff --git a/src/views/applications/RemoteAppList.vue b/src/views/applications/RemoteAppList.vue
index d436c6471..0df534c3d 100644
--- a/src/views/applications/RemoteAppList.vue
+++ b/src/views/applications/RemoteAppList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, ActionsFormatter } from '@/components/DataTable/formatters/index'
+import { DetailFormatter, ActionsFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
diff --git a/src/views/assets/AdminUserList.vue b/src/views/assets/AdminUserList.vue
index cc81df960..1aa99dc9e 100644
--- a/src/views/assets/AdminUserList.vue
+++ b/src/views/assets/AdminUserList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, ActionsFormatter } from '@/components/DataTable/formatters/index'
+import { DetailFormatter, ActionsFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
diff --git a/src/views/assets/AssetList.vue b/src/views/assets/AssetList.vue
index a644951c3..59772936e 100644
--- a/src/views/assets/AssetList.vue
+++ b/src/views/assets/AssetList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, ActionsFormatter, ChoicesFormatter } from '@/components/DataTable/formatters/index'
+import { DetailFormatter, ActionsFormatter, ChoicesFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
diff --git a/src/views/assets/CommandFilterList.vue b/src/views/assets/CommandFilterList.vue
index b705bb410..e602898ac 100644
--- a/src/views/assets/CommandFilterList.vue
+++ b/src/views/assets/CommandFilterList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, ActionsFormatter } from '@/components/DataTable/formatters/index'
+import { DetailFormatter, ActionsFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
diff --git a/src/views/assets/DomainList.vue b/src/views/assets/DomainList.vue
index 7de8cde6e..421519913 100644
--- a/src/views/assets/DomainList.vue
+++ b/src/views/assets/DomainList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, ActionsFormatter } from '@/components/DataTable/formatters/index'
+import { DetailFormatter, ActionsFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
diff --git a/src/views/assets/GatewayList.vue b/src/views/assets/GatewayList.vue
index 6ab0248cd..e9bf72f06 100644
--- a/src/views/assets/GatewayList.vue
+++ b/src/views/assets/GatewayList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { ActionsFormatter } from '@/components/DataTable/formatters/index'
+import { ActionsFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
diff --git a/src/views/assets/LabelList.vue b/src/views/assets/LabelList.vue
index 3663461f5..722189f69 100644
--- a/src/views/assets/LabelList.vue
+++ b/src/views/assets/LabelList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, ActionsFormatter } from '@/components/DataTable/formatters/index'
+import { DetailFormatter, ActionsFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
diff --git a/src/views/assets/PlatformList.vue b/src/views/assets/PlatformList.vue
index 9b6b68e18..3b46f4c6d 100644
--- a/src/views/assets/PlatformList.vue
+++ b/src/views/assets/PlatformList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, ActionsFormatter } from '@/components/DataTable/formatters/index'
+import { DetailFormatter, ActionsFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
diff --git a/src/views/assets/SystemUserList.vue b/src/views/assets/SystemUserList.vue
index 979eaa30b..2c2f0202f 100644
--- a/src/views/assets/SystemUserList.vue
+++ b/src/views/assets/SystemUserList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, ActionsFormatter } from '@/components/DataTable/formatters/index'
+import { DetailFormatter, ActionsFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
diff --git a/src/views/jobcenter/TaskList.vue b/src/views/jobcenter/TaskList.vue
index 774c57779..b30b09bcc 100644
--- a/src/views/jobcenter/TaskList.vue
+++ b/src/views/jobcenter/TaskList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, ActionsFormatter } from '@/components/DataTable/formatters/index'
+import { DetailFormatter, ActionsFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
diff --git a/src/views/perms/AssetPermissionList.vue b/src/views/perms/AssetPermissionList.vue
index 5acd45c76..17146fc22 100644
--- a/src/views/perms/AssetPermissionList.vue
+++ b/src/views/perms/AssetPermissionList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, ActionsFormatter, ChoicesFormatter } from '@/components/DataTable/formatters/index'
+import { DetailFormatter, ActionsFormatter, ChoicesFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
diff --git a/src/views/perms/DatabaseAppPermissionList.vue b/src/views/perms/DatabaseAppPermissionList.vue
index a3d67024c..8c7b3c33f 100644
--- a/src/views/perms/DatabaseAppPermissionList.vue
+++ b/src/views/perms/DatabaseAppPermissionList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, ActionsFormatter, ChoicesFormatter } from '@/components/DataTable/formatters/index'
+import { DetailFormatter, ActionsFormatter, ChoicesFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
diff --git a/src/views/perms/RemoteAppPermissionList.vue b/src/views/perms/RemoteAppPermissionList.vue
index 064ebace2..ebe68ece7 100644
--- a/src/views/perms/RemoteAppPermissionList.vue
+++ b/src/views/perms/RemoteAppPermissionList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, ActionsFormatter, ChoicesFormatter } from '@/components/DataTable/formatters/index'
+import { DetailFormatter, ActionsFormatter, ChoicesFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
diff --git a/src/views/sessions/CommandList.vue b/src/views/sessions/CommandList.vue
index 4a731e12a..fe4069d69 100644
--- a/src/views/sessions/CommandList.vue
+++ b/src/views/sessions/CommandList.vue
@@ -4,7 +4,6 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-// import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
 
 export default {
   components: {
diff --git a/src/views/sessions/SessionOfflineList.vue b/src/views/sessions/SessionOfflineList.vue
index fd32830a1..d7f49b21d 100644
--- a/src/views/sessions/SessionOfflineList.vue
+++ b/src/views/sessions/SessionOfflineList.vue
@@ -4,7 +4,6 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-// import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
 
 export default {
   components: {
diff --git a/src/views/sessions/SessionOnlineList.vue b/src/views/sessions/SessionOnlineList.vue
index 0de8a8e38..270fb1afd 100644
--- a/src/views/sessions/SessionOnlineList.vue
+++ b/src/views/sessions/SessionOnlineList.vue
@@ -4,7 +4,6 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter } from '@/components/DataTable/formatters/index'
 
 export default {
   components: {
diff --git a/src/views/sessions/TerminalList.vue b/src/views/sessions/TerminalList.vue
index 47a69db26..44d13ee41 100644
--- a/src/views/sessions/TerminalList.vue
+++ b/src/views/sessions/TerminalList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import DetailFormatter from '@/components/DataTable/formatters/DetailFormatter'
+import { DetailFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
diff --git a/src/views/tickets/TicketsList.vue b/src/views/tickets/TicketsList.vue
index f50e6a505..979e55ec4 100644
--- a/src/views/tickets/TicketsList.vue
+++ b/src/views/tickets/TicketsList.vue
@@ -11,7 +11,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter } from '@/components/DataTable/formatters/index'
+import { DetailFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {

From f0b69c8026ba41e5d4c0d284bc30c07339a6a7cc Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Tue, 7 Apr 2020 18:22:11 +0800
Subject: [PATCH 24/26] =?UTF-8?q?[Update]=20=E6=9B=B4=E6=96=B0=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.js                          |  4 +-
 src/views/applications/DatabaseAppList.vue    | 29 +-----------
 src/views/applications/RemoteAppList.vue      | 35 ++-------------
 src/views/assets/AdminUserList.vue            | 35 ++-------------
 src/views/assets/CommandFilterList.vue        | 35 ++-------------
 src/views/assets/DomainList.vue               | 35 ++-------------
 src/views/assets/GatewayList.vue              | 44 +++++--------------
 src/views/assets/LabelList.vue                | 35 ++-------------
 src/views/assets/PlatformList.vue             | 35 ++-------------
 src/views/assets/SystemUserList.vue           | 35 ++-------------
 src/views/jobcenter/TaskList.vue              | 37 +++-------------
 src/views/perms/DatabaseAppPermissionList.vue | 35 ++-------------
 src/views/perms/RemoteAppPermissionList.vue   | 35 ++-------------
 src/views/sessions/CommandList.vue            |  3 +-
 src/views/sessions/SessionOfflineList.vue     | 29 ++++--------
 src/views/sessions/SessionOnlineList.vue      | 24 +++++-----
 src/views/sessions/TerminalList.vue           | 20 +++++++--
 src/views/tickets/TicketsList.vue             | 11 ++---
 18 files changed, 88 insertions(+), 428 deletions(-)

diff --git a/src/i18n/langs/cn.js b/src/i18n/langs/cn.js
index 5be43ffb2..489ce7f3f 100644
--- a/src/i18n/langs/cn.js
+++ b/src/i18n/langs/cn.js
@@ -233,6 +233,7 @@ const cn = {
     'gateway': '网关',
     'date_created': '创建日期',
     'port': '端口',
+    'TestConnection': '测试连接',
     // 管理用户
     'AdminUserList': '管理用户列表',
     'AdminUserDetail': '管理用户详情',
@@ -368,7 +369,8 @@ const cn = {
     'date': '日期',
     'addr': '地址',
     'active': '激活中',
-    'alive': '在线'
+    'alive': '在线',
+    'StorageConfiguration': '存储配置'
   },
   jobcenter: {
     'RunTimes': '执行次数',
diff --git a/src/views/applications/DatabaseAppList.vue b/src/views/applications/DatabaseAppList.vue
index 3aaea25d1..2e82d50d7 100644
--- a/src/views/applications/DatabaseAppList.vue
+++ b/src/views/applications/DatabaseAppList.vue
@@ -51,31 +51,7 @@ export default {
             prop: 'id',
             label: this.$tc('Action'),
             align: 'center',
-            formatter: ActionsFormatter,
-            actions: {
-              hasUpdate: (row, cellValue) => {
-                return true
-              },
-              canUpdate: (row, cellValue) => {
-                console.log('On table update')
-                return true
-              },
-              hasDelete: true,
-              canDelete: (row, cellValue) => {
-                return true
-              },
-              onDelete: (row, cellValue) => {
-                this.$confirm('你好啊', '提示', {
-                  type: 'warning',
-                  confirmButtonClass: 'el-button--danger',
-                  beforeClose: async(action, instance, done) => {
-                  }
-                }).catch(() => {
-                  /* 取消*/
-                })
-              },
-              order: []
-            }
+            formatter: ActionsFormatter
           }
         ],
         tableActions: {
@@ -84,8 +60,7 @@ export default {
         }
       },
       headerActions: {
-        hasDelete: false,
-        hasUpdate: false,
+        hasBulkDelete: false,
         createRoute: 'DatabaseAppCreate'
       }
     }
diff --git a/src/views/applications/RemoteAppList.vue b/src/views/applications/RemoteAppList.vue
index 0df534c3d..6bc7a6b6e 100644
--- a/src/views/applications/RemoteAppList.vue
+++ b/src/views/applications/RemoteAppList.vue
@@ -39,41 +39,12 @@ export default {
             prop: 'id',
             label: this.$tc('Action'),
             align: 'center',
-            formatter: ActionsFormatter,
-            actions: {
-              hasUpdate: (row, cellValue) => {
-                return true
-              },
-              canUpdate: (row, cellValue) => {
-                console.log('On table update')
-                return true
-              },
-              hasDelete: true,
-              canDelete: (row, cellValue) => {
-                return true
-              },
-              onDelete: (row, cellValue) => {
-                this.$confirm('你好啊', '提示', {
-                  type: 'warning',
-                  confirmButtonClass: 'el-button--danger',
-                  beforeClose: async(action, instance, done) => {
-                  }
-                }).catch(() => {
-                  /* 取消*/
-                })
-              },
-              order: []
-            }
+            formatter: ActionsFormatter
           }
-        ],
-        tableActions: {
-          hasEdit: true,
-          editRoute: '404'
-        }
+        ]
       },
       headerActions: {
-        hasDelete: false,
-        hasUpdate: false,
+        hasBulkDelete: false,
         createRoute: 'RemoteAppCreate'
       }
     }
diff --git a/src/views/assets/AdminUserList.vue b/src/views/assets/AdminUserList.vue
index 1aa99dc9e..b900c657d 100644
--- a/src/views/assets/AdminUserList.vue
+++ b/src/views/assets/AdminUserList.vue
@@ -40,41 +40,12 @@ export default {
             prop: 'id',
             label: this.$tc('Action'),
             align: 'center',
-            formatter: ActionsFormatter,
-            actions: {
-              hasUpdate: (row, cellValue) => {
-                return true
-              },
-              canUpdate: (row, cellValue) => {
-                console.log('On table update')
-                return true
-              },
-              hasDelete: true,
-              canDelete: (row, cellValue) => {
-                return true
-              },
-              onDelete: (row, cellValue) => {
-                this.$confirm('你好啊', '提示', {
-                  type: 'warning',
-                  confirmButtonClass: 'el-button--danger',
-                  beforeClose: async(action, instance, done) => {
-                  }
-                }).catch(() => {
-                  /* 取消*/
-                })
-              },
-              order: []
-            }
+            formatter: ActionsFormatter
           }
-        ],
-        tableActions: {
-          hasEdit: true,
-          editRoute: '404'
-        }
+        ]
       },
       headerActions: {
-        hasDelete: false,
-        hasUpdate: false,
+        hasBulkDelete: false,
         createRoute: 'AdminUserCreate'
       }
     }
diff --git a/src/views/assets/CommandFilterList.vue b/src/views/assets/CommandFilterList.vue
index e602898ac..7f6e7ef53 100644
--- a/src/views/assets/CommandFilterList.vue
+++ b/src/views/assets/CommandFilterList.vue
@@ -39,41 +39,12 @@ export default {
             prop: 'id',
             label: this.$tc('Action'),
             align: 'center',
-            formatter: ActionsFormatter,
-            actions: {
-              hasUpdate: (row, cellValue) => {
-                return true
-              },
-              canUpdate: (row, cellValue) => {
-                console.log('On table update')
-                return true
-              },
-              hasDelete: true,
-              canDelete: (row, cellValue) => {
-                return true
-              },
-              onDelete: (row, cellValue) => {
-                this.$confirm('你好啊', '提示', {
-                  type: 'warning',
-                  confirmButtonClass: 'el-button--danger',
-                  beforeClose: async(action, instance, done) => {
-                  }
-                }).catch(() => {
-                  /* 取消*/
-                })
-              },
-              order: []
-            }
+            formatter: ActionsFormatter
           }
-        ],
-        tableActions: {
-          hasEdit: true,
-          editRoute: '404'
-        }
+        ]
       },
       headerActions: {
-        hasDelete: false,
-        hasUpdate: false,
+        hasBulkDelete: false,
         createRoute: 'CommandFilterCreate'
       }
     }
diff --git a/src/views/assets/DomainList.vue b/src/views/assets/DomainList.vue
index 421519913..b3ddf7fee 100644
--- a/src/views/assets/DomainList.vue
+++ b/src/views/assets/DomainList.vue
@@ -41,41 +41,12 @@ export default {
             prop: 'id',
             label: this.$tc('Action'),
             align: 'center',
-            formatter: ActionsFormatter,
-            actions: {
-              hasUpdate: (row, cellValue) => {
-                return true
-              },
-              canUpdate: (row, cellValue) => {
-                console.log('On table update')
-                return true
-              },
-              hasDelete: true,
-              canDelete: (row, cellValue) => {
-                return true
-              },
-              onDelete: (row, cellValue) => {
-                this.$confirm('你好啊', '提示', {
-                  type: 'warning',
-                  confirmButtonClass: 'el-button--danger',
-                  beforeClose: async(action, instance, done) => {
-                  }
-                }).catch(() => {
-                  /* 取消*/
-                })
-              },
-              order: []
-            }
+            formatter: ActionsFormatter
           }
-        ],
-        tableActions: {
-          hasEdit: true,
-          editRoute: '404'
-        }
+        ]
       },
       headerActions: {
-        hasDelete: false,
-        hasUpdate: false,
+        hasBulkDelete: false,
         createRoute: 'DomainCreate'
       }
     }
diff --git a/src/views/assets/GatewayList.vue b/src/views/assets/GatewayList.vue
index e9bf72f06..1722f84b4 100644
--- a/src/views/assets/GatewayList.vue
+++ b/src/views/assets/GatewayList.vue
@@ -51,46 +51,22 @@ export default {
             align: 'center',
             formatter: ActionsFormatter,
             actions: {
-              hasUpdate: (row, cellValue) => {
-                return true
-              },
-              canUpdate: (row, cellValue) => {
-                console.log('On table update')
-                return true
-              },
-              hasDelete: true,
-              canDelete: (row, cellValue) => {
-                return true
-              },
-              onDelete: (row, cellValue) => {
-                this.$confirm('你好啊', '提示', {
-                  type: 'warning',
-                  confirmButtonClass: 'el-button--danger',
-                  beforeClose: async(action, instance, done) => {
-                  }
-                }).catch(() => {
-                  /* 取消*/
-                })
-              },
-              order: []
+              updateRoute: 'UserUpdate',
+              extraActions: [
+                {
+                  name: 'TestConnection',
+                  title: this.$t('assets.TestConnection')
+                }
+              ]
             }
           }
-        ],
-        tableActions: {
-          hasEdit: true,
-          editRoute: '404'
-        }
+        ]
       },
       headerActions: {
-        hasDelete: false,
-        hasUpdate: false,
-        createRoute: 'DomainCreate'
+        hasBulkDelete: false,
+        createRoute: 'GatewayCreate'
       }
     }
-  },
-  created() {
-    console.log('111111')
-    console.log('/api/v1/assets/gateways/?domain=' + this.$route.params.id)
   }
 }
 </script>
diff --git a/src/views/assets/LabelList.vue b/src/views/assets/LabelList.vue
index 722189f69..796c4cbe7 100644
--- a/src/views/assets/LabelList.vue
+++ b/src/views/assets/LabelList.vue
@@ -35,41 +35,12 @@ export default {
             prop: 'id',
             label: this.$tc('Action'),
             align: 'center',
-            formatter: ActionsFormatter,
-            actions: {
-              hasUpdate: (row, cellValue) => {
-                return true
-              },
-              canUpdate: (row, cellValue) => {
-                console.log('On table update')
-                return true
-              },
-              hasDelete: true,
-              canDelete: (row, cellValue) => {
-                return true
-              },
-              onDelete: (row, cellValue) => {
-                this.$confirm('你好啊', '提示', {
-                  type: 'warning',
-                  confirmButtonClass: 'el-button--danger',
-                  beforeClose: async(action, instance, done) => {
-                  }
-                }).catch(() => {
-                  /* 取消*/
-                })
-              },
-              order: []
-            }
+            formatter: ActionsFormatter
           }
-        ],
-        tableActions: {
-          hasEdit: true,
-          editRoute: '404'
-        }
+        ]
       },
       headerActions: {
-        hasDelete: false,
-        hasUpdate: false,
+        hasBulkDelete: false,
         createRoute: 'LabelCreate'
       }
     }
diff --git a/src/views/assets/PlatformList.vue b/src/views/assets/PlatformList.vue
index 3b46f4c6d..4e8cdb33d 100644
--- a/src/views/assets/PlatformList.vue
+++ b/src/views/assets/PlatformList.vue
@@ -36,41 +36,12 @@ export default {
             prop: 'id',
             label: this.$tc('Action'),
             align: 'center',
-            formatter: ActionsFormatter,
-            actions: {
-              hasUpdate: (row, cellValue) => {
-                return true
-              },
-              canUpdate: (row, cellValue) => {
-                console.log('On table update')
-                return true
-              },
-              hasDelete: true,
-              canDelete: (row, cellValue) => {
-                return true
-              },
-              onDelete: (row, cellValue) => {
-                this.$confirm('你好啊', '提示', {
-                  type: 'warning',
-                  confirmButtonClass: 'el-button--danger',
-                  beforeClose: async(action, instance, done) => {
-                  }
-                }).catch(() => {
-                  /* 取消*/
-                })
-              },
-              order: []
-            }
+            formatter: ActionsFormatter
           }
-        ],
-        tableActions: {
-          hasEdit: true,
-          editRoute: '404'
-        }
+        ]
       },
       headerActions: {
-        hasDelete: false,
-        hasUpdate: false,
+        hasBulkDelete: false,
         createRoute: 'PlatformCreate'
       }
     }
diff --git a/src/views/assets/SystemUserList.vue b/src/views/assets/SystemUserList.vue
index 2c2f0202f..ee87194a4 100644
--- a/src/views/assets/SystemUserList.vue
+++ b/src/views/assets/SystemUserList.vue
@@ -51,41 +51,12 @@ export default {
             prop: 'id',
             label: this.$tc('Action'),
             align: 'center',
-            formatter: ActionsFormatter,
-            actions: {
-              hasUpdate: (row, cellValue) => {
-                return true
-              },
-              canUpdate: (row, cellValue) => {
-                console.log('On table update')
-                return true
-              },
-              hasDelete: true,
-              canDelete: (row, cellValue) => {
-                return true
-              },
-              onDelete: (row, cellValue) => {
-                this.$confirm('你好啊', '提示', {
-                  type: 'warning',
-                  confirmButtonClass: 'el-button--danger',
-                  beforeClose: async(action, instance, done) => {
-                  }
-                }).catch(() => {
-                  /* 取消*/
-                })
-              },
-              order: []
-            }
+            formatter: ActionsFormatter
           }
-        ],
-        tableActions: {
-          hasEdit: true,
-          editRoute: '404'
-        }
+        ]
       },
       headerActions: {
-        hasDelete: false,
-        hasUpdate: false,
+        hasBulkDelete: false,
         createRoute: 'SystemUserCreate'
       }
     }
diff --git a/src/views/jobcenter/TaskList.vue b/src/views/jobcenter/TaskList.vue
index b30b09bcc..b1df0f7ed 100644
--- a/src/views/jobcenter/TaskList.vue
+++ b/src/views/jobcenter/TaskList.vue
@@ -48,41 +48,16 @@ export default {
             label: this.$tc('Action'),
             align: 'center',
             formatter: ActionsFormatter,
-            actions: {
-              hasUpdate: (row, cellValue) => {
-                return false
-              },
-              canUpdate: (row, cellValue) => {
-                console.log('On table update')
-                return false
-              },
-              hasDelete: true,
-              canDelete: (row, cellValue) => {
-                return true
-              },
-              onDelete: (row, cellValue) => {
-                this.$confirm('你好啊', '提示', {
-                  type: 'warning',
-                  confirmButtonClass: 'el-button--danger',
-                  beforeClose: async(action, instance, done) => {
-                  }
-                }).catch(() => {
-                  /* 取消*/
-                })
-              },
-              order: []
-            }
+            actions: [
+            ]
           }
         ],
-        // 写路由名字，table组件会自动传作为参数
-        tableActions: {
-          editRoute: '404'
-        }
+        hasEdit: false,
+        hasDelete: false
       },
       headerActions: {
-        hasDelete: false,
-        hasUpdate: false,
-        hasCreate: false
+        hasCreate: false,
+        hasBulkDelete: false,
       }
     }
   }
diff --git a/src/views/perms/DatabaseAppPermissionList.vue b/src/views/perms/DatabaseAppPermissionList.vue
index 8c7b3c33f..b63363b2c 100644
--- a/src/views/perms/DatabaseAppPermissionList.vue
+++ b/src/views/perms/DatabaseAppPermissionList.vue
@@ -49,41 +49,12 @@ export default {
             prop: 'id',
             label: this.$tc('Action'),
             align: 'center',
-            formatter: ActionsFormatter,
-            actions: {
-              hasUpdate: (row, cellValue) => {
-                return true
-              },
-              canUpdate: (row, cellValue) => {
-                console.log('On table update')
-                return true
-              },
-              hasDelete: true,
-              canDelete: (row, cellValue) => {
-                return true
-              },
-              onDelete: (row, cellValue) => {
-                this.$confirm('你好啊', '提示', {
-                  type: 'warning',
-                  confirmButtonClass: 'el-button--danger',
-                  beforeClose: async(action, instance, done) => {
-                  }
-                }).catch(() => {
-                  /* 取消*/
-                })
-              },
-              order: []
-            }
+            formatter: ActionsFormatter
           }
-        ],
-        tableActions: {
-          hasEdit: true,
-          editRoute: '404'
-        }
+        ]
       },
       headerActions: {
-        hasDelete: false,
-        hasUpdate: false,
+        hasBulkDelete: false,
         createRoute: 'DatabaseAppPermissionCreate'
       }
     }
diff --git a/src/views/perms/RemoteAppPermissionList.vue b/src/views/perms/RemoteAppPermissionList.vue
index ebe68ece7..0e7f8a595 100644
--- a/src/views/perms/RemoteAppPermissionList.vue
+++ b/src/views/perms/RemoteAppPermissionList.vue
@@ -49,41 +49,12 @@ export default {
             prop: 'id',
             label: this.$tc('Action'),
             align: 'center',
-            formatter: ActionsFormatter,
-            actions: {
-              hasUpdate: (row, cellValue) => {
-                return true
-              },
-              canUpdate: (row, cellValue) => {
-                console.log('On table update')
-                return true
-              },
-              hasDelete: true,
-              canDelete: (row, cellValue) => {
-                return true
-              },
-              onDelete: (row, cellValue) => {
-                this.$confirm('你好啊', '提示', {
-                  type: 'warning',
-                  confirmButtonClass: 'el-button--danger',
-                  beforeClose: async(action, instance, done) => {
-                  }
-                }).catch(() => {
-                  /* 取消*/
-                })
-              },
-              order: []
-            }
+            formatter: ActionsFormatter
           }
-        ],
-        tableActions: {
-          hasEdit: true,
-          editRoute: '404'
-        }
+        ]
       },
       headerActions: {
-        hasDelete: false,
-        hasUpdate: false,
+        hasBulkDelete: false,
         createRoute: 'RemoteAppPermissionCreate'
       }
     }
diff --git a/src/views/sessions/CommandList.vue b/src/views/sessions/CommandList.vue
index fe4069d69..c3544ff95 100644
--- a/src/views/sessions/CommandList.vue
+++ b/src/views/sessions/CommandList.vue
@@ -68,8 +68,7 @@ export default {
       },
       headerActions: {
         hasCreate: false,
-        hasDelete: false,
-        hasUpdate: false
+        hasBulkDelete: false
       }
     }
   }
diff --git a/src/views/sessions/SessionOfflineList.vue b/src/views/sessions/SessionOfflineList.vue
index d7f49b21d..16bdc63bf 100644
--- a/src/views/sessions/SessionOfflineList.vue
+++ b/src/views/sessions/SessionOfflineList.vue
@@ -4,6 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
+import { ActionsFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
@@ -66,34 +67,22 @@ export default {
           {
             prop: 'duration',
             label: this.$t('sessions.duration')
-          }
-        ],
-        tableActions: {
-          hasEdit: false,
-          hasDelete: false
-        },
-        extraButtons: [
-          {
-            type: 'warning',
-            text: this.$t('sessions.replay'),
-            // 必须使用箭头函数
-            atClick: (row) => {
-              this.$router.push({ name: '404' })
-            }
           },
           {
-            type: 'primary',
-            text: this.$t('sessions.download'),
-            atClick: (row) => {
-              this.$router.push({ name: '404' })
+            prop: 'id',
+            label: this.$tc('Action'),
+            align: 'center',
+            formatter: ActionsFormatter,
+            actions: {
+              hasEdit: false,
+              hasDelete: false
             }
           }
         ]
       },
       headerActions: {
         hasCreate: false,
-        hasDelete: false,
-        hasUpdate: false
+        hasBulkDelete: false
       }
     }
   }
diff --git a/src/views/sessions/SessionOnlineList.vue b/src/views/sessions/SessionOnlineList.vue
index 270fb1afd..95c9d6b3a 100644
--- a/src/views/sessions/SessionOnlineList.vue
+++ b/src/views/sessions/SessionOnlineList.vue
@@ -4,6 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
+import { ActionsFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
@@ -66,27 +67,22 @@ export default {
           {
             prop: 'duration',
             label: this.$t('sessions.duration')
-          }
-        ],
-        tableActions: {
-          hasEdit: false,
-          hasDelete: false
-        },
-        extraButtons: [
+          },
           {
-            type: 'danger',
-            text: this.$t('sessions.terminate'),
-            // 必须使用箭头函数
-            atClick: (row) => {
-              this.$router.push({ name: '404' })
+            prop: 'id',
+            label: this.$tc('Action'),
+            align: 'center',
+            formatter: ActionsFormatter,
+            actions: {
+              hasEdit: false,
+              hasDelete: false
             }
           }
         ]
       },
       headerActions: {
         hasCreate: false,
-        hasDelete: false,
-        hasUpdate: false
+        hasBulkDelete: false
       }
     }
   }
diff --git a/src/views/sessions/TerminalList.vue b/src/views/sessions/TerminalList.vue
index 44d13ee41..f07384f3a 100644
--- a/src/views/sessions/TerminalList.vue
+++ b/src/views/sessions/TerminalList.vue
@@ -55,11 +55,25 @@ export default {
         }
       },
       headerActions: {
-        hasCreate: true,
-        hasDelete: false,
-        hasUpdate: false
+        hasCreate: false,
+        hasBulkDelete: false,
+        extraActions: [
+          {
+            name: 'StorageConfiguration',
+            title: this.$t('sessions.StorageConfiguration'),
+            type: 'primary',
+            has: true,
+            can: true,
+            callback: this.handleStorageConfiguration
+          }
+        ]
       }
     }
+  },
+  methods: {
+    handleStorageConfiguration() {
+      console.log('handleStorageConfiguration')
+    }
   }
 }
 </script>
diff --git a/src/views/tickets/TicketsList.vue b/src/views/tickets/TicketsList.vue
index 979e55ec4..3c5d14549 100644
--- a/src/views/tickets/TicketsList.vue
+++ b/src/views/tickets/TicketsList.vue
@@ -57,16 +57,11 @@ export default {
             label: this.$t('tickets.date'),
             sortable: 'custom'
           }
-        ],
-        // 写路由名字，table组件会自动传作为参数
-        tableActions: {
-          editRoute: '404'
-        }
+        ]
       },
       headerActions: {
-        hasDelete: false,
-        hasUpdate: false,
-        hasCreate: false
+        hasCreate: false,
+        hasBulkDelete: false,
       }
     }
   }

From f1bd61e7397c911a8034b2c4f47d3d02255ee0cb Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Tue, 7 Apr 2020 18:33:42 +0800
Subject: [PATCH 25/26] =?UTF-8?q?[Update]=20=E5=A2=9E=E5=8A=A0=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E4=B8=AD=E5=8A=A8=E4=BD=9C=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E7=9A=84=E5=B0=BA=E5=AF=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/applications/DatabaseAppList.vue    |  3 +-
 src/views/applications/RemoteAppList.vue      |  3 +-
 src/views/assets/AdminUserList.vue            |  3 +-
 src/views/assets/AssetList.vue                | 28 +------------------
 src/views/assets/CommandFilterList.vue        |  3 +-
 src/views/assets/DomainList.vue               |  3 +-
 src/views/assets/GatewayList.vue              |  1 +
 src/views/assets/LabelList.vue                |  3 +-
 src/views/assets/PlatformList.vue             |  3 +-
 src/views/assets/SystemUserList.vue           |  3 +-
 src/views/jobcenter/TaskList.vue              |  1 +
 src/views/perms/AssetPermissionList.vue       | 23 +--------------
 src/views/perms/DatabaseAppPermissionList.vue |  3 +-
 src/views/perms/RemoteAppPermissionList.vue   |  3 +-
 src/views/sessions/SessionOfflineList.vue     |  1 +
 src/views/sessions/SessionOnlineList.vue      |  1 +
 src/views/sessions/TerminalList.vue           |  5 +---
 src/views/tickets/TicketsList.vue             |  2 +-
 18 files changed, 28 insertions(+), 64 deletions(-)

diff --git a/src/views/applications/DatabaseAppList.vue b/src/views/applications/DatabaseAppList.vue
index 2e82d50d7..72d915dc7 100644
--- a/src/views/applications/DatabaseAppList.vue
+++ b/src/views/applications/DatabaseAppList.vue
@@ -51,7 +51,8 @@ export default {
             prop: 'id',
             label: this.$tc('Action'),
             align: 'center',
-            formatter: ActionsFormatter
+            formatter: ActionsFormatter,
+            width: '200px',
           }
         ],
         tableActions: {
diff --git a/src/views/applications/RemoteAppList.vue b/src/views/applications/RemoteAppList.vue
index 6bc7a6b6e..e451868ea 100644
--- a/src/views/applications/RemoteAppList.vue
+++ b/src/views/applications/RemoteAppList.vue
@@ -39,7 +39,8 @@ export default {
             prop: 'id',
             label: this.$tc('Action'),
             align: 'center',
-            formatter: ActionsFormatter
+            formatter: ActionsFormatter,
+            width: '200px',
           }
         ]
       },
diff --git a/src/views/assets/AdminUserList.vue b/src/views/assets/AdminUserList.vue
index b900c657d..39adc5d33 100644
--- a/src/views/assets/AdminUserList.vue
+++ b/src/views/assets/AdminUserList.vue
@@ -40,7 +40,8 @@ export default {
             prop: 'id',
             label: this.$tc('Action'),
             align: 'center',
-            formatter: ActionsFormatter
+            formatter: ActionsFormatter,
+            width: '200px',
           }
         ]
       },
diff --git a/src/views/assets/AssetList.vue b/src/views/assets/AssetList.vue
index 59772936e..e318a1560 100644
--- a/src/views/assets/AssetList.vue
+++ b/src/views/assets/AssetList.vue
@@ -42,35 +42,9 @@ export default {
             align: 'center',
             formatter: ActionsFormatter,
             actions: {
-              hasUpdate: (row, cellValue) => {
-                return true
-              },
-              canUpdate: (row, cellValue) => {
-                console.log('On table update')
-                return true
-              },
-              hasDelete: true,
-              canDelete: (row, cellValue) => {
-                return true
-              },
-              onDelete: (row, cellValue) => {
-                this.$confirm('你好啊', '提示', {
-                  type: 'warning',
-                  confirmButtonClass: 'el-button--danger',
-                  beforeClose: async(action, instance, done) => {
-                  }
-                }).catch(() => {
-                  /* 取消*/
-                })
-              },
-              order: []
             }
           }
-        ],
-        tableActions: {
-          // hasEdit: true,
-          editRoute: '404'
-        }
+        ]
       },
       headerActions: {
         createRoute: 'AssetCreate'
diff --git a/src/views/assets/CommandFilterList.vue b/src/views/assets/CommandFilterList.vue
index 7f6e7ef53..7fe87ae4f 100644
--- a/src/views/assets/CommandFilterList.vue
+++ b/src/views/assets/CommandFilterList.vue
@@ -39,7 +39,8 @@ export default {
             prop: 'id',
             label: this.$tc('Action'),
             align: 'center',
-            formatter: ActionsFormatter
+            formatter: ActionsFormatter,
+            width: '200px'
           }
         ]
       },
diff --git a/src/views/assets/DomainList.vue b/src/views/assets/DomainList.vue
index b3ddf7fee..7d6e21759 100644
--- a/src/views/assets/DomainList.vue
+++ b/src/views/assets/DomainList.vue
@@ -41,7 +41,8 @@ export default {
             prop: 'id',
             label: this.$tc('Action'),
             align: 'center',
-            formatter: ActionsFormatter
+            formatter: ActionsFormatter,
+            width: '200px'
           }
         ]
       },
diff --git a/src/views/assets/GatewayList.vue b/src/views/assets/GatewayList.vue
index 1722f84b4..a4a70163b 100644
--- a/src/views/assets/GatewayList.vue
+++ b/src/views/assets/GatewayList.vue
@@ -50,6 +50,7 @@ export default {
             label: this.$tc('Action'),
             align: 'center',
             formatter: ActionsFormatter,
+            width: '200px',
             actions: {
               updateRoute: 'UserUpdate',
               extraActions: [
diff --git a/src/views/assets/LabelList.vue b/src/views/assets/LabelList.vue
index 796c4cbe7..d674fe4b7 100644
--- a/src/views/assets/LabelList.vue
+++ b/src/views/assets/LabelList.vue
@@ -35,7 +35,8 @@ export default {
             prop: 'id',
             label: this.$tc('Action'),
             align: 'center',
-            formatter: ActionsFormatter
+            formatter: ActionsFormatter,
+            width: '200px'
           }
         ]
       },
diff --git a/src/views/assets/PlatformList.vue b/src/views/assets/PlatformList.vue
index 4e8cdb33d..d917ae139 100644
--- a/src/views/assets/PlatformList.vue
+++ b/src/views/assets/PlatformList.vue
@@ -36,7 +36,8 @@ export default {
             prop: 'id',
             label: this.$tc('Action'),
             align: 'center',
-            formatter: ActionsFormatter
+            formatter: ActionsFormatter,
+            width: '200px'
           }
         ]
       },
diff --git a/src/views/assets/SystemUserList.vue b/src/views/assets/SystemUserList.vue
index ee87194a4..a768df6c8 100644
--- a/src/views/assets/SystemUserList.vue
+++ b/src/views/assets/SystemUserList.vue
@@ -51,7 +51,8 @@ export default {
             prop: 'id',
             label: this.$tc('Action'),
             align: 'center',
-            formatter: ActionsFormatter
+            formatter: ActionsFormatter,
+            width: '200px'
           }
         ]
       },
diff --git a/src/views/jobcenter/TaskList.vue b/src/views/jobcenter/TaskList.vue
index b1df0f7ed..08a9d8543 100644
--- a/src/views/jobcenter/TaskList.vue
+++ b/src/views/jobcenter/TaskList.vue
@@ -48,6 +48,7 @@ export default {
             label: this.$tc('Action'),
             align: 'center',
             formatter: ActionsFormatter,
+            width: '200px',
             actions: [
             ]
           }
diff --git a/src/views/perms/AssetPermissionList.vue b/src/views/perms/AssetPermissionList.vue
index 17146fc22..3df506f49 100644
--- a/src/views/perms/AssetPermissionList.vue
+++ b/src/views/perms/AssetPermissionList.vue
@@ -54,29 +54,8 @@ export default {
             label: this.$tc('Action'),
             align: 'center',
             formatter: ActionsFormatter,
+            width: '200px',
             actions: {
-              hasUpdate: (row, cellValue) => {
-                return true
-              },
-              canUpdate: (row, cellValue) => {
-                console.log('On table update')
-                return true
-              },
-              hasDelete: true,
-              canDelete: (row, cellValue) => {
-                return true
-              },
-              onDelete: (row, cellValue) => {
-                this.$confirm('你好啊', '提示', {
-                  type: 'warning',
-                  confirmButtonClass: 'el-button--danger',
-                  beforeClose: async(action, instance, done) => {
-                  }
-                }).catch(() => {
-                  /* 取消*/
-                })
-              },
-              order: []
             }
           }
         ],
diff --git a/src/views/perms/DatabaseAppPermissionList.vue b/src/views/perms/DatabaseAppPermissionList.vue
index b63363b2c..e6e5069a3 100644
--- a/src/views/perms/DatabaseAppPermissionList.vue
+++ b/src/views/perms/DatabaseAppPermissionList.vue
@@ -49,7 +49,8 @@ export default {
             prop: 'id',
             label: this.$tc('Action'),
             align: 'center',
-            formatter: ActionsFormatter
+            formatter: ActionsFormatter,
+            width: '200px'
           }
         ]
       },
diff --git a/src/views/perms/RemoteAppPermissionList.vue b/src/views/perms/RemoteAppPermissionList.vue
index 0e7f8a595..aa006a1c1 100644
--- a/src/views/perms/RemoteAppPermissionList.vue
+++ b/src/views/perms/RemoteAppPermissionList.vue
@@ -49,7 +49,8 @@ export default {
             prop: 'id',
             label: this.$tc('Action'),
             align: 'center',
-            formatter: ActionsFormatter
+            formatter: ActionsFormatter,
+            width: '200px'
           }
         ]
       },
diff --git a/src/views/sessions/SessionOfflineList.vue b/src/views/sessions/SessionOfflineList.vue
index 16bdc63bf..3392d2eff 100644
--- a/src/views/sessions/SessionOfflineList.vue
+++ b/src/views/sessions/SessionOfflineList.vue
@@ -73,6 +73,7 @@ export default {
             label: this.$tc('Action'),
             align: 'center',
             formatter: ActionsFormatter,
+            width: '200px',
             actions: {
               hasEdit: false,
               hasDelete: false
diff --git a/src/views/sessions/SessionOnlineList.vue b/src/views/sessions/SessionOnlineList.vue
index 95c9d6b3a..93e3cd9aa 100644
--- a/src/views/sessions/SessionOnlineList.vue
+++ b/src/views/sessions/SessionOnlineList.vue
@@ -73,6 +73,7 @@ export default {
             label: this.$tc('Action'),
             align: 'center',
             formatter: ActionsFormatter,
+            width: '200px',
             actions: {
               hasEdit: false,
               hasDelete: false
diff --git a/src/views/sessions/TerminalList.vue b/src/views/sessions/TerminalList.vue
index f07384f3a..aa8da38f6 100644
--- a/src/views/sessions/TerminalList.vue
+++ b/src/views/sessions/TerminalList.vue
@@ -49,10 +49,7 @@ export default {
             label: this.$t('sessions.alive'),
             sortable: 'custom'
           }
-        ],
-        tableActions: {
-          editRoute: '404'
-        }
+        ]
       },
       headerActions: {
         hasCreate: false,
diff --git a/src/views/tickets/TicketsList.vue b/src/views/tickets/TicketsList.vue
index 3c5d14549..ce00cbbcd 100644
--- a/src/views/tickets/TicketsList.vue
+++ b/src/views/tickets/TicketsList.vue
@@ -61,7 +61,7 @@ export default {
       },
       headerActions: {
         hasCreate: false,
-        hasBulkDelete: false,
+        hasBulkDelete: false
       }
     }
   }

From f3dd7d666650faa3fdbef666e041f9c4079253ed Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Tue, 7 Apr 2020 20:32:14 +0800
Subject: [PATCH 26/26] =?UTF-8?q?[Update]=20=E6=9B=B4=E6=96=B0=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=8C=89=E9=92=AE=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                           |  3 ++-
 src/views/applications/DatabaseAppList.vue    |  7 +++++++
 src/views/applications/RemoteAppList.vue      |  7 +++++++
 src/views/assets/AdminUserList.vue            |  7 +++++++
 src/views/assets/AssetList.vue                |  6 ++++++
 src/views/assets/CommandFilterList.vue        |  9 ++++++++-
 src/views/assets/DomainList.vue               |  9 ++++++++-
 src/views/assets/GatewayList.vue              |  5 +++++
 src/views/assets/LabelList.vue                |  9 ++++++++-
 src/views/assets/PlatformList.vue             |  9 ++++++++-
 src/views/assets/SystemUserList.vue           | 11 +++++++++--
 src/views/perms/AssetPermissionList.vue       |  5 +++++
 src/views/perms/DatabaseAppPermissionList.vue |  9 ++++++++-
 src/views/perms/RemoteAppPermissionList.vue   |  9 ++++++++-
 src/views/sessions/SessionOfflineList.vue     |  9 ++++++++-
 src/views/sessions/SessionOnlineList.vue      | 14 +++++++++++++-
 16 files changed, 117 insertions(+), 11 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index ceb0899c2..da6ed4b89 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -137,8 +137,9 @@ export const constantRoutes = [
       {
         path: 'domains/:id/gateway',
         name: 'GatewayList',
+        hidden: true,
         component: () => import('@/views/assets/GatewayList'),
-        // meta: { title: 'GatewayList' }
+        meta: { title: 'GatewayList' }
       },
       {
         path: 'admin-users',
diff --git a/src/views/applications/DatabaseAppList.vue b/src/views/applications/DatabaseAppList.vue
index 72d915dc7..e2cef7fb6 100644
--- a/src/views/applications/DatabaseAppList.vue
+++ b/src/views/applications/DatabaseAppList.vue
@@ -53,6 +53,13 @@ export default {
             align: 'center',
             formatter: ActionsFormatter,
             width: '200px',
+            actions: {
+              performDelete: ({row, col})=> {
+                const id = row.id
+                const url = `/api/v1/applications/database-apps/${id}/`
+                return this.$axios.delete(url)
+              }
+            }
           }
         ],
         tableActions: {
diff --git a/src/views/applications/RemoteAppList.vue b/src/views/applications/RemoteAppList.vue
index e451868ea..e72f282b3 100644
--- a/src/views/applications/RemoteAppList.vue
+++ b/src/views/applications/RemoteAppList.vue
@@ -41,6 +41,13 @@ export default {
             align: 'center',
             formatter: ActionsFormatter,
             width: '200px',
+            actions: {
+              performDelete: ({row, col})=> {
+                const id = row.id
+                const url = `/api/v1/applications/remote-apps/${id}/`
+                return this.$axios.delete(url)
+              }
+            }
           }
         ]
       },
diff --git a/src/views/assets/AdminUserList.vue b/src/views/assets/AdminUserList.vue
index 39adc5d33..fd3d37f1b 100644
--- a/src/views/assets/AdminUserList.vue
+++ b/src/views/assets/AdminUserList.vue
@@ -42,6 +42,13 @@ export default {
             align: 'center',
             formatter: ActionsFormatter,
             width: '200px',
+            actions: {
+              performDelete: ({row, col})=> {
+                const id = row.id
+                const url = `/api/v1/assets/admin-users/${id}/`
+                return this.$axios.delete(url)
+              }
+            }
           }
         ]
       },
diff --git a/src/views/assets/AssetList.vue b/src/views/assets/AssetList.vue
index e318a1560..64ad05b87 100644
--- a/src/views/assets/AssetList.vue
+++ b/src/views/assets/AssetList.vue
@@ -41,7 +41,13 @@ export default {
             label: this.$tc('Action'),
             align: 'center',
             formatter: ActionsFormatter,
+            width: '200px',
             actions: {
+              performDelete: ({row, col})=> {
+                const id = row.id
+                const url = `/api/v1/assets/assets/${id}/`
+                return this.$axios.delete(url)
+              }
             }
           }
         ]
diff --git a/src/views/assets/CommandFilterList.vue b/src/views/assets/CommandFilterList.vue
index 7fe87ae4f..3a4322350 100644
--- a/src/views/assets/CommandFilterList.vue
+++ b/src/views/assets/CommandFilterList.vue
@@ -40,7 +40,14 @@ export default {
             label: this.$tc('Action'),
             align: 'center',
             formatter: ActionsFormatter,
-            width: '200px'
+            width: '200px',
+            actions: {
+              performDelete: ({row, col})=> {
+                const id = row.id
+                const url = `/api/v1/assets/cmd-filters/${id}/`
+                return this.$axios.delete(url)
+              }
+            }
           }
         ]
       },
diff --git a/src/views/assets/DomainList.vue b/src/views/assets/DomainList.vue
index 7d6e21759..b7878108d 100644
--- a/src/views/assets/DomainList.vue
+++ b/src/views/assets/DomainList.vue
@@ -42,7 +42,14 @@ export default {
             label: this.$tc('Action'),
             align: 'center',
             formatter: ActionsFormatter,
-            width: '200px'
+            width: '200px',
+            actions: {
+              performDelete: ({row, col})=> {
+                const id = row.id
+                const url = `/api/v1/assets/domains/${id}/`
+                return this.$axios.delete(url)
+              }
+            }
           }
         ]
       },
diff --git a/src/views/assets/GatewayList.vue b/src/views/assets/GatewayList.vue
index a4a70163b..2025dcb16 100644
--- a/src/views/assets/GatewayList.vue
+++ b/src/views/assets/GatewayList.vue
@@ -55,6 +55,11 @@ export default {
               updateRoute: 'UserUpdate',
               extraActions: [
                 {
+                  performDelete: ({row, col})=> {
+                    const id = row.id
+                    const url = `/api/v1/assets/gateways/${id}/`
+                    return this.$axios.delete(url)
+                  },
                   name: 'TestConnection',
                   title: this.$t('assets.TestConnection')
                 }
diff --git a/src/views/assets/LabelList.vue b/src/views/assets/LabelList.vue
index d674fe4b7..5dad5f9f3 100644
--- a/src/views/assets/LabelList.vue
+++ b/src/views/assets/LabelList.vue
@@ -36,7 +36,14 @@ export default {
             label: this.$tc('Action'),
             align: 'center',
             formatter: ActionsFormatter,
-            width: '200px'
+            width: '200px',
+            actions: {
+              performDelete: ({row, col})=> {
+                const id = row.id
+                const url = `/api/v1/assets/labels/${id}/`
+                return this.$axios.delete(url)
+              }
+            }
           }
         ]
       },
diff --git a/src/views/assets/PlatformList.vue b/src/views/assets/PlatformList.vue
index d917ae139..6bc164f8b 100644
--- a/src/views/assets/PlatformList.vue
+++ b/src/views/assets/PlatformList.vue
@@ -37,7 +37,14 @@ export default {
             label: this.$tc('Action'),
             align: 'center',
             formatter: ActionsFormatter,
-            width: '200px'
+            width: '200px',
+            actions: {
+              performDelete: ({row, col})=> {
+                const id = row.id
+                const url = `/api/v1/assets/platforms/${id}/`
+                return this.$axios.delete(url)
+              }
+            }
           }
         ]
       },
diff --git a/src/views/assets/SystemUserList.vue b/src/views/assets/SystemUserList.vue
index a768df6c8..c3dc7c5ff 100644
--- a/src/views/assets/SystemUserList.vue
+++ b/src/views/assets/SystemUserList.vue
@@ -52,12 +52,19 @@ export default {
             label: this.$tc('Action'),
             align: 'center',
             formatter: ActionsFormatter,
-            width: '200px'
+            width: '200px',
+            actions: {
+              performDelete: ({row, col})=> {
+                const id = row.id
+                const url = `/api/v1/assets/system-users/${id}/`
+                return this.$axios.delete(url)
+              }
+            }
           }
         ]
       },
       headerActions: {
-        hasBulkDelete: false,
+        // hasBulkDelete: false,
         createRoute: 'SystemUserCreate'
       }
     }
diff --git a/src/views/perms/AssetPermissionList.vue b/src/views/perms/AssetPermissionList.vue
index 3df506f49..558556963 100644
--- a/src/views/perms/AssetPermissionList.vue
+++ b/src/views/perms/AssetPermissionList.vue
@@ -56,6 +56,11 @@ export default {
             formatter: ActionsFormatter,
             width: '200px',
             actions: {
+              performDelete: ({row, col})=> {
+                const id = row.id
+                const url = `/api/v1/perms/asset-permissions/${id}/`
+                return this.$axios.delete(url)
+              }
             }
           }
         ],
diff --git a/src/views/perms/DatabaseAppPermissionList.vue b/src/views/perms/DatabaseAppPermissionList.vue
index e6e5069a3..a3a56ea01 100644
--- a/src/views/perms/DatabaseAppPermissionList.vue
+++ b/src/views/perms/DatabaseAppPermissionList.vue
@@ -50,7 +50,14 @@ export default {
             label: this.$tc('Action'),
             align: 'center',
             formatter: ActionsFormatter,
-            width: '200px'
+            width: '200px',
+            actions: {
+              performDelete: ({row, col})=> {
+                const id = row.id
+                const url = `/api/v1/perms/database-app-permissions/${id}/`
+                return this.$axios.delete(url)
+              }
+            }
           }
         ]
       },
diff --git a/src/views/perms/RemoteAppPermissionList.vue b/src/views/perms/RemoteAppPermissionList.vue
index aa006a1c1..e82792f85 100644
--- a/src/views/perms/RemoteAppPermissionList.vue
+++ b/src/views/perms/RemoteAppPermissionList.vue
@@ -50,7 +50,14 @@ export default {
             label: this.$tc('Action'),
             align: 'center',
             formatter: ActionsFormatter,
-            width: '200px'
+            width: '200px',
+            actions: {
+              performDelete: ({row, col})=> {
+                const id = row.id
+                const url = `/api/v1/perms/database-app-permissions/${id}/`
+                return this.$axios.delete(url)
+              }
+            }
           }
         ]
       },
diff --git a/src/views/sessions/SessionOfflineList.vue b/src/views/sessions/SessionOfflineList.vue
index 3392d2eff..a1f453c5f 100644
--- a/src/views/sessions/SessionOfflineList.vue
+++ b/src/views/sessions/SessionOfflineList.vue
@@ -76,7 +76,14 @@ export default {
             width: '200px',
             actions: {
               hasEdit: false,
-              hasDelete: false
+              hasDelete: false,
+              extraActions: [
+                {
+                  name: 'terminate',
+                  title: this.$t('sessions.terminate'),
+                  type: 'primary'
+                }
+              ]
             }
           }
         ]
diff --git a/src/views/sessions/SessionOnlineList.vue b/src/views/sessions/SessionOnlineList.vue
index 93e3cd9aa..d9c3f50d7 100644
--- a/src/views/sessions/SessionOnlineList.vue
+++ b/src/views/sessions/SessionOnlineList.vue
@@ -76,7 +76,19 @@ export default {
             width: '200px',
             actions: {
               hasEdit: false,
-              hasDelete: false
+              hasDelete: false,
+              extraActions: [
+                {
+                  name: 'replay',
+                  title: this.$t('sessions.replay'),
+                  type: 'primary'
+                },
+                {
+                  name: 'replay',
+                  title: this.$t('sessions.download'),
+                  type: 'warning'
+                }
+              ]
             }
           }
         ]