From 9d64bffd121caef013535fdd2971dcc05038482d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B5=A9=E7=8E=AE?= <chen.haowei@iwhalecloud.com>
Date: Thu, 1 Jul 2021 16:39:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/action_button/index.vue        | 24 +++++-
 src/components/popconfirm_delete/index.vue    | 22 ++++-
 src/components/table/index.vue                |  4 +-
 .../view/organization/usermanagement/User.vue | 84 ++++++++++++++++---
 4 files changed, 112 insertions(+), 22 deletions(-)

diff --git a/src/components/action_button/index.vue b/src/components/action_button/index.vue
index be2be56..818e4ca 100644
--- a/src/components/action_button/index.vue
+++ b/src/components/action_button/index.vue
@@ -50,20 +50,38 @@ export default {
         },
         row: Object,
     },
+    watch: {
+        row() {
+            this.init();
+        },
+    },
+    data() {
+        return {
+            buttonsArr: [],
+        };
+    },
+    created() {
+        this.init();
+    },
     computed: {
         basicBtns() {
-            return this.buttons.length > 3 ? this.buttons.slice(0, 3) : this.buttons;
+            return this.buttonsArr.length > 3 ? this.buttonsArr.slice(0, 3) : this.buttonsArr;
         },
         moreBtns() {
-            return this.buttons.length > 3 ? this.buttons.slice(3) : [];
+            return this.buttonsArr.length > 3 ? this.buttonsArr.slice(3) : [];
         },
     },
-
     methods: {
         getDelUrl(url, row) {
             if (isFunction(url)) return url(row);
             return url;
         },
+        init() {
+            this.buttons.map((i) => {
+                i.__hidden__ = i.isHidden && i.isHidden(this.row);
+            });
+            this.buttonsArr = this.buttons.filter((i) => !i.__hidden__);
+        },
     },
 };
 </script>
diff --git a/src/components/popconfirm_delete/index.vue b/src/components/popconfirm_delete/index.vue
index 89b6993..b478ee4 100644
--- a/src/components/popconfirm_delete/index.vue
+++ b/src/components/popconfirm_delete/index.vue
@@ -6,11 +6,11 @@
 
 <script>
 import { EMPTY_FUN } from '@/utils';
