From c083f6c4a4f082d746f9e036304268213361b94d Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 17 Dec 2020 14:35:28 +0800
Subject: [PATCH] =?UTF-8?q?fix(clone):=20=E4=BF=AE=E5=A4=8D=E4=B8=80?=
 =?UTF-8?q?=E4=B8=8Bclone=E4=B8=A2=E5=A4=B1=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ListTable/index.vue            |  4 --
 src/views/assets/AdminUser/AdminUserList.vue  | 47 ++--------------
 .../assets/SystemUser/SystemUserList.vue      | 56 +++----------------
 3 files changed, 14 insertions(+), 93 deletions(-)

diff --git a/src/components/ListTable/index.vue b/src/components/ListTable/index.vue
index 354b5dd6e..f7b2e4c98 100644
--- a/src/components/ListTable/index.vue
+++ b/src/components/ListTable/index.vue
@@ -81,10 +81,6 @@ export default {
       deep: true
     }
   },
-  mounted() {
-    this.$log.debug(this.headerActions)
-    this.$log.debug(this.iTableConfig)
-  },
   methods: {
     handleSelectionChange(val) {
       this.selectedRows = val
diff --git a/src/views/assets/AdminUser/AdminUserList.vue b/src/views/assets/AdminUser/AdminUserList.vue
index 9846f1d01..adf1bed4f 100644
--- a/src/views/assets/AdminUser/AdminUserList.vue
+++ b/src/views/assets/AdminUser/AdminUserList.vue
@@ -4,7 +4,6 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, ActionsFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
@@ -14,49 +13,15 @@ export default {
     return {
       tableConfig: {
         url: '/api/v1/assets/admin-users/',
-        columns: [
-          {
-            prop: 'name',
-            label: this.$t('common.Name'),
-            formatter: DetailFormatter,
-            showOverflowTooltip: true,
-            sortable: true,
-            formatterArgs: {
-              route: 'AdminUserDetail'
-            }
+        columns: ['name', 'username', 'assets_amount', 'comment', 'actions'],
+        columnsMeta: {
+          username: {
+            showOverflowTooltip: true
           },
-          {
-            prop: 'username',
-            label: this.$t('common.Username'),
-            showOverflowTooltip: true,
-            sortable: 'custom'
-          },
-          {
-            prop: 'assets_amount',
-            label: this.$t('assets.Assets'),
+          assets_amount: {
             width: '80px'
-          },
-          {
-            prop: 'comment',
-            showOverflowTooltip: true,
-            label: this.$t('common.Comment'),
-            sortable: 'custom'
-          },
-          {
-            prop: 'id',
-            align: 'center',
-            label: this.$t('common.Action'),
-            formatter: ActionsFormatter,
-            width: '200px',
-            formatterArgs: {
-              performDelete: ({ row, col }) => {
-                const id = row.id
-                const url = `/api/v1/assets/admin-users/${id}/`
-                return this.$axios.delete(url)
-              }
-            }
           }
-        ]
+        }
       },
       updateRoute: 'AdminUserUpdate',
       headerActions: {
diff --git a/src/views/assets/SystemUser/SystemUserList.vue b/src/views/assets/SystemUser/SystemUserList.vue
index 47be04442..e478676a3 100644
--- a/src/views/assets/SystemUser/SystemUserList.vue
+++ b/src/views/assets/SystemUser/SystemUserList.vue
@@ -4,7 +4,6 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, ActionsFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
@@ -14,60 +13,21 @@ export default {
     return {
       tableConfig: {
         url: '/api/v1/assets/system-users/',
-        columns: [
-          {
-            prop: 'name',
-            label: this.$t('common.Name'),
-            formatter: DetailFormatter,
-            showOverflowTooltip: true,
-            sortable: true,
-            formatterArgs: {
-              route: 'SystemUserDetail'
-            }
+        columns: ['name', 'username', 'protocol', 'login_mode', 'assets_amount', 'comment', 'actions'],
+        columnsMeta: {
+          username: {
+            showOverflowTooltip: true
           },
-          {
-            prop: 'username',
-            label: this.$t('common.Username'),
-            showOverflowTooltip: true,
-            sortable: 'custom'
-          },
-          {
-            prop: 'protocol',
-            label: this.$t('assets.Protocol'),
-            sortable: 'custom',
+          protocol: {
             width: '100px'
           },
-          {
-            prop: 'login_mode_display',
-            label: this.$t('assets.LoginModel'),
+          login_mode: {
             width: '120px'
           },
-          {
-            prop: 'assets_amount',
-            label: this.$t('assets.Assets'),
+          assets_amount: {
             width: '80px'
-          },
-          {
-            prop: 'comment',
-            showOverflowTooltip: true,
-            label: this.$t('common.Comment')
-          },
-          {
-            prop: 'id',
-            align: 'center',
-            formatter: ActionsFormatter,
-            width: '200px',
-            label: this.$t('common.Action'),
-            updateRoute: 'SystemUserUpdate',
-            formatterArgs: {
-              performDelete: ({ row, col }) => {
-                const id = row.id
-                const url = `/api/v1/assets/system-users/${id}/`
-                return this.$axios.delete(url)
-              }
-            }
           }
-        ]
+        }
       },
       headerActions: {
         hasMoreActions: false,