From abcc08832dd2b6961aa962399d91efbacebd53b2 Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Sat, 5 Oct 2024 15:56:13 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/views/system/dept/data.ts   |  44 ++++-
 apps/web-antd/src/views/system/dept/index.vue | 164 +++++++++++++-----
 apps/web-antd/src/views/system/menu/index.vue |   8 -
 3 files changed, 166 insertions(+), 50 deletions(-)

diff --git a/apps/web-antd/src/views/system/dept/data.ts b/apps/web-antd/src/views/system/dept/data.ts
index cd5714fe..59e3e656 100644
--- a/apps/web-antd/src/views/system/dept/data.ts
+++ b/apps/web-antd/src/views/system/dept/data.ts
@@ -1,8 +1,9 @@
 import { DictEnum } from '@vben/constants';
 import { getPopupContainer } from '@vben/utils';
 
-import { type FormSchemaGetter, z } from '#/adapter';
+import { type FormSchemaGetter, type VxeGridProps, z } from '#/adapter';
 import { getDictOptions } from '#/utils/dict';
+import { renderDict } from '#/utils/render';
 
 export const querySchema: FormSchemaGetter = () => [
   {
@@ -21,6 +22,45 @@ export const querySchema: FormSchemaGetter = () => [
   },
 ];
 
+export const columns: VxeGridProps['columns'] = [
+  {
+    field: 'deptName',
+    title: '部门名称',
+    treeNode: true,
+    width: 200,
+  },
+  {
+    field: 'deptCategory',
+    title: '类别编码',
+  },
+  {
+    field: 'orderNum',
+    title: '排序',
+    width: 180,
+  },
+  {
+    field: 'status',
+    width: 180,
+    title: '状态',
+    slots: {
+      default: ({ row }) => {
+        return renderDict(row.status, DictEnum.SYS_NORMAL_DISABLE);
+      },
+    },
+  },
+  {
+    field: 'createTime',
+    title: '创建时间',
+  },
+  {
+    field: 'action',
+    fixed: 'right',
+    slots: { default: 'action' },
+    title: '操作',
+    width: 180,
+  },
+];
+
 export const drawerSchema: FormSchemaGetter = () => [
   {
     component: 'Input',
@@ -76,7 +116,7 @@ export const drawerSchema: FormSchemaGetter = () => [
     label: '联系电话',
     rules: z
       .string()
-      .regex(/^\d{1,3}-\d{8,11}$/, { message: '请输入正确的手机号' })
+      .regex(/^1[3,4578]\d{9}$/, { message: '请输入正确的手机号' })
       .optional(),
   },
   {
diff --git a/apps/web-antd/src/views/system/dept/index.vue b/apps/web-antd/src/views/system/dept/index.vue
index e2c70629..630288f8 100644
--- a/apps/web-antd/src/views/system/dept/index.vue
+++ b/apps/web-antd/src/views/system/dept/index.vue
@@ -1,62 +1,146 @@
 <script setup lang="ts">
-import { Page, useVbenDrawer } from '@vben/common-ui';
-import { $t } from '@vben/locales';
+import type { Recordable } from '@vben/types';
 
-import { Card } from 'ant-design-vue';
+import { nextTick } from 'vue';
 
-import { useVbenForm } from '#/adapter';
+import { Page, useVbenDrawer, type VbenFormProps } from '@vben/common-ui';
+import { listToTree } from '@vben/utils';
 
-import { querySchema } from './data';
+import { Popconfirm, Space } from 'ant-design-vue';
+
+import { useVbenVxeGrid, type VxeGridProps } from '#/adapter';
+import { deptList, deptRemove } from '#/api/system/dept';
+
+import { columns, querySchema } from './data';
 import deptDrawer from './dept-drawer.vue';
 
+const formOptions: VbenFormProps = {
+  schema: querySchema(),
+  wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
+};
+
+const gridOptions: VxeGridProps = {
+  columns,
+  height: 'auto',
+  keepSource: true,
+  pagerConfig: {
+    enabled: false,
+  },
+  proxyConfig: {
+    ajax: {
+      query: async (_, formValues) => {
+        const resp = await deptList({
+          ...formValues,
+        });
+        const treeData = listToTree(resp, {
+          id: 'deptId',
+          pid: 'parentId',
+          children: 'children',
+        });
+        return { rows: treeData };
+      },
+      // 默认请求接口后展开全部 不需要可以删除这段
+      querySuccess: () => {
+        nextTick(() => {
+          expandAll();
+        });
+      },
+    },
+  },
+  rowConfig: {
+    isHover: true,
+    keyField: 'deptId',
+  },
+  round: true,
+  align: 'center',
+  showOverflow: true,
+  treeConfig: {
+    parentField: 'parentId',
+    rowField: 'deptId',
+    transform: false,
+  },
+};
+
+const [BasicTable, tableApi] = useVbenVxeGrid({ formOptions, gridOptions });
 const [DeptDrawer, drawerApi] = useVbenDrawer({
   connectedComponent: deptDrawer,
 });
 
 function handleAdd() {
-  drawerApi.setData({});
+  drawerApi.setData({ update: false });
   drawerApi.open();
 }
 
-function handleTest(id: number | string) {
-  drawerApi.setData({ id });
+async function handleEdit(record: Recordable<any>) {
+  drawerApi.setData({ id: record.deptId, update: true });
   drawerApi.open();
 }
 
-const [QueryForm] = useVbenForm({
-  // 默认展开
-  collapsed: false,
-  // 所有表单项共用，可单独在表单内覆盖
-  commonConfig: {
-    // 所有表单项
-    componentProps: {
-      class: 'w-full',
-    },
-  },
-  schema: querySchema(),
-  // 是否可展开
-  showCollapseButton: true,
-  submitButtonOptions: {
-    text: '查询',
-  },
-  wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
-});
+async function handleDelete(row: Recordable<any>) {
+  await deptRemove(row.deptId);
+  await tableApi.reload();
+}
+
+function expandAll() {
+  tableApi.grid?.setAllTreeExpand(true);
+}
+
+function collapseAll() {
+  tableApi.grid?.setAllTreeExpand(false);
+}
 </script>
 
 <template>
-  <Page content-class="flex flex-col gap-4">
-    <Card>
-      <QueryForm />
-    </Card>
-    <Card>
-      <div class="flex justify-end gap-2">
-        <a-button type="primary" @click="handleAdd">
-          {{ $t('pages.common.add') }}
-        </a-button>
-        <a-button @click="handleTest(103)"> 新增 上级id=103 </a-button>
-        <a-button @click="handleTest(105)"> 新增 上级id=105 </a-button>
-      </div>
-    </Card>
-    <DeptDrawer />
+  <Page :auto-content-height="true">
+    <BasicTable>
+      <template #toolbar-actions>
+        <span class="pl-[7px] text-[16px]">部门列表</span>
+      </template>
+      <template #toolbar-tools>
+        <Space>
+          <a-button @click="collapseAll">
+            {{ $t('pages.common.collapse') }}
+          </a-button>
+          <a-button @click="expandAll">
+            {{ $t('pages.common.expand') }}
+          </a-button>
+          <a-button
+            type="primary"
+            v-access:code="['system:dept:add']"
+            @click="handleAdd"
+          >
+            {{ $t('pages.common.add') }}
+          </a-button>
+        </Space>
+      </template>
+      <template #action="{ row }">
+        <Space>
+          <a-button
+            size="small"
+            type="link"
+            v-access:code="['system:dept:edit']"
+            @click="handleEdit(row)"
+          >
+            {{ $t('pages.common.edit') }}
+          </a-button>
+          <Popconfirm
+            placement="left"
+            title="确认删除？"
+            @confirm="handleDelete(row)"
+          >
+            <a-button
+              danger
+              size="small"
+              type="link"
+              v-access:code="['system:dept:remove']"
+              @click.stop=""
+            >
+              {{ $t('pages.common.delete') }}
+            </a-button>
+          </Popconfirm>
+        </Space>
+      </template>
+    </BasicTable>
+    <DeptDrawer @reload="tableApi.reload()" />
   </Page>
 </template>
diff --git a/apps/web-antd/src/views/system/menu/index.vue b/apps/web-antd/src/views/system/menu/index.vue
index d683446f..b9e68991 100644
--- a/apps/web-antd/src/views/system/menu/index.vue
+++ b/apps/web-antd/src/views/system/menu/index.vue
@@ -18,14 +18,6 @@ const formOptions: VbenFormProps = {
 };
 
 const gridOptions: VxeGridProps = {
-  checkboxConfig: {
-    // 高亮
-    highlight: true,
-    // 翻页时保留选中状态
-    reserve: true,
-    // 点击行选中
-    // trigger: 'row',
-  },
   columns,
   height: 'auto',
   keepSource: true,