From 54aa252c209a115406f0b95f78320cf6972ebb88 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 17 Dec 2020 15:09:26 +0800
Subject: [PATCH] =?UTF-8?q?fix(some):=20=E4=BF=AE=E5=A4=8D=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89clone=E7=9A=84=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DatabaseApp/DatabaseAppList.vue           |  1 +
 .../applications/RemoteApp/RemoteAppList.vue  |  1 +
 .../CommandFilter/CommandFilterList.vue       | 55 ++++---------------
 src/views/assets/Label/LabelList.vue          | 39 +++----------
 src/views/assets/Platform/PlatformList.vue    | 47 ++--------------
 .../ApplicationPermissionList.vue             |  5 ++
 6 files changed, 31 insertions(+), 117 deletions(-)

diff --git a/src/views/applications/DatabaseApp/DatabaseAppList.vue b/src/views/applications/DatabaseApp/DatabaseAppList.vue
index 2aec06d24..b71d90871 100644
--- a/src/views/applications/DatabaseApp/DatabaseAppList.vue
+++ b/src/views/applications/DatabaseApp/DatabaseAppList.vue
@@ -37,6 +37,7 @@ export default {
           actions: {
             prop: '',
             formatterArgs: {
+              hasClone: true,
               performDelete: function({ row, col, cellValue, reload }) {
                 this.$axios.delete(
                   `/api/v1/applications/applications/${row.id}/`
diff --git a/src/views/applications/RemoteApp/RemoteAppList.vue b/src/views/applications/RemoteApp/RemoteAppList.vue
index 24df27a58..f200de486 100644
--- a/src/views/applications/RemoteApp/RemoteAppList.vue
+++ b/src/views/applications/RemoteApp/RemoteAppList.vue
@@ -34,6 +34,7 @@ export default {
           },
           actions: {
             formatterArgs: {
+              hasClone: true,
               onUpdate: ({ row }) => {
                 vm.$router.push({ name: 'RemoteAppUpdate', params: { id: row.id }, query: { type: row.type }})
               },
diff --git a/src/views/assets/CommandFilter/CommandFilterList.vue b/src/views/assets/CommandFilter/CommandFilterList.vue
index 4bfa4ad9f..42b90a5ac 100644
--- a/src/views/assets/CommandFilter/CommandFilterList.vue
+++ b/src/views/assets/CommandFilter/CommandFilterList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, ActionsFormatter } from '@/components/ListTable/formatters/index'
+import { DetailFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
@@ -14,62 +14,31 @@ export default {
     return {
       tableConfig: {
         url: '/api/v1/assets/cmd-filters/',
-        columns: [
-          {
-            prop: 'name',
-            label: this.$t('assets.Name'),
-            formatter: DetailFormatter,
-            showOverflowTooltip: true,
-            sortable: true,
-            formatterArgs: {
-              route: 'CommandFilterDetail'
-            }
-          },
-          {
-            prop: 'rules',
+        columns: ['name', 'rules', 'system_users', 'comment', 'actions'],
+        columnsMeta: {
+          rules: {
             label: this.$t('assets.Rules'),
             formatter: DetailFormatter,
             formatterArgs: {
+              getTitle: ({ cellValue }) => {
+                return cellValue.length
+              },
               routeQuery: {
                 activeTab: 'rules'
-              },
-              getTitle: ({ cellValue }) => cellValue.length
+              }
             }
           },
-          {
-            prop: 'system_users',
+          system_users: {
             label: this.$t('assets.SystemUsers'),
             formatter: DetailFormatter,
             formatterArgs: {
               route: 'CommandFilterDetail',
-              getTitle: ({ cellValue }) => cellValue.length
-            }
-          },
-          {
-            prop: 'comment',
-            showOverflowTooltip: true,
-            label: this.$t('assets.Comment')
-          },
-          {
-            prop: 'id',
-            align: 'center',
-            label: this.$t('assets.Action'),
-            formatter: ActionsFormatter,
-            width: '200px',
-            formatterArgs: {
-              performDelete: ({ row, col }) => {
-                const id = row.id
-                const url = `/api/v1/assets/cmd-filters/${id}/`
-                return this.$axios.delete(url).then(res => {
-                  this.$message.success(this.$t('common.deleteSuccessMsg'))
-                  window.location.reload()
-                }).catch(error => {
-                  this.$message.error(this.$t('common.deleteErrorMsg' + ' ' + error))
-                })
+              getTitle: ({ cellValue }) => {
+                return cellValue.length
               }
             }
           }
-        ]
+        }
       },
       headerActions: {
         hasRightActions: false,
diff --git a/src/views/assets/Label/LabelList.vue b/src/views/assets/Label/LabelList.vue
index b3795400c..85d3b43fd 100644
--- a/src/views/assets/Label/LabelList.vue
+++ b/src/views/assets/Label/LabelList.vue
@@ -4,7 +4,6 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { ActionsFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
@@ -14,39 +13,15 @@ export default {
     return {
       tableConfig: {
         url: '/api/v1/assets/labels/',
-        columns: [
-          {
-            prop: 'name',
-            label: this.$t('assets.Name'),
-            showOverflowTooltip: true,
-            sortable: true
+        columns: ['name', 'value', 'asset_count', 'actions'],
+        columnsMeta: {
+          name: {
+            formatter: null
           },
-          {
-            prop: 'value',
-            label: this.$t('assets.Value'),
-            showOverflowTooltip: true,
-            sortable: 'custom'
-          },
-          {
-            prop: 'asset_count',
-            label: this.$t('assets.Assets'),
-            width: '80px'
-          },
-          {
-            prop: 'id',
-            align: 'center',
-            formatter: ActionsFormatter,
-            label: this.$t('assets.Action'),
-            width: '200px',
-            formatterArgs: {
-              performDelete: ({ row, col }) => {
-                const id = row.id
-                const url = `/api/v1/assets/labels/${id}/`
-                return this.$axios.delete(url)
-              }
-            }
+          asset_count: {
+            label: this.$t('assets.Assets')
           }
-        ]
+        }
       },
       headerActions: {
         hasRightActions: false,
diff --git a/src/views/assets/Platform/PlatformList.vue b/src/views/assets/Platform/PlatformList.vue
index 32839527b..62ca07402 100644
--- a/src/views/assets/Platform/PlatformList.vue
+++ b/src/views/assets/Platform/PlatformList.vue
@@ -4,7 +4,6 @@
 
 <script>
 import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, ActionsFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
@@ -15,49 +14,13 @@ export default {
       tableConfig: {
         url: '/api/v1/assets/platforms/',
         columns: [
-          {
-            prop: 'name',
-            label: this.$t('assets.Name'),
-            formatter: DetailFormatter,
-            showOverflowTooltip: true,
-            sortable: true,
-            formatterArgs: {
-              route: 'PlatformDetail'
-            }
-          },
-          {
-            prop: 'base',
-            label: this.$t('assets.BasePlatform'),
-            sortable: 'custom',
+          'name', 'base', 'comment', 'actions'
+        ],
+        columnsMeta: {
+          base: {
             width: '140px'
-          },
-          {
-            prop: 'comment',
-            showOverflowTooltip: true,
-            label: this.$t('assets.Comment'),
-            sortable: 'custom'
-          },
-          {
-            prop: 'id',
-            align: 'center',
-            label: this.$t('assets.Action'),
-            formatter: ActionsFormatter,
-            width: '200px',
-            formatterArgs: {
-              canDelete: (row, vaule) => {
-                return !row.internal
-              },
-              canUpdate: (row, vaule) => {
-                return !row.internal
-              },
-              performDelete: ({ row, col }) => {
-                const id = row.id
-                const url = `/api/v1/assets/platforms/${id}/`
-                return this.$axios.delete(url)
-              }
-            }
           }
-        ]
+        }
       },
       headerActions: {
         hasRightActions: false,
diff --git a/src/views/perms/ApplicationPermission/ApplicationPermissionList.vue b/src/views/perms/ApplicationPermission/ApplicationPermissionList.vue
index d3f6b6e3b..be3352809 100644
--- a/src/views/perms/ApplicationPermission/ApplicationPermissionList.vue
+++ b/src/views/perms/ApplicationPermission/ApplicationPermissionList.vue
@@ -72,6 +72,11 @@ export default {
                 activeTab: 'RemoteAppPermissionRemoteApp'
               }
             }
+          },
+          actions: {
+            formatterArgs: {
+              hasClone: true
+            }
           }
         }
       },