-import { delReq } from '@/utils';
+import { delReq, getReq, postReq, putReq } from '@/utils';
 
 export default {
     props: {
-        url: String,
+        url: [String, Object],
         cb: {
             type: Function,
             default: EMPTY_FUN,
@@ -30,9 +30,25 @@ export default {
     },
     methods: {
         async confirm() {
-            if (this.url) {
+            if (typeof this.url === 'string') {
                 await delReq(this.url);
             }
+            if (typeof this.url === 'object') {
+                switch (this.url.method) {
+                    case 'get':
+                        await getReq(this.url.url, this.url?.data);
+                        break;
+                    case 'post':
+                        await postReq(this.url.url, this.url?.data);
+                        break;
+                    case 'put':
+                        await putReq(this.url.url, this.url?.data);
+                        break;
+                    case 'del':
+                        await delReq(this.url.url, this.url?.data);
+                        break;
+                }
+            }
             if (this.onOk) {
                 await this.onOk();
             }
diff --git a/src/components/table/index.vue b/src/components/table/index.vue
index 29b8d60..299082c 100644
--- a/src/components/table/index.vue
+++ b/src/components/table/index.vue
@@ -20,9 +20,7 @@
                 <a-button v-if="addBtn" type="primary" key="add" v-bind="addBtn.options" @click="add">
                     {{ addBtn.text || '新建' }}
                 </a-button>
-                <template v-for="btn of buttons">
-                    <a-button :type="btn.primary" :key="btn.text">{{ btn.text }}</a-button>
-                </template>
+                <slot name="buttons" />
             </a-space>
             <div class="tw-mb-2">
                 <a-alert
diff --git a/src/pages/system/view/organization/usermanagement/User.vue b/src/pages/system/view/organization/usermanagement/User.vue
index a33cf21..57ab999 100644
--- a/src/pages/system/view/organization/usermanagement/User.vue
+++ b/src/pages/system/view/organization/usermanagement/User.vue
@@ -1,5 +1,5 @@
 <template>
-    <my-table url="/api/v1/users" rowKey="userId" :addBtn="addBtn" ref="table">
+    <my-table url="/api/v1/users" rowKey="userId" ref="table">
         <template #drawer>
             <Form ref="form" />
         </template>
@@ -11,6 +11,9 @@
                 <a-input placeholder="Basic usage" v-model="query.loginId" />
             </my-form-item>
         </template>
+        <template #buttons>
+            <a-button type="primary">新增</a-button>
+        </template>
 
         <a-table-column title="账号" data-index="loginId" />
         <a-table-column title="姓名" data-index="userName" />
@@ -21,36 +24,91 @@
         <a-table-column title="是否锁定" data-index="isLockedName" />
         <a-table-column title="操作">
             <template #default="row">
-                <a @click="() => view(row, 1)">编辑</a>
+                <!-- <a @click="() => view(row, 1)">编辑</a>
                 <a-divider type="vertical" />
-                <PopconfirmDelete :url="`/api/v1/jobs/${row.jobId}`" :cb="refreshTable" />
+                <PopconfirmDelete :url="`/api/v1/jobs/${row.jobId}`" :cb="refreshTable" /> -->
+                <ActionButton :buttons="buttons" :row="row" />
             </template>
         </a-table-column>
     </my-table>
 </template>
 <script>
 import Form from './form.vue';
-import PopconfirmDelete from '@/components/popconfirm_delete/index.vue';
+import ActionButton from '@/components/action_button/index.vue';
 import OrganizationTree from '../components/OrganizationTree.vue';
 
 export default {
-    components: { Form, PopconfirmDelete, OrganizationTree },
+    components: { Form, OrganizationTree, ActionButton },
     data() {
         return {
-            addBtn: { width: 600, onOk: () => this.$refs['form']?.submit() },
-            span: { xs: 12, md: 8, lg: 6 },
+            buttons: [
+                {
+                    label: '编辑',
+                    click: (row) => {},
+                },
+                {
+                    type: 'confirm',
+                    url: (row) => `/api/v1/jobs/${row.jobId}`,
+                    after: () => this.refreshTable(),
+                    isHidden: (row) => {
+                        return row.userId === 1;
+                    },
+                },
+                {
+                    type: 'confirm',
+                    label: '重置',
+                    title: '确认是否重置?',
+                    url: (row) => {
+                        return {
+                            url: `/api/v1/users/${row.userId}/resetting`,
+                            method: 'put',
+                        };
+                    },
+                    after: () => this.refreshTable(),
+                },
+                {
+                    type: 'confirm',
+                    label: '解锁',
+                    title: '确认是否解锁?',
+                    url: (row) => {
+                        return {
+                            url: `/api/v1/users/${row.userId}/unlocking`,
+                            method: 'put',
+                        };
+                    },
+                    after: () => this.refreshTable(),
+                    isHidden: (row) => {
+                        return !row.isLocked;
+                    },
+                },
+                {
+                    type: 'confirm',
+                    label: '锁定',
+                    title: '确认是否锁定?',
+                    url: (row) => {
+                        return {
+                            url: `/api/v1/users/${row.userId}/locking`,
+                            method: 'put',
+                        };
+                    },
+                    after: () => this.refreshTable(),
+                    isHidden: (row) => {
+                        return !!row.isLocked;
+                    },
+                },
+            ],
         };
     },
     methods: {
         refreshTable() {
             this.$refs['table']?.getData();
         },
-        view(data, type) {
-            this.$refs['table']?.show({ type });
-            this.$nextTick(() => {
-                this.$refs['form'].setData({ ...data }, type);
-            });
-        },
+        // view(data, type) {
+        //     this.$refs['table']?.show({ type });
+        //     this.$nextTick(() => {
+        //         this.$refs['form'].setData({ ...data }, type);
+        //     });
+        // },
     },
 };
 </script>
-- 
GitLab