From d90077fead604d3516a2c5816201991b8359507c 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 17:03:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/table/drawer.vue               | 27 ++++----
 src/components/table/index.vue                |  2 +-
 .../view/organization/usermanagement/User.vue | 62 +++++++++----------
 3 files changed, 48 insertions(+), 43 deletions(-)

diff --git a/src/components/table/drawer.vue b/src/components/table/drawer.vue
index ec7afca..009a05b 100644
--- a/src/components/table/drawer.vue
+++ b/src/components/table/drawer.vue
@@ -1,22 +1,25 @@
 <template>
     <a-drawer
         placement="right"
-        :visible="visible"
+        :visible="value"
         :drawerStyle="drawerStyle"
         :bodyStyle="bodyStyle"
         destroyOnClose
+        :width="600"
         v-bind="$attrs"
+        v-on="$listeners"
+        @close="onClose"
     >
-        <div class="tw-overflow-y-hidden">
+        <div class="tw-overflow-y-hidden tw-flex-1">
             <div class="tw-overflow-y-auto tw-h-full">
                 <slot />
             </div>
         </div>
         <template>
             <a-divider />
-            <a-space>
+            <a-space class="tw-justify-end">
+                <a-button @click="cancel">取消</a-button>
                 <slot name="footer">
-                    <a-button @click="cancel">取消</a-button>
                     <a-button type="primary" @click="ok" :loading="loading">确认</a-button>
                 </slot>
             </a-space>
@@ -29,6 +32,11 @@ export default {
     props: {
         oncancel: Function,
         onok: Function,
+        value: Boolean,
+    },
+    model: {
+        prop: 'value',
+        event: 'change',
     },
     data() {
         return {
@@ -48,15 +56,12 @@ export default {
         };
     },
     methods: {
-        show() {
-            this.visiable = true;
-        },
-        hidden() {
-            this.visiable = false;
-        },
         cancel() {
             this.oncancel && this.oncancel();
-            this.visiable = false;
+            this.$emit('change', false);
+        },
+        onClose() {
+            this.cancel();
         },
         async ok() {
             this.loading = true;
diff --git a/src/components/table/index.vue b/src/components/table/index.vue
index b5f765c..e9c81d2 100644
--- a/src/components/table/index.vue
+++ b/src/components/table/index.vue
@@ -63,7 +63,7 @@
             </div>
             <template v-if="!noFooter">
                 <a-divider />
-                <a-space>
+                <a-space class="tw-justify-end">
                     <a-button @click="addVisible = false">取消</a-button>
                     <a-button type="primary" @click="submit" :loading="submitLoading"> 确认 </a-button>
                 </a-space>
diff --git a/src/pages/system/view/organization/usermanagement/User.vue b/src/pages/system/view/organization/usermanagement/User.vue
index 57ab999..44ce15f 100644
--- a/src/pages/system/view/organization/usermanagement/User.vue
+++ b/src/pages/system/view/organization/usermanagement/User.vue
@@ -1,36 +1,33 @@
 <template>
-    <my-table url="/api/v1/users" rowKey="userId" ref="table">
-        <template #drawer>
-            <Form ref="form" />
-        </template>
-        <template #search="{ query }">
-            <my-form-item label="归属部门">
-                <OrganizationTree v-model="query.orgId" />
-            </my-form-item>
-            <my-form-item label="账号">
-                <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" />
-        <a-table-column title="职称" data-index="userTitleName" />
-        <a-table-column title="移动电话" data-index="mobilePhone" />
-        <a-table-column title="固定电话" data-index="fixedPhone" />
-        <a-table-column title="电子邮箱" data-index="userEmail" />
-        <a-table-column title="是否锁定" data-index="isLockedName" />
-        <a-table-column title="操作">
-            <template #default="row">
-                <!-- <a @click="() => view(row, 1)">编辑</a>
-                <a-divider type="vertical" />
-                <PopconfirmDelete :url="`/api/v1/jobs/${row.jobId}`" :cb="refreshTable" /> -->
-                <ActionButton :buttons="buttons" :row="row" />
+    <div>
+        <my-table url="/api/v1/users" rowKey="userId" ref="table">
+            <template #search="{ query }">
+                <my-form-item label="归属部门">
+                    <OrganizationTree v-model="query.orgId" />
+                </my-form-item>
+                <my-form-item label="账号">
+                    <a-input placeholder="Basic usage" v-model="query.loginId" />
+                </my-form-item>
+            </template>
+            <template #buttons>
+                <a-button type="primary" @click="onAdd">新增</a-button>
             </template>
-        </a-table-column>
-    </my-table>
+
+            <a-table-column title="账号" data-index="loginId" />
+            <a-table-column title="姓名" data-index="userName" />
+            <a-table-column title="职称" data-index="userTitleName" />
+            <a-table-column title="移动电话" data-index="mobilePhone" />
+            <a-table-column title="固定电话" data-index="fixedPhone" />
+            <a-table-column title="电子邮箱" data-index="userEmail" />
+            <a-table-column title="是否锁定" data-index="isLockedName" />
+            <a-table-column title="操作">
+                <template #default="row">
+                    <ActionButton :buttons="buttons" :row="row" />
+                </template>
+            </a-table-column>
+        </my-table>
+        <Form ref="form" />
+    </div>
 </template>
 <script>
 import Form from './form.vue';
@@ -103,6 +100,9 @@ export default {
         refreshTable() {
             this.$refs['table']?.getData();
         },
+        onAdd() {
+            this.$refs['form']?.open();
+        },
         // view(data, type) {
         //     this.$refs['table']?.show({ type });
         //     this.$nextTick(() => {
-- 
GitLab