From 11316a7c76c8699c4fbfc2627dce09ae21598d30 Mon Sep 17 00:00:00 2001 From: puhui999 Date: Mon, 19 May 2025 17:56:40 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E3=80=90ANTD=E3=80=91=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E7=A4=BA=E4=BE=8B?= =?UTF-8?q?=20demo03=20normal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/infra/demo/demo03/normal/index.ts | 26 +++++++--- .../src/views/infra/demo/demo01/index.vue | 23 ++++----- .../demo03/erp/modules/demo03-course-list.vue | 23 ++++----- .../demo03/erp/modules/demo03-grade-list.vue | 19 ++++--- .../views/infra/demo/demo03/normal/data.ts | 1 + .../views/infra/demo/demo03/normal/index.vue | 49 +++++++++++++++++-- .../normal/modules/demo03-grade-form.vue | 7 +++ .../infra/demo/demo03/normal/modules/form.vue | 5 +- 8 files changed, 100 insertions(+), 53 deletions(-) diff --git a/apps/web-antd/src/api/infra/demo/demo03/normal/index.ts b/apps/web-antd/src/api/infra/demo/demo03/normal/index.ts index a04a919e..4d620725 100644 --- a/apps/web-antd/src/api/infra/demo/demo03/normal/index.ts +++ b/apps/web-antd/src/api/infra/demo/demo03/normal/index.ts @@ -36,7 +36,7 @@ export namespace Demo03StudentApi { /** 查询学生分页 */ export function getDemo03StudentPage(params: PageParam) { return requestClient.get>( - '/infra/demo03-student/page', + '/infra/demo03-student-normal/page', { params }, ); } @@ -44,28 +44,38 @@ export function getDemo03StudentPage(params: PageParam) { /** 查询学生详情 */ export function getDemo03Student(id: number) { return requestClient.get( - `/infra/demo03-student/get?id=${id}`, + `/infra/demo03-student-normal/get?id=${id}`, ); } /** 新增学生 */ export function createDemo03Student(data: Demo03StudentApi.Demo03Student) { - return requestClient.post('/infra/demo03-student/create', data); + return requestClient.post('/infra/demo03-student-normal/create', data); } /** 修改学生 */ export function updateDemo03Student(data: Demo03StudentApi.Demo03Student) { - return requestClient.put('/infra/demo03-student/update', data); + return requestClient.put('/infra/demo03-student-normal/update', data); } /** 删除学生 */ export function deleteDemo03Student(id: number) { - return requestClient.delete(`/infra/demo03-student/delete?id=${id}`); + return requestClient.delete(`/infra/demo03-student-normal/delete?id=${id}`); +} + +// 批量删除学生 +export function deleteDemo03StudentByIds(ids: number[]) { + return requestClient.delete( + `/infra/demo03-student-normal/delete-batch?ids=${ids.join(',')}`, + ); } /** 导出学生 */ export function exportDemo03Student(params: any) { - return requestClient.download('/infra/demo03-student/export-excel', params); + return requestClient.download( + '/infra/demo03-student-normal/export-excel', + params, + ); } // ==================== 子表（学生课程） ==================== @@ -73,7 +83,7 @@ export function exportDemo03Student(params: any) { /** 获得学生课程列表 */ export function getDemo03CourseListByStudentId(studentId: number) { return requestClient.get( - `/infra/demo03-student/demo03-course/list-by-student-id?studentId=${studentId}`, + `/infra/demo03-student-normal/demo03-course/list-by-student-id?studentId=${studentId}`, ); } @@ -82,6 +92,6 @@ export function getDemo03CourseListByStudentId(studentId: number) { /** 获得学生班级 */ export function getDemo03GradeByStudentId(studentId: number) { return requestClient.get( - `/infra/demo03-student/demo03-grade/get-by-student-id?studentId=${studentId}`, + `/infra/demo03-student-normal/demo03-grade/get-by-student-id?studentId=${studentId}`, ); } diff --git a/apps/web-antd/src/views/infra/demo/demo01/index.vue b/apps/web-antd/src/views/infra/demo/demo01/index.vue index 49df4616..4ac4b554 100644 --- a/apps/web-antd/src/views/infra/demo/demo01/index.vue +++ b/apps/web-antd/src/views/infra/demo/demo01/index.vue @@ -63,6 +63,13 @@ async function onDelete(row: Demo01ContactApi.Demo01Contact) { const deleteIds = ref([]); // 待删除示例联系人 ID const showDeleteBatchBtn = computed(() => isEmpty(deleteIds.value)); +function setDeleteIds({ + records, +}: { + records: Demo01ContactApi.Demo01Contact[]; +}) { + deleteIds.value = records.map((item) => item.id); +} /** 批量删除示例联系人 */ async function onDeleteBatch() { const hideLoading = message.loading({ @@ -133,20 +140,8 @@ const [Grid, gridApi] = useVbenVxeGrid({ }, } as VxeTableGridOptions, gridEvents: { - checkboxAll: ({ - records, - }: { - records: Demo01ContactApi.Demo01Contact[]; - }) => { - deleteIds.value = records.map((item) => item.id); - }, - checkboxChange: ({ - records, - }: { - records: Demo01ContactApi.Demo01Contact[]; - }) => { - deleteIds.value = records.map((item) => item.id); - }, + checkboxAll: setDeleteIds, + checkboxChange: setDeleteIds, }, }); diff --git a/apps/web-antd/src/views/infra/demo/demo03/erp/modules/demo03-course-list.vue b/apps/web-antd/src/views/infra/demo/demo03/erp/modules/demo03-course-list.vue index 3e95bbb7..3d6eb4a1 100644 --- a/apps/web-antd/src/views/infra/demo/demo03/erp/modules/demo03-course-list.vue +++ b/apps/web-antd/src/views/infra/demo/demo03/erp/modules/demo03-course-list.vue @@ -68,6 +68,13 @@ async function onDelete(row: Demo03StudentApi.Demo03Course) { const deleteIds = ref([]); // 待删除学生课程 ID const showDeleteBatchBtn = computed(() => isEmpty(deleteIds.value)); +function setDeleteIds({ + records, +}: { + records: Demo03StudentApi.Demo03Course[]; +}) { + deleteIds.value = records.map((item) => item.id); +} /** 批量删除学生课程 */ async function onDeleteBatch() { const hideLoading = message.loading({ @@ -136,20 +143,8 @@ const [Grid, gridApi] = useVbenVxeGrid({ }, } as VxeTableGridOptions, gridEvents: { - checkboxAll: ({ - records, - }: { - records: Demo03StudentApi.Demo03Course[]; - }) => { - deleteIds.value = records.map((item) => item.id); - }, - checkboxChange: ({ - records, - }: { - records: Demo03StudentApi.Demo03Course[]; - }) => { - deleteIds.value = records.map((item) => item.id); - }, + checkboxAll: setDeleteIds, + checkboxChange: setDeleteIds, }, }); diff --git a/apps/web-antd/src/views/infra/demo/demo03/erp/modules/demo03-grade-list.vue b/apps/web-antd/src/views/infra/demo/demo03/erp/modules/demo03-grade-list.vue index 596c8927..bf044b3d 100644 --- a/apps/web-antd/src/views/infra/demo/demo03/erp/modules/demo03-grade-list.vue +++ b/apps/web-antd/src/views/infra/demo/demo03/erp/modules/demo03-grade-list.vue @@ -68,6 +68,13 @@ async function onDelete(row: Demo03StudentApi.Demo03Grade) { const deleteIds = ref([]); // 待删除学生班级 ID const showDeleteBatchBtn = computed(() => isEmpty(deleteIds.value)); +function setDeleteIds({ + records, +}: { + records: Demo03StudentApi.Demo03Grade[]; +}) { + deleteIds.value = records.map((item) => item.id); +} /** 批量删除学生班级 */ async function onDeleteBatch() { const hideLoading = message.loading({ @@ -136,16 +143,8 @@ const [Grid, gridApi] = useVbenVxeGrid({ }, } as VxeTableGridOptions, gridEvents: { - checkboxAll: ({ records }: { records: Demo03StudentApi.Demo03Grade[] }) => { - deleteIds.value = records.map((item) => item.id); - }, - checkboxChange: ({ - records, - }: { - records: Demo03StudentApi.Demo03Grade[]; - }) => { - deleteIds.value = records.map((item) => item.id); - }, + checkboxAll: setDeleteIds, + checkboxChange: setDeleteIds, }, }); diff --git a/apps/web-antd/src/views/infra/demo/demo03/normal/data.ts b/apps/web-antd/src/views/infra/demo/demo03/normal/data.ts index 6520e9b3..532029bf 100644 --- a/apps/web-antd/src/views/infra/demo/demo03/normal/data.ts +++ b/apps/web-antd/src/views/infra/demo/demo03/normal/data.ts @@ -107,6 +107,7 @@ export function useGridColumns( onActionClick?: OnActionClickFn, ): VxeTableGridOptions['columns'] { return [ + { type: 'checkbox', width: 40 }, { field: 'id', title: '编号', diff --git a/apps/web-antd/src/views/infra/demo/demo03/normal/index.vue b/apps/web-antd/src/views/infra/demo/demo03/normal/index.vue index 01cd47f8..f4e2975c 100644 --- a/apps/web-antd/src/views/infra/demo/demo03/normal/index.vue +++ b/apps/web-antd/src/views/infra/demo/demo03/normal/index.vue @@ -5,17 +5,18 @@ import type { } from '#/adapter/vxe-table'; import type { Demo03StudentApi } from '#/api/infra/demo/demo03/normal'; -import { h } from 'vue'; +import { computed, h, ref } from 'vue'; import { Page, useVbenModal } from '@vben/common-ui'; -import { Download, Plus } from '@vben/icons'; -import { downloadFileFromBlobPart } from '@vben/utils'; +import { Download, Plus, Trash2 } from '@vben/icons'; +import { downloadFileFromBlobPart, isEmpty } from '@vben/utils'; import { Button, message } from 'ant-design-vue'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { deleteDemo03Student, + deleteDemo03StudentByIds, exportDemo03Student, getDemo03StudentPage, } from '#/api/infra/demo/demo03/normal'; @@ -55,7 +56,32 @@ async function onDelete(row: Demo03StudentApi.Demo03Student) { await deleteDemo03Student(row.id as number); message.success($t('ui.actionMessage.deleteSuccess', [row.id])); onRefresh(); - } catch { + } finally { + hideLoading(); + } +} + +const deleteIds = ref([]); // 待删除学生 ID +const showDeleteBatchBtn = computed(() => isEmpty(deleteIds.value)); +function setDeleteIds({ + records, +}: { + records: Demo03StudentApi.Demo03Student[]; +}) { + deleteIds.value = records.map((item) => item.id); +} +/** 批量删除学生 */ +async function onDeleteBatch() { + const hideLoading = message.loading({ + content: $t('ui.actionMessage.deleting'), + duration: 0, + key: 'action_process_msg', + }); + try { + await deleteDemo03StudentByIds(deleteIds.value); + message.success($t('ui.actionMessage.deleteSuccess')); + onRefresh(); + } finally { hideLoading(); } } @@ -113,6 +139,10 @@ const [Grid, gridApi] = useVbenVxeGrid({ search: true, }, } as VxeTableGridOptions, + gridEvents: { + checkboxAll: setDeleteIds, + checkboxChange: setDeleteIds, + }, }); @@ -139,6 +169,17 @@ const [Grid, gridApi] = useVbenVxeGrid({ > {{ $t('ui.actionTitle.export') }} + diff --git a/apps/web-antd/src/views/infra/demo/demo03/normal/modules/demo03-grade-form.vue b/apps/web-antd/src/views/infra/demo/demo03/normal/modules/demo03-grade-form.vue index 75a8147d..5d5f396b 100644 --- a/apps/web-antd/src/views/infra/demo/demo03/normal/modules/demo03-grade-form.vue +++ b/apps/web-antd/src/views/infra/demo/demo03/normal/modules/demo03-grade-form.vue @@ -11,6 +11,13 @@ const props = defineProps<{ }>(); const [Form, formApi] = useVbenForm({ + commonConfig: { + componentProps: { + class: 'w-full', + }, + formItemClass: 'col-span-2', + labelWidth: 80, + }, layout: 'horizontal', schema: useDemo03GradeFormSchema(), showDefaultActions: false, diff --git a/apps/web-antd/src/views/infra/demo/demo03/normal/modules/form.vue b/apps/web-antd/src/views/infra/demo/demo03/normal/modules/form.vue index 14a52585..72cbf278 100644 --- a/apps/web-antd/src/views/infra/demo/demo03/normal/modules/form.vue +++ b/apps/web-antd/src/views/infra/demo/demo03/normal/modules/form.vue @@ -61,8 +61,8 @@ const [Modal, modalApi] = useVbenModal({ // 提交表单 const data = (await formApi.getValues()) as Demo03StudentApi.Demo03Student; // 拼接子表的数据 - data.demo03courses = demo03CourseFormRef.value?.getData(); - data.demo03grade = await demo03GradeFormRef.value?.getValues(); + data.demo03Courses = demo03CourseFormRef.value?.getData(); + data.demo03Grade = await demo03GradeFormRef.value?.getValues(); try { await (formData.value?.id ? updateDemo03Student(data) @@ -80,7 +80,6 @@ const [Modal, modalApi] = useVbenModal({ formData.value = undefined; return; } - // 加载数据 let data = modalApi.getData(); if (!data) {