From 2c9032e595919f038223e8dc0a2f9610a6b1aa7a Mon Sep 17 00:00:00 2001 From: puhui999 Date: Fri, 6 Jun 2025 15:44:37 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E5=8E=BB=E9=99=A4=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3=E7=9A=84=20ByIds=EF=BC=8C?= =?UTF-8?q?=E8=BF=99=E7=A7=8D=E6=8C=89=E7=85=A7=E7=BA=A6=E5=AE=9A=EF=BC=8C?= =?UTF-8?q?=E6=98=AF=E4=B8=8D=E5=B8=A6=E7=9A=84=EF=BC=8C=E9=92=88=E5=AF=B9?= =?UTF-8?q?=20Id=20=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/api/infra/demo/demo01/index.ts | 3 +-- apps/web-antd/src/api/infra/demo/demo03/erp/index.ts | 6 +++--- apps/web-antd/src/api/infra/demo/demo03/inner/index.ts | 2 +- apps/web-antd/src/api/infra/demo/demo03/normal/index.ts | 2 +- apps/web-antd/src/views/infra/demo/demo01/index.vue | 4 ++-- apps/web-antd/src/views/infra/demo/demo03/erp/index.vue | 4 ++-- .../infra/demo/demo03/erp/modules/demo03-course-list.vue | 4 ++-- .../infra/demo/demo03/erp/modules/demo03-grade-list.vue | 4 ++-- apps/web-antd/src/views/infra/demo/demo03/inner/index.vue | 4 ++-- apps/web-antd/src/views/infra/demo/demo03/normal/index.vue | 4 ++-- apps/web-antd/src/views/infra/demo/general/demo01/index.vue | 4 ++-- .../src/views/infra/demo/general/demo03/erp/index.vue | 4 ++-- .../demo/general/demo03/erp/modules/demo03-course-list.vue | 4 ++-- .../demo/general/demo03/erp/modules/demo03-grade-list.vue | 4 ++-- .../src/views/infra/demo/general/demo03/inner/index.vue | 4 ++-- .../src/views/infra/demo/general/demo03/normal/index.vue | 4 ++-- 16 files changed, 30 insertions(+), 31 deletions(-) diff --git a/apps/web-antd/src/api/infra/demo/demo01/index.ts b/apps/web-antd/src/api/infra/demo/demo01/index.ts index d1f646c61..c54a533f3 100644 --- a/apps/web-antd/src/api/infra/demo/demo01/index.ts +++ b/apps/web-antd/src/api/infra/demo/demo01/index.ts @@ -47,8 +47,7 @@ export function deleteDemo01Contact(id: number) { } /** 批量删除示例联系人 */ -// TODO @puhui999:ByIds,这种按照约定,是不带的,针对 Id 的情况哈。 -export function deleteDemo01ContactListByIds(ids: number[]) { +export function deleteDemo01ContactList(ids: number[]) { return requestClient.delete( `/infra/demo01-contact/delete-list?ids=${ids.join(',')}`, ); diff --git a/apps/web-antd/src/api/infra/demo/demo03/erp/index.ts b/apps/web-antd/src/api/infra/demo/demo03/erp/index.ts index ec18150cc..aac1829b7 100644 --- a/apps/web-antd/src/api/infra/demo/demo03/erp/index.ts +++ b/apps/web-antd/src/api/infra/demo/demo03/erp/index.ts @@ -62,7 +62,7 @@ export function deleteDemo03Student(id: number) { } /** 批量删除学生 */ -export function deleteDemo03StudentListByIds(ids: number[]) { +export function deleteDemo03StudentList(ids: number[]) { return requestClient.delete( `/infra/demo03-student-erp/delete-list?ids=${ids.join(',')}`, ); @@ -109,7 +109,7 @@ export function deleteDemo03Course(id: number) { } /** 批量删除学生课程 */ -export function deleteDemo03CourseListByIds(ids: number[]) { +export function deleteDemo03CourseList(ids: number[]) { return requestClient.delete( `/infra/demo03-student-erp/demo03-course/delete-list?ids=${ids.join(',')}`, ); @@ -155,7 +155,7 @@ export function deleteDemo03Grade(id: number) { } /** 批量删除学生班级 */ -export function deleteDemo03GradeListByIds(ids: number[]) { +export function deleteDemo03GradeList(ids: number[]) { return requestClient.delete( `/infra/demo03-student-erp/demo03-grade/delete-list?ids=${ids.join(',')}`, ); diff --git a/apps/web-antd/src/api/infra/demo/demo03/inner/index.ts b/apps/web-antd/src/api/infra/demo/demo03/inner/index.ts index 1521923b2..76b18fc01 100644 --- a/apps/web-antd/src/api/infra/demo/demo03/inner/index.ts +++ b/apps/web-antd/src/api/infra/demo/demo03/inner/index.ts @@ -64,7 +64,7 @@ export function deleteDemo03Student(id: number) { } /** 批量删除学生 */ -export function deleteDemo03StudentListByIds(ids: number[]) { +export function deleteDemo03StudentList(ids: number[]) { return requestClient.delete( `/infra/demo03-student-inner/delete-list?ids=${ids.join(',')}`, ); 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 79143c82e..4d22e2e27 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 @@ -64,7 +64,7 @@ export function deleteDemo03Student(id: number) { } /** 批量删除学生 */ -export function deleteDemo03StudentListByIds(ids: number[]) { +export function deleteDemo03StudentList(ids: number[]) { return requestClient.delete( `/infra/demo03-student-normal/delete-list?ids=${ids.join(',')}`, ); 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 47841830c..3361e1682 100644 --- a/apps/web-antd/src/views/infra/demo/demo01/index.vue +++ b/apps/web-antd/src/views/infra/demo/demo01/index.vue @@ -12,7 +12,7 @@ import { message } from 'ant-design-vue'; import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table'; import { deleteDemo01Contact, - deleteDemo01ContactListByIds, + deleteDemo01ContactList, exportDemo01Contact, getDemo01ContactPage, } from '#/api/infra/demo/demo01'; @@ -65,7 +65,7 @@ async function handleDeleteBatch() { key: 'action_process_msg', }); try { - await deleteDemo01ContactListByIds(checkedIds.value); + await deleteDemo01ContactList(checkedIds.value); message.success($t('ui.actionMessage.deleteSuccess')); onRefresh(); } finally { diff --git a/apps/web-antd/src/views/infra/demo/demo03/erp/index.vue b/apps/web-antd/src/views/infra/demo/demo03/erp/index.vue index d2f5da257..ee39c7b4a 100644 --- a/apps/web-antd/src/views/infra/demo/demo03/erp/index.vue +++ b/apps/web-antd/src/views/infra/demo/demo03/erp/index.vue @@ -16,7 +16,7 @@ import { Button, message, Tabs } from 'ant-design-vue'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { deleteDemo03Student, - deleteDemo03StudentListByIds, + deleteDemo03StudentList, exportDemo03Student, getDemo03StudentPage, } from '#/api/infra/demo/demo03/erp'; @@ -75,7 +75,7 @@ async function onDeleteBatch() { key: 'action_process_msg', }); try { - await deleteDemo03StudentListByIds(deleteIds.value); + await deleteDemo03StudentList(deleteIds.value); message.success($t('ui.actionMessage.deleteSuccess')); onRefresh(); } finally { 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 22afe3e33..86cc2b468 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 @@ -16,7 +16,7 @@ import { Button, message } from 'ant-design-vue'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { deleteDemo03Course, - deleteDemo03CourseListByIds, + deleteDemo03CourseList, getDemo03CoursePage, } from '#/api/infra/demo/demo03/erp'; import { $t } from '#/locales'; @@ -74,7 +74,7 @@ async function onDeleteBatch() { key: 'action_process_msg', }); try { - await deleteDemo03CourseListByIds(deleteIds.value); + await deleteDemo03CourseList(deleteIds.value); message.success($t('ui.actionMessage.deleteSuccess')); onRefresh(); } finally { 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 5f774dcc2..25664ba4e 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 @@ -16,7 +16,7 @@ import { Button, message } from 'ant-design-vue'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { deleteDemo03Grade, - deleteDemo03GradeListByIds, + deleteDemo03GradeList, getDemo03GradePage, } from '#/api/infra/demo/demo03/erp'; import { $t } from '#/locales'; @@ -74,7 +74,7 @@ async function onDeleteBatch() { key: 'action_process_msg', }); try { - await deleteDemo03GradeListByIds(deleteIds.value); + await deleteDemo03GradeList(deleteIds.value); message.success($t('ui.actionMessage.deleteSuccess')); onRefresh(); } finally { diff --git a/apps/web-antd/src/views/infra/demo/demo03/inner/index.vue b/apps/web-antd/src/views/infra/demo/demo03/inner/index.vue index af4289b39..24d768b26 100644 --- a/apps/web-antd/src/views/infra/demo/demo03/inner/index.vue +++ b/apps/web-antd/src/views/infra/demo/demo03/inner/index.vue @@ -16,7 +16,7 @@ import { Button, message, Tabs } from 'ant-design-vue'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { deleteDemo03Student, - deleteDemo03StudentListByIds, + deleteDemo03StudentList, exportDemo03Student, getDemo03StudentPage, } from '#/api/infra/demo/demo03/inner'; @@ -74,7 +74,7 @@ async function onDeleteBatch() { key: 'action_process_msg', }); try { - await deleteDemo03StudentListByIds(deleteIds.value); + await deleteDemo03StudentList(deleteIds.value); message.success($t('ui.actionMessage.deleteSuccess')); onRefresh(); } finally { 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 e492af9cd..0f2fa9492 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 @@ -16,7 +16,7 @@ import { Button, message } from 'ant-design-vue'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { deleteDemo03Student, - deleteDemo03StudentListByIds, + deleteDemo03StudentList, exportDemo03Student, getDemo03StudentPage, } from '#/api/infra/demo/demo03/normal'; @@ -77,7 +77,7 @@ async function onDeleteBatch() { key: 'action_process_msg', }); try { - await deleteDemo03StudentListByIds(deleteIds.value); + await deleteDemo03StudentList(deleteIds.value); message.success($t('ui.actionMessage.deleteSuccess')); onRefresh(); } finally { diff --git a/apps/web-antd/src/views/infra/demo/general/demo01/index.vue b/apps/web-antd/src/views/infra/demo/general/demo01/index.vue index 08ffc3bd8..3684e3b2c 100644 --- a/apps/web-antd/src/views/infra/demo/general/demo01/index.vue +++ b/apps/web-antd/src/views/infra/demo/general/demo01/index.vue @@ -25,7 +25,7 @@ import { import { VxeColumn, VxeTable } from '#/adapter/vxe-table'; import { deleteDemo01Contact, - deleteDemo01ContactListByIds, + deleteDemo01ContactList, exportDemo01Contact, getDemo01ContactPage, } from '#/api/infra/demo/demo01'; @@ -122,7 +122,7 @@ async function onDeleteBatch() { key: 'action_process_msg', }); try { - await deleteDemo01ContactListByIds(deleteIds.value); + await deleteDemo01ContactList(deleteIds.value); message.success($t('ui.actionMessage.deleteSuccess')); await getList(); } finally { diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/erp/index.vue b/apps/web-antd/src/views/infra/demo/general/demo03/erp/index.vue index fedc033fd..2a92757a0 100644 --- a/apps/web-antd/src/views/infra/demo/general/demo03/erp/index.vue +++ b/apps/web-antd/src/views/infra/demo/general/demo03/erp/index.vue @@ -26,7 +26,7 @@ import { import { VxeColumn, VxeTable } from '#/adapter/vxe-table'; import { deleteDemo03Student, - deleteDemo03StudentListByIds, + deleteDemo03StudentList, exportDemo03Student, getDemo03StudentPage, } from '#/api/infra/demo/demo03/erp'; @@ -133,7 +133,7 @@ async function onDeleteBatch() { key: 'action_process_msg', }); try { - await deleteDemo03StudentListByIds(deleteIds.value); + await deleteDemo03StudentList(deleteIds.value); message.success($t('ui.actionMessage.deleteSuccess')); await getList(); } finally { diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-course-list.vue b/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-course-list.vue index 00caaca15..1a2a8a273 100644 --- a/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-course-list.vue +++ b/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-course-list.vue @@ -19,7 +19,7 @@ import { import { VxeColumn, VxeTable } from '#/adapter/vxe-table'; import { deleteDemo03Course, - deleteDemo03CourseListByIds, + deleteDemo03CourseList, getDemo03CoursePage, } from '#/api/infra/demo/demo03/erp'; import { ContentWrap } from '#/components/content-wrap'; @@ -80,7 +80,7 @@ async function onDeleteBatch() { key: 'action_process_msg', }); try { - await deleteDemo03CourseListByIds(deleteIds.value); + await deleteDemo03CourseList(deleteIds.value); message.success($t('ui.actionMessage.deleteSuccess')); await getList(); } finally { diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-grade-list.vue b/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-grade-list.vue index f25c1be21..d3bf48fc1 100644 --- a/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-grade-list.vue +++ b/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-grade-list.vue @@ -19,7 +19,7 @@ import { import { VxeColumn, VxeTable } from '#/adapter/vxe-table'; import { deleteDemo03Grade, - deleteDemo03GradeListByIds, + deleteDemo03GradeList, getDemo03GradePage, } from '#/api/infra/demo/demo03/erp'; import { ContentWrap } from '#/components/content-wrap'; @@ -80,7 +80,7 @@ async function onDeleteBatch() { key: 'action_process_msg', }); try { - await deleteDemo03GradeListByIds(deleteIds.value); + await deleteDemo03GradeList(deleteIds.value); message.success($t('ui.actionMessage.deleteSuccess')); await getList(); } finally { diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/inner/index.vue b/apps/web-antd/src/views/infra/demo/general/demo03/inner/index.vue index edc1a9a4b..cd635dcef 100644 --- a/apps/web-antd/src/views/infra/demo/general/demo03/inner/index.vue +++ b/apps/web-antd/src/views/infra/demo/general/demo03/inner/index.vue @@ -26,7 +26,7 @@ import { import { VxeColumn, VxeTable } from '#/adapter/vxe-table'; import { deleteDemo03Student, - deleteDemo03StudentListByIds, + deleteDemo03StudentList, exportDemo03Student, getDemo03StudentPage, } from '#/api/infra/demo/demo03/normal'; @@ -129,7 +129,7 @@ async function onDeleteBatch() { key: 'action_process_msg', }); try { - await deleteDemo03StudentListByIds(deleteIds.value); + await deleteDemo03StudentList(deleteIds.value); message.success($t('ui.actionMessage.deleteSuccess')); await getList(); } finally { diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/normal/index.vue b/apps/web-antd/src/views/infra/demo/general/demo03/normal/index.vue index 1777eec6f..efa97f4d4 100644 --- a/apps/web-antd/src/views/infra/demo/general/demo03/normal/index.vue +++ b/apps/web-antd/src/views/infra/demo/general/demo03/normal/index.vue @@ -25,7 +25,7 @@ import { import { VxeColumn, VxeTable } from '#/adapter/vxe-table'; import { deleteDemo03Student, - deleteDemo03StudentListByIds, + deleteDemo03StudentList, exportDemo03Student, getDemo03StudentPage, } from '#/api/infra/demo/demo03/normal'; @@ -123,7 +123,7 @@ async function onDeleteBatch() { key: 'action_process_msg', }); try { - await deleteDemo03StudentListByIds(deleteIds.value); + await deleteDemo03StudentList(deleteIds.value); message.success($t('ui.actionMessage.deleteSuccess')); await getList(); } finally { From 2abe2e21bc4f7dd647688cc494cfffe3604883cd Mon Sep 17 00:00:00 2001 From: puhui999 Date: Fri, 6 Jun 2025 16:03:13 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=E7=9B=B8=E5=85=B3=20setChe?= =?UTF-8?q?ckedIds=20->=20handleRowCheckboxChange=E3=80=81deleteIds=20->?= =?UTF-8?q?=20checkedIds=20=E7=84=B6=E5=90=8E=E6=B3=A8=E9=87=8A=E5=8E=BB?= =?UTF-8?q?=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web-antd/src/views/infra/demo/demo01/index.vue | 10 ++++------ .../src/views/infra/demo/demo03/erp/index.vue | 14 +++++++------- .../demo/demo03/erp/modules/demo03-course-list.vue | 14 +++++++------- .../demo/demo03/erp/modules/demo03-grade-list.vue | 14 +++++++------- .../src/views/infra/demo/demo03/inner/index.vue | 14 +++++++------- .../src/views/infra/demo/demo03/normal/index.vue | 14 +++++++------- .../src/views/infra/demo/general/demo01/index.vue | 14 +++++++------- .../views/infra/demo/general/demo03/erp/index.vue | 14 +++++++------- .../demo03/erp/modules/demo03-course-list.vue | 14 +++++++------- .../demo03/erp/modules/demo03-grade-list.vue | 14 +++++++------- .../infra/demo/general/demo03/inner/index.vue | 14 +++++++------- .../infra/demo/general/demo03/normal/index.vue | 14 +++++++------- 12 files changed, 81 insertions(+), 83 deletions(-) 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 3361e1682..f3f988055 100644 --- a/apps/web-antd/src/views/infra/demo/demo01/index.vue +++ b/apps/web-antd/src/views/infra/demo/demo01/index.vue @@ -73,10 +73,8 @@ async function handleDeleteBatch() { } } -// TODO @puhui999:方法名,改成 handleRowCheckboxChange;注释:处理选中表格行 -// TODO @puhui999:deleteIds => checkedIds;然后注释去掉? -const checkedIds = ref([]); // 待删除示例联系人 ID -function setCheckedIds({ +const checkedIds = ref([]); +function handleRowCheckboxChange({ records, }: { records: Demo01ContactApi.Demo01Contact[]; @@ -121,8 +119,8 @@ const [Grid, gridApi] = useVbenVxeGrid({ }, } as VxeTableGridOptions, gridEvents: { - checkboxAll: setCheckedIds, - checkboxChange: setCheckedIds, + checkboxAll: handleRowCheckboxChange, + checkboxChange: handleRowCheckboxChange, }, }); diff --git a/apps/web-antd/src/views/infra/demo/demo03/erp/index.vue b/apps/web-antd/src/views/infra/demo/demo03/erp/index.vue index ee39c7b4a..0e7955340 100644 --- a/apps/web-antd/src/views/infra/demo/demo03/erp/index.vue +++ b/apps/web-antd/src/views/infra/demo/demo03/erp/index.vue @@ -75,7 +75,7 @@ async function onDeleteBatch() { key: 'action_process_msg', }); try { - await deleteDemo03StudentList(deleteIds.value); + await deleteDemo03StudentList(checkedIds.value); message.success($t('ui.actionMessage.deleteSuccess')); onRefresh(); } finally { @@ -83,13 +83,13 @@ async function onDeleteBatch() { } } -const deleteIds = ref([]); // 待删除学生 ID -function setDeleteIds({ +const checkedIds = ref([]); +function handleRowCheckboxChange({ records, }: { records: Demo03StudentApi.Demo03Grade[]; }) { - deleteIds.value = records.map((item) => item.id); + checkedIds.value = records.map((item) => item.id); } /** 导出表格 */ @@ -150,8 +150,8 @@ const [Grid, gridApi] = useVbenVxeGrid({ cellClick: ({ row }: { row: Demo03StudentApi.Demo03Student }) => { selectDemo03Student.value = row; }, - checkboxAll: setDeleteIds, - checkboxChange: setDeleteIds, + checkboxAll: handleRowCheckboxChange, + checkboxChange: handleRowCheckboxChange, }, }); @@ -185,7 +185,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ type="primary" danger class="ml-2" - :disabled="isEmpty(deleteIds)" + :disabled="isEmpty(checkedIds)" @click="onDeleteBatch" v-access:code="['infra:demo03-student:delete']" > 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 86cc2b468..c92e81003 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 @@ -74,7 +74,7 @@ async function onDeleteBatch() { key: 'action_process_msg', }); try { - await deleteDemo03CourseList(deleteIds.value); + await deleteDemo03CourseList(checkedIds.value); message.success($t('ui.actionMessage.deleteSuccess')); onRefresh(); } finally { @@ -82,13 +82,13 @@ async function onDeleteBatch() { } } -const deleteIds = ref([]); // 待删除学生课程 ID -function setDeleteIds({ +const checkedIds = ref([]); +function handleRowCheckboxChange({ records, }: { records: Demo03StudentApi.Demo03Course[]; }) { - deleteIds.value = records.map((item) => item.id); + checkedIds.value = records.map((item) => item.id); } /** 表格操作按钮的回调函数 */ @@ -143,8 +143,8 @@ const [Grid, gridApi] = useVbenVxeGrid({ }, } as VxeTableGridOptions, gridEvents: { - checkboxAll: setDeleteIds, - checkboxChange: setDeleteIds, + checkboxAll: handleRowCheckboxChange, + checkboxChange: handleRowCheckboxChange, }, }); @@ -184,7 +184,7 @@ watch( type="primary" danger class="ml-2" - :disabled="isEmpty(deleteIds)" + :disabled="isEmpty(checkedIds)" @click="onDeleteBatch" v-access:code="['infra:demo03-student:delete']" > 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 25664ba4e..a752b5991 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 @@ -74,7 +74,7 @@ async function onDeleteBatch() { key: 'action_process_msg', }); try { - await deleteDemo03GradeList(deleteIds.value); + await deleteDemo03GradeList(checkedIds.value); message.success($t('ui.actionMessage.deleteSuccess')); onRefresh(); } finally { @@ -82,13 +82,13 @@ async function onDeleteBatch() { } } -const deleteIds = ref([]); // 待删除学生班级 ID -function setDeleteIds({ +const checkedIds = ref([]); +function handleRowCheckboxChange({ records, }: { records: Demo03StudentApi.Demo03Grade[]; }) { - deleteIds.value = records.map((item) => item.id); + checkedIds.value = records.map((item) => item.id); } /** 表格操作按钮的回调函数 */ @@ -143,8 +143,8 @@ const [Grid, gridApi] = useVbenVxeGrid({ }, } as VxeTableGridOptions, gridEvents: { - checkboxAll: setDeleteIds, - checkboxChange: setDeleteIds, + checkboxAll: handleRowCheckboxChange, + checkboxChange: handleRowCheckboxChange, }, }); @@ -184,7 +184,7 @@ watch( type="primary" danger class="ml-2" - :disabled="isEmpty(deleteIds)" + :disabled="isEmpty(checkedIds)" @click="onDeleteBatch" v-access:code="['infra:demo03-student:delete']" > diff --git a/apps/web-antd/src/views/infra/demo/demo03/inner/index.vue b/apps/web-antd/src/views/infra/demo/demo03/inner/index.vue index 24d768b26..f003d8c9c 100644 --- a/apps/web-antd/src/views/infra/demo/demo03/inner/index.vue +++ b/apps/web-antd/src/views/infra/demo/demo03/inner/index.vue @@ -74,7 +74,7 @@ async function onDeleteBatch() { key: 'action_process_msg', }); try { - await deleteDemo03StudentList(deleteIds.value); + await deleteDemo03StudentList(checkedIds.value); message.success($t('ui.actionMessage.deleteSuccess')); onRefresh(); } finally { @@ -82,13 +82,13 @@ async function onDeleteBatch() { } } -const deleteIds = ref([]); // 待删除学生 ID -function setDeleteIds({ +const checkedIds = ref([]); +function handleRowCheckboxChange({ records, }: { records: Demo03StudentApi.Demo03Student[]; }) { - deleteIds.value = records.map((item) => item.id); + checkedIds.value = records.map((item) => item.id); } /** 导出表格 */ @@ -145,8 +145,8 @@ const [Grid, gridApi] = useVbenVxeGrid({ }, } as VxeTableGridOptions, gridEvents: { - checkboxAll: setDeleteIds, - checkboxChange: setDeleteIds, + checkboxAll: handleRowCheckboxChange, + checkboxChange: handleRowCheckboxChange, }, }); @@ -190,7 +190,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ type="primary" danger class="ml-2" - :disabled="isEmpty(deleteIds)" + :disabled="isEmpty(checkedIds)" @click="onDeleteBatch" v-access:code="['infra:demo03-student:delete']" > 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 0f2fa9492..85d19daa2 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 @@ -61,13 +61,13 @@ async function onDelete(row: Demo03StudentApi.Demo03Student) { } } -const deleteIds = ref([]); // 待删除学生 ID -function setDeleteIds({ +const checkedIds = ref([]); +function handleRowCheckboxChange({ records, }: { records: Demo03StudentApi.Demo03Student[]; }) { - deleteIds.value = records.map((item) => item.id); + checkedIds.value = records.map((item) => item.id); } /** 批量删除学生 */ async function onDeleteBatch() { @@ -77,7 +77,7 @@ async function onDeleteBatch() { key: 'action_process_msg', }); try { - await deleteDemo03StudentList(deleteIds.value); + await deleteDemo03StudentList(checkedIds.value); message.success($t('ui.actionMessage.deleteSuccess')); onRefresh(); } finally { @@ -139,8 +139,8 @@ const [Grid, gridApi] = useVbenVxeGrid({ }, } as VxeTableGridOptions, gridEvents: { - checkboxAll: setDeleteIds, - checkboxChange: setDeleteIds, + checkboxAll: handleRowCheckboxChange, + checkboxChange: handleRowCheckboxChange, }, }); @@ -173,7 +173,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ type="primary" danger class="ml-2" - :disabled="isEmpty(deleteIds)" + :disabled="isEmpty(checkedIds)" @click="onDeleteBatch" v-access:code="['infra:demo03-student:delete']" > diff --git a/apps/web-antd/src/views/infra/demo/general/demo01/index.vue b/apps/web-antd/src/views/infra/demo/general/demo01/index.vue index 3684e3b2c..b76e8f0db 100644 --- a/apps/web-antd/src/views/infra/demo/general/demo01/index.vue +++ b/apps/web-antd/src/views/infra/demo/general/demo01/index.vue @@ -122,7 +122,7 @@ async function onDeleteBatch() { key: 'action_process_msg', }); try { - await deleteDemo01ContactList(deleteIds.value); + await deleteDemo01ContactList(checkedIds.value); message.success($t('ui.actionMessage.deleteSuccess')); await getList(); } finally { @@ -130,13 +130,13 @@ async function onDeleteBatch() { } } -const deleteIds = ref([]); // 待删除示例联系人 ID -function setDeleteIds({ +const checkedIds = ref([]); +function handleRowCheckboxChange({ records, }: { records: Demo01ContactApi.Demo01Contact[]; }) { - deleteIds.value = records.map((item) => item.id); + checkedIds.value = records.map((item) => item.id); } /** 导出表格 */ @@ -241,7 +241,7 @@ onMounted(() => { type="primary" danger class="ml-2" - :disabled="isEmpty(deleteIds)" + :disabled="isEmpty(checkedIds)" @click="onDeleteBatch" v-access:code="['infra:demo01-contact:delete']" > @@ -254,8 +254,8 @@ onMounted(() => { :data="list" show-overflow :loading="loading" - @checkbox-all="setDeleteIds" - @checkbox-change="setDeleteIds" + @checkbox-all="handleRowCheckboxChange" + @checkbox-change="handleRowCheckboxChange" > diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/erp/index.vue b/apps/web-antd/src/views/infra/demo/general/demo03/erp/index.vue index 2a92757a0..62385532b 100644 --- a/apps/web-antd/src/views/infra/demo/general/demo03/erp/index.vue +++ b/apps/web-antd/src/views/infra/demo/general/demo03/erp/index.vue @@ -133,7 +133,7 @@ async function onDeleteBatch() { key: 'action_process_msg', }); try { - await deleteDemo03StudentList(deleteIds.value); + await deleteDemo03StudentList(checkedIds.value); message.success($t('ui.actionMessage.deleteSuccess')); await getList(); } finally { @@ -141,13 +141,13 @@ async function onDeleteBatch() { } } -const deleteIds = ref([]); // 待删除学生 ID -function setDeleteIds({ +const checkedIds = ref([]); +function handleRowCheckboxChange({ records, }: { records: Demo03StudentApi.Demo03Student[]; }) { - deleteIds.value = records.map((item) => item.id); + checkedIds.value = records.map((item) => item.id); } /** 导出表格 */ @@ -250,7 +250,7 @@ onMounted(() => { type="primary" danger class="ml-2" - :disabled="isEmpty(deleteIds)" + :disabled="isEmpty(checkedIds)" @click="onDeleteBatch" v-access:code="['infra:demo03-student:delete']" > @@ -269,8 +269,8 @@ onMounted(() => { }" show-overflow :loading="loading" - @checkbox-all="setDeleteIds" - @checkbox-change="setDeleteIds" + @checkbox-all="handleRowCheckboxChange" + @checkbox-change="handleRowCheckboxChange" > diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-course-list.vue b/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-course-list.vue index 1a2a8a273..47ed647c8 100644 --- a/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-course-list.vue +++ b/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-course-list.vue @@ -80,7 +80,7 @@ async function onDeleteBatch() { key: 'action_process_msg', }); try { - await deleteDemo03CourseList(deleteIds.value); + await deleteDemo03CourseList(checkedIds.value); message.success($t('ui.actionMessage.deleteSuccess')); await getList(); } finally { @@ -88,13 +88,13 @@ async function onDeleteBatch() { } } -const deleteIds = ref([]); // 待删除学生课程 ID -function setDeleteIds({ +const checkedIds = ref([]); +function handleRowCheckboxChange({ records, }: { records: Demo03StudentApi.Demo03Course[]; }) { - deleteIds.value = records.map((item) => item.id); + checkedIds.value = records.map((item) => item.id); } const loading = ref(true); // 列表的加载中 @@ -231,7 +231,7 @@ onMounted(() => { type="primary" danger class="ml-2" - :disabled="isEmpty(deleteIds)" + :disabled="isEmpty(checkedIds)" @click="onDeleteBatch" v-access:code="['infra:demo03-student:delete']" > @@ -244,8 +244,8 @@ onMounted(() => { :data="list" show-overflow :loading="loading" - @checkbox-all="setDeleteIds" - @checkbox-change="setDeleteIds" + @checkbox-all="handleRowCheckboxChange" + @checkbox-change="handleRowCheckboxChange" > diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-grade-list.vue b/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-grade-list.vue index d3bf48fc1..0f8435c4b 100644 --- a/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-grade-list.vue +++ b/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-grade-list.vue @@ -80,7 +80,7 @@ async function onDeleteBatch() { key: 'action_process_msg', }); try { - await deleteDemo03GradeList(deleteIds.value); + await deleteDemo03GradeList(checkedIds.value); message.success($t('ui.actionMessage.deleteSuccess')); await getList(); } finally { @@ -88,13 +88,13 @@ async function onDeleteBatch() { } } -const deleteIds = ref([]); // 待删除学生班级 ID -function setDeleteIds({ +const checkedIds = ref([]); +function handleRowCheckboxChange({ records, }: { records: Demo03StudentApi.Demo03Grade[]; }) { - deleteIds.value = records.map((item) => item.id); + checkedIds.value = records.map((item) => item.id); } const loading = ref(true); // 列表的加载中 @@ -231,7 +231,7 @@ onMounted(() => { type="primary" danger class="ml-2" - :disabled="isEmpty(deleteIds)" + :disabled="isEmpty(checkedIds)" @click="onDeleteBatch" v-access:code="['infra:demo03-student:delete']" > @@ -244,8 +244,8 @@ onMounted(() => { :data="list" show-overflow :loading="loading" - @checkbox-all="setDeleteIds" - @checkbox-change="setDeleteIds" + @checkbox-all="handleRowCheckboxChange" + @checkbox-change="handleRowCheckboxChange" > diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/inner/index.vue b/apps/web-antd/src/views/infra/demo/general/demo03/inner/index.vue index cd635dcef..b093a83de 100644 --- a/apps/web-antd/src/views/infra/demo/general/demo03/inner/index.vue +++ b/apps/web-antd/src/views/infra/demo/general/demo03/inner/index.vue @@ -129,7 +129,7 @@ async function onDeleteBatch() { key: 'action_process_msg', }); try { - await deleteDemo03StudentList(deleteIds.value); + await deleteDemo03StudentList(checkedIds.value); message.success($t('ui.actionMessage.deleteSuccess')); await getList(); } finally { @@ -137,13 +137,13 @@ async function onDeleteBatch() { } } -const deleteIds = ref([]); // 待删除学生 ID -function setDeleteIds({ +const checkedIds = ref([]); +function handleRowCheckboxChange({ records, }: { records: Demo03StudentApi.Demo03Student[]; }) { - deleteIds.value = records.map((item) => item.id); + checkedIds.value = records.map((item) => item.id); } /** 导出表格 */ @@ -246,7 +246,7 @@ onMounted(() => { type="primary" danger class="ml-2" - :disabled="isEmpty(deleteIds)" + :disabled="isEmpty(checkedIds)" @click="onDeleteBatch" v-access:code="['infra:demo03-student:delete']" > @@ -259,8 +259,8 @@ onMounted(() => { :data="list" show-overflow :loading="loading" - @checkbox-all="setDeleteIds" - @checkbox-change="setDeleteIds" + @checkbox-all="handleRowCheckboxChange" + @checkbox-change="handleRowCheckboxChange" > diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/normal/index.vue b/apps/web-antd/src/views/infra/demo/general/demo03/normal/index.vue index efa97f4d4..75db2f158 100644 --- a/apps/web-antd/src/views/infra/demo/general/demo03/normal/index.vue +++ b/apps/web-antd/src/views/infra/demo/general/demo03/normal/index.vue @@ -123,7 +123,7 @@ async function onDeleteBatch() { key: 'action_process_msg', }); try { - await deleteDemo03StudentList(deleteIds.value); + await deleteDemo03StudentList(checkedIds.value); message.success($t('ui.actionMessage.deleteSuccess')); await getList(); } finally { @@ -131,13 +131,13 @@ async function onDeleteBatch() { } } -const deleteIds = ref([]); // 待删除学生 ID -function setDeleteIds({ +const checkedIds = ref([]); +function handleRowCheckboxChange({ records, }: { records: Demo03StudentApi.Demo03Student[]; }) { - deleteIds.value = records.map((item) => item.id); + checkedIds.value = records.map((item) => item.id); } /** 导出表格 */ @@ -240,7 +240,7 @@ onMounted(() => { type="primary" danger class="ml-2" - :disabled="isEmpty(deleteIds)" + :disabled="isEmpty(checkedIds)" @click="onDeleteBatch" v-access:code="['infra:demo03-student:delete']" > @@ -253,8 +253,8 @@ onMounted(() => { :data="list" show-overflow :loading="loading" - @checkbox-all="setDeleteIds" - @checkbox-change="setDeleteIds" + @checkbox-all="handleRowCheckboxChange" + @checkbox-change="handleRowCheckboxChange" > From ffdccfb19b80277de10f618c8137b37fa67e5134 Mon Sep 17 00:00:00 2001 From: puhui999 Date: Fri, 6 Jun 2025 16:12:11 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20TableAction=20=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=88=A0=E9=99=A4=20disabled=20=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/views/infra/demo/demo01/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 f3f988055..7ac328ea8 100644 --- a/apps/web-antd/src/views/infra/demo/demo01/index.vue +++ b/apps/web-antd/src/views/infra/demo/demo01/index.vue @@ -5,7 +5,7 @@ import type { Demo01ContactApi } from '#/api/infra/demo/demo01'; import { ref } from 'vue'; import { Page, useVbenModal } from '@vben/common-ui'; -import { downloadFileFromBlobPart } from '@vben/utils'; +import {downloadFileFromBlobPart, isEmpty} from '@vben/utils'; import { message } from 'ant-design-vue'; @@ -151,6 +151,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ label: '批量删除', type: 'primary', danger: true, + disabled: isEmpty(checkedIds), icon: ACTION_ICON.DELETE, auth: ['infra:demo01-contact:delete'], onClick: handleDeleteBatch, From 95e7ffafe0bd5c238bfb973e5e782fb80b6f0ab5 Mon Sep 17 00:00:00 2001 From: puhui999 Date: Fri, 6 Jun 2025 17:03:02 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20TableAction=20=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=88=A0=E9=99=A4=20disabled=20=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/views/infra/demo/demo01/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7ac328ea8..48eed5386 100644 --- a/apps/web-antd/src/views/infra/demo/demo01/index.vue +++ b/apps/web-antd/src/views/infra/demo/demo01/index.vue @@ -5,7 +5,7 @@ import type { Demo01ContactApi } from '#/api/infra/demo/demo01'; import { ref } from 'vue'; import { Page, useVbenModal } from '@vben/common-ui'; -import {downloadFileFromBlobPart, isEmpty} from '@vben/utils'; +import { downloadFileFromBlobPart, isEmpty } from '@vben/utils'; import { message } from 'ant-design-vue';