From 07fb293cbe6a9e71d1aa7bd24a122e5b51150af3 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 7 Apr 2020 20:55:13 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../compenents/el-data-table/el-data-table.vue       |  1 +
 .../ListTable/formatters/ActionsFormatter.vue        | 12 ++++++------
 src/components/ListTable/formatters/base.vue         |  4 ++++
 src/views/users/UserCreateUpdate.vue                 |  2 +-
 4 files changed, 12 insertions(+), 7 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 6188027a1..44d0aeebe 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
@@ -104,6 +104,7 @@
                 :key="row.id"
                 :table-data="data"
                 :row="row"
+                :url="url"
                 :reload="getList"
                 :col="col"
                 :cell-value="row[col.prop]"
diff --git a/src/components/ListTable/formatters/ActionsFormatter.vue b/src/components/ListTable/formatters/ActionsFormatter.vue
index e34fe15c1..9f5150266 100644
--- a/src/components/ListTable/formatters/ActionsFormatter.vue
+++ b/src/components/ListTable/formatters/ActionsFormatter.vue
@@ -6,9 +6,9 @@
 import ActionsGroup from '@/components/ActionsGroup/index'
 import BaseFormatter from './base'
 
-const defaultPerformDelete = function({row, col}) {
+const defaultPerformDelete = function({ row, col }) {
   const id = row.id
-  const url = `/api/v1/users/groups/${id}/`
+  const url = `${this.url}${id}/`
   return this.$axios.delete(url)
 }
 const defaultUpdateCallback = function({row, col}) {
@@ -56,16 +56,16 @@ export default {
         name: 'update',
         title: this.$tc('Update'),
         type: 'primary',
-        has: colActions.hasUpdate || true,
-        can: colActions.canUpdate || true,
+        has: colActions.hasUpdate !== false,
+        can: colActions.canUpdate !== false,
         callback: colActions.onUpdate || defaultUpdateCallback.bind(this)
       },
       {
         name: 'delete',
         title: this.$tc('Delete'),
         type: 'danger',
-        has: colActions.hasDelete || true,
-        can: colActions.canDelete || true,
+        has: colActions.hasDelete !== false,
+        can: colActions.canDelete !== false,
         callback: colActions.onDelete || defaultDeleteCallback.bind(this)
       }
     ]
diff --git a/src/components/ListTable/formatters/base.vue b/src/components/ListTable/formatters/base.vue
index 6174a8d14..e828e5de7 100644
--- a/src/components/ListTable/formatters/base.vue
+++ b/src/components/ListTable/formatters/base.vue
@@ -24,6 +24,10 @@ export default {
     tableData: {
       type: Array,
       default: () => ({})
+    },
+    url: {
+      type: String,
+      default: ''
     }
   }
 }
diff --git a/src/views/users/UserCreateUpdate.vue b/src/views/users/UserCreateUpdate.vue
index cfa422cd8..a41eea71e 100644
--- a/src/views/users/UserCreateUpdate.vue
+++ b/src/views/users/UserCreateUpdate.vue
@@ -26,7 +26,7 @@ export default {
       },
       fields: [
         'name', 'username', 'email', 'groups', 'password_strategy', 'password', 'mfa_level',
-        'source', 'role', 'date_expired', 'phone', 'wechat', 'comment'
+        'source', 'role', 'date_expired', 'phone', 'wechat', 'comment',
       ],
       url: '/api/v1/users/users/',
       fieldsMeta: {