Merge branch 'feature/chw' into 'master'

Feature/chw

See merge request product/kim3-web-vue/starter-web-vue!19

src/components/table/drawer.vue

 <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>
-                <slot name="footer">
+            <a-space class="tw-justify-end">
                 <a-button @click="cancel">取消</a-button>
+                <slot name="footer">
                     <a-button type="primary" @click="ok" :loading="loading">确认</a-button>
                 </slot>
             </a-space>
@@ -29,10 +32,14 @@ export default {
     props: {
         oncancel: Function,
         onok: Function,
+        value: Boolean,
+    },
+    model: {
+        prop: 'value',
+        event: 'change',
     },
     data() {
         return {
-            visiable: false,
             loading: false,
             drawerStyle: {
                 display: 'flex',
@@ -48,21 +55,18 @@ 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;
             await (this.onok && this.onok());
             this.loading = false;
-            this.visiable = false;
+            this.$emit('change', false);
         },
     },
 };

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>

src/pages/system/view/organization/usermanagement/User.vue

 <template>
+    <div>
         <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" />
@@ -12,7 +10,7 @@
                 </my-form-item>
             </template>
             <template #buttons>
-            <a-button type="primary">新增</a-button>
+                <a-button type="primary" @click="onAdd">新增</a-button>
             </template>
 
             <a-table-column title="账号" data-index="loginId" />
@@ -24,13 +22,12 @@
             <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" />
                 </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(() => {

src/pages/system/view/organization/usermanagement/form.vue

 <template>
+    <Drawer ref="drawerRef" v-model="visible">
         <a-form-model layout="vertical" :model="form" :rules="rules" ref="DrawerForm">
             <a-form-model-item label="名称" prop="jobName">
                 <a-input v-model="form.jobName" :disabled="isView" />
@@ -7,15 +8,19 @@
                 <a-textarea v-model="form.jobDescription" :disabled="isView" :rows="4" />
             </a-form-model-item>
         </a-form-model>
+    </Drawer>
 </template>
 
 <script>
+import Drawer from '@/components/table/drawer.vue';
 import JobsApi from '@/api/organization';
 import FormMixin from '@/components/FormMixin';
 export default {
+    components: { Drawer },
     mixins: [FormMixin],
     data() {
         return {
+            visible: false,
             rules: {
                 jobName: [{ required: true, message: 'Please select Activity zone', trigger: 'change' }],
                 jobDescription: [
@@ -25,6 +30,9 @@ export default {
         };
     },
     methods: {
+        open() {
+            this.visible = true;
+        },
         add() {
             return JobsApi.addJobs({ ...this.form });
         },