From 11dd2308b385f3c3277890767e104f9b50f982c3 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Wed, 1 Oct 2025 15:39:36 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E3=80=90infra=E3=80=91=E4=BC=98?= =?UTF-8?q?=E5=8C=96=20codegen=20=E7=9A=84=20vben=20=E6=A8=A1=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../codegen/vue3_vben5_antd/general/views/index.vue.vm | 2 +- .../schema/views/modules/form_sub_erp.vue.vm | 2 -- .../schema/views/modules/form_sub_normal.vue.vm | 8 ++++---- .../schema/views/modules/list_sub_erp.vue.vm | 5 +++-- .../codegen/vue3_vben5_ele/general/views/index.vue.vm | 4 +--- .../general/views/modules/list_sub_erp.vue.vm | 2 -- 6 files changed, 9 insertions(+), 14 deletions(-) diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/general/views/index.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/general/views/index.vue.vm index 90cd3b738d..ce9eb1e5a3 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/general/views/index.vue.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/general/views/index.vue.vm @@ -123,7 +123,7 @@ const [FormModal, formModalApi] = useVbenModal({ /** 创建${table.classComment} */ function handleCreate() { - formModalApi.setData({}).open(); + formModalApi.setData(null).open(); } /** 编辑${table.classComment} */ diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/form_sub_erp.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/form_sub_erp.vue.vm index 74d97422c8..130b9d201b 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/form_sub_erp.vue.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/form_sub_erp.vue.vm @@ -43,7 +43,6 @@ if (!valid) { return; } - modalApi.lock(); // 提交表单 const data = (await formApi.getValues()) as ${apiName}.${subSimpleClassName}; @@ -63,7 +62,6 @@ formData.value = undefined; return; } - // 加载数据 let data = modalApi.getData<${apiName}.${subSimpleClassName}>(); if (!data) { diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/form_sub_normal.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/form_sub_normal.vue.vm index 07ca70bbd8..892398a8ff 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/form_sub_normal.vue.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/form_sub_normal.vue.vm @@ -38,7 +38,7 @@ function onActionClick({ }: OnActionClickParams<${apiName}.${subSimpleClassName}>) { switch (code) { case 'delete': { - onDelete(row); + handleDelete(row); break; } } @@ -64,12 +64,12 @@ gridOptions: { }); /** 添加${subTable.classComment} */ -const onAdd = async () => { +const handleAdd = async () => { await gridApi.grid.insertAt({} as ${apiName}.${subSimpleClassName}, -1); } /** 删除${subTable.classComment} */ -const onDelete = async (row: ${apiName}.${subSimpleClassName}) => { +const handleDelete = async (row: ${apiName}.${subSimpleClassName}) => { await gridApi.grid.remove(row); } @@ -188,7 +188,7 @@ watch( #end
-
diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/list_sub_erp.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/list_sub_erp.vue.vm index 517d1eaefd..f51ff07b38 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/list_sub_erp.vue.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/list_sub_erp.vue.vm @@ -13,7 +13,7 @@ import type { ${apiName} } from '#/api/${table.moduleName}/${table.businessName} #if ($table.templateType == 11) ## erp import ${subSimpleClassName}Form from './${subSimpleClassName_strikeCase}-form.vue' #end -import { useVbenModal } from '@vben/common-ui'; +import { confirm, useVbenModal } from '@vben/common-ui'; import { message } from 'ant-design-vue'; import { ref, computed, nextTick,watch } from 'vue'; import { $t } from '#/locales'; @@ -74,8 +74,9 @@ async function handleDelete(row: ${apiName}.${subSimpleClassName}) { #if ($deleteBatchEnable) /** 批量删除${subTable.classComment} */ async function handleDeleteBatch() { + await confirm($t('ui.actionMessage.deleteBatchConfirm')); const hideLoading = message.loading({ - content: $t('ui.actionMessage.deleting'), + content: $t('ui.actionMessage.deletingBatch'), duration: 0, }); try { diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/general/views/index.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/general/views/index.vue.vm index b64c3f98c4..71c5493445 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/general/views/index.vue.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/general/views/index.vue.vm @@ -123,7 +123,7 @@ const [FormModal, formModalApi] = useVbenModal({ /** 创建${table.classComment} */ function handleCreate() { - formModalApi.setData({}).open(); + formModalApi.setData(null).open(); } /** 编辑${table.classComment} */ @@ -142,7 +142,6 @@ function handleAppend(row: ${simpleClassName}Api.${simpleClassName}) { async function handleDelete(row: ${simpleClassName}Api.${simpleClassName}) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.id]), - background: 'rgba(0, 0, 0, 0.7)', }); try { await delete${simpleClassName}(row.id as number); @@ -158,7 +157,6 @@ async function handleDelete(row: ${simpleClassName}Api.${simpleClassName}) { async function handleDeleteBatch() { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting'), - background: 'rgba(0, 0, 0, 0.7)', }); try { await delete${simpleClassName}List(checkedIds.value); diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/general/views/modules/list_sub_erp.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/general/views/modules/list_sub_erp.vue.vm index f309400d25..bbdcc02863 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/general/views/modules/list_sub_erp.vue.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/general/views/modules/list_sub_erp.vue.vm @@ -69,7 +69,6 @@ function handleEdit(row: ${simpleClassName}Api.${subSimpleClassName}) { async function handleDelete(row: ${simpleClassName}Api.${subSimpleClassName}) { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting', [row.id]), - background: 'rgba(0, 0, 0, 0.7)', }); try { await delete${subSimpleClassName}(row.id as number); @@ -85,7 +84,6 @@ async function handleDelete(row: ${simpleClassName}Api.${subSimpleClassName}) { async function handleDeleteBatch() { const loadingInstance = ElLoading.service({ text: $t('ui.actionMessage.deleting'), - background: 'rgba(0, 0, 0, 0.7)', }); try { await delete${subSimpleClassName}List(checkedIds.value);