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 69d51090ea..f8e31005b7 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
@@ -146,7 +146,7 @@ async function handleDelete(row: ${simpleClassName}Api.${simpleClassName}) {
     duration: 0,
   });
   try {
-    await delete${simpleClassName}(row.id as number);
+    await delete${simpleClassName}(row.id!);
     message.success($t('ui.actionMessage.deleteSuccess', [row.id]));
     await getList();
   } finally {
@@ -195,7 +195,7 @@ try {
 #if (${table.templateType} == 2)
 /** 切换树形展开/收缩状态 */
 const isExpanded = ref(true);
-function toggleExpand() {
+function handleExpand() {
   isExpanded.value = !isExpanded.value;
   tableRef.value?.setAllTreeExpand(isExpanded.value);
 }
@@ -303,7 +303,7 @@ onMounted(() => {
             v-model:hidden-search="hiddenSearchBar"
         >
         #if (${table.templateType} == 2)
-          <Button @click="toggleExpand" class="mr-2">
+          <Button @click="handleExpand" class="mr-2">
             {{ isExpanded ? '收缩' : '展开' }}
           </Button>
         #end
diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/general/views/modules/list_sub_erp.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/general/views/modules/list_sub_erp.vue.vm
index bc3b265526..078ac4c9c4 100644
--- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/general/views/modules/list_sub_erp.vue.vm
+++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/general/views/modules/list_sub_erp.vue.vm
@@ -70,7 +70,7 @@ async function handleDelete(row: ${simpleClassName}Api.${subSimpleClassName}) {
     duration: 0,
   });
   try {
-    await delete${subSimpleClassName}(row.id as number);
+    await delete${subSimpleClassName}(row.id!);
     message.success($t('ui.actionMessage.deleteSuccess', [row.id]));
     await getList();
   } finally {
diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/index.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/index.vue.vm
index 97189b023f..d66275d3dd 100644
--- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/index.vue.vm
+++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/index.vue.vm
@@ -54,14 +54,14 @@ const [FormModal, formModalApi] = useVbenModal({
 
 /** 切换树形展开/收缩状态 */
 const isExpanded = ref(true);
-function toggleExpand() {
+function handleExpand() {
   isExpanded.value = !isExpanded.value;
   gridApi.grid.setAllTreeExpand(isExpanded.value);
 }
 #end
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
 #if ($table.templateType == 12) ## 内嵌情况
   gridApi.reload();
 #else
@@ -93,9 +93,9 @@ async function handleDelete(row: ${apiName}.${simpleClassName}) {
     duration: 0,
   });
   try {
-    await delete${simpleClassName}(row.id as number);
+    await delete${simpleClassName}(row.id!);
     message.success($t('ui.actionMessage.deleteSuccess', [row.id]));
-    onRefresh();
+    handleRefresh();
   } finally {
     hideLoading();
   }
@@ -113,7 +113,7 @@ async function handleDeleteBatch() {
     await delete${simpleClassName}List(checkedIds.value);
     checkedIds.value = [];
     message.success($t('ui.actionMessage.deleteSuccess'));
-    onRefresh();
+    handleRefresh();
   } finally {
     hideLoading();
   }
@@ -209,7 +209,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
 
 <template>
   <Page auto-content-height>
-    <FormModal @success="onRefresh" />
+    <FormModal @success="handleRefresh" />
 #if ($table.templateType == 11) ## erp情况
   <div>
 #end
@@ -244,7 +244,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
             {
               label: isExpanded ? '收缩' : '展开',
               type: 'primary',
-              onClick: toggleExpand,
+              onClick: handleExpand,
             },
             #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 bdd5208620..8b4190c98d 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
@@ -63,9 +63,9 @@ async function handleDelete(row: ${apiName}.${subSimpleClassName}) {
     duration: 0,
   });
   try {
-    await delete${subSimpleClassName}(row.id as number);
+    await delete${subSimpleClassName}(row.id!);
     message.success($t('ui.actionMessage.deleteSuccess', [row.id]));
-    onRefresh();
+    handleRefresh();
   } finally {
     hideLoading();
   }
@@ -82,7 +82,7 @@ async function handleDeleteBatch() {
     await delete${subSimpleClassName}List(checkedIds.value);
     checkedIds.value = [];
     message.success($t('ui.actionMessage.deleteSuccess', [row.id]));
-    onRefresh();
+    handleRefresh();
   } finally {
     hideLoading();
   }
@@ -154,7 +154,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
 });
 
 /** 刷新表格 */
-async function onRefresh() {
+async function handleRefresh() {
 #if ($table.templateType == 11) ## erp
   await gridApi.query();
 #else
@@ -174,7 +174,7 @@ watch(
       return;
     }
     await nextTick();
-    await onRefresh()
+    await handleRefresh()
   },
   { immediate: true },
 );
@@ -182,7 +182,7 @@ watch(
 
 <template>
     #if ($table.templateType == 11) ## erp
-      <FormModal @success="onRefresh" />
+      <FormModal @success="handleRefresh" />
       <Grid table-title="${subTable.classComment}列表">
         <template #toolbar-tools>
           <TableAction
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 ae77cd4c7b..67ca19fb11 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
@@ -195,7 +195,7 @@ try {
 #if (${table.templateType} == 2)
 /** 切换树形展开/收缩状态 */
 const isExpanded = ref(true);
-function toggleExpand() {
+function handleExpand() {
   isExpanded.value = !isExpanded.value;
   tableRef.value?.setAllTreeExpand(isExpanded.value);
 }
@@ -306,7 +306,7 @@ onMounted(() => {
             v-model:hidden-search="hiddenSearchBar"
         >
         #if (${table.templateType} == 2)
-          <el-button @click="toggleExpand" class="mr-2">
+          <el-button @click="handleExpand" class="mr-2">
             {{ isExpanded ? '收缩' : '展开' }}
           </el-button>
         #end
diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/index.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/index.vue.vm
index fd59cdbad4..8f3dc5611e 100644
--- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/index.vue.vm
+++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/index.vue.vm
@@ -54,14 +54,14 @@ const [FormModal, formModalApi] = useVbenModal({
 
 /** 切换树形展开/收缩状态 */
 const isExpanded = ref(true);
-function toggleExpand() {
+function handleExpand() {
   isExpanded.value = !isExpanded.value;
   gridApi.grid.setAllTreeExpand(isExpanded.value);
 }
 #end
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
 #if ($table.templateType == 12) ## 内嵌情况
   gridApi.reload();
 #else
@@ -92,9 +92,9 @@ async function handleDelete(row: ${apiName}.${simpleClassName}) {
     text: $t('ui.actionMessage.deleting', [row.id]),
   });
   try {
-    await delete${simpleClassName}(row.id as number);
+    await delete${simpleClassName}(row.id!);
     ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.id]));
-    onRefresh();
+    handleRefresh();
   } finally {
     loadingInstance.close();
   }
@@ -111,7 +111,7 @@ async function handleDeleteBatch() {
     await delete${simpleClassName}List(checkedIds.value);
     checkedIds.value = [];
     ElMessage.success($t('ui.actionMessage.deleteSuccess'));
-    onRefresh();
+    handleRefresh();
   } finally {
     loadingInstance.close();
   }
@@ -207,7 +207,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
 
 <template>
   <Page auto-content-height>
-    <FormModal @success="onRefresh" />
+    <FormModal @success="handleRefresh" />
 #if ($table.templateType == 11) ## erp情况
   <div>
 #end
@@ -242,7 +242,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
             {
               label: isExpanded ? '收缩' : '展开',
               type: 'primary',
-              onClick: toggleExpand,
+              onClick: handleExpand,
             },
             #end
             {
diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/modules/list_sub_erp.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/modules/list_sub_erp.vue.vm
index e77552cff7..9d82f65506 100644
--- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/modules/list_sub_erp.vue.vm
+++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/modules/list_sub_erp.vue.vm
@@ -62,9 +62,9 @@ async function handleDelete(row: ${apiName}.${subSimpleClassName}) {
     text: $t('ui.actionMessage.deleting', [row.id]),
   });
   try {
-    await delete${subSimpleClassName}(row.id as number);
+    await delete${subSimpleClassName}(row.id!);
     ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.id]));
-    onRefresh();
+    handleRefresh();
   } finally {
     loadingInstance.close();
   }
@@ -80,7 +80,7 @@ async function handleDeleteBatch() {
     await delete${subSimpleClassName}List(checkedIds.value);
     checkedIds.value = [];
     ElMessage.success($t('ui.actionMessage.deleteSuccess'));
-    onRefresh();
+    handleRefresh();
   } finally {
     loadingInstance.close();
   }
@@ -152,7 +152,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
 });
 
 /** 刷新表格 */
-async function onRefresh() {
+async function handleRefresh() {
 #if ($table.templateType == 11) ## erp
   await gridApi.query();
 #else
@@ -172,7 +172,7 @@ watch(
       return;
     }
     await nextTick();
-    await onRefresh()
+    await handleRefresh()
   },
   { immediate: true },
 );
@@ -180,7 +180,7 @@ watch(
 
 <template>
     #if ($table.templateType == 11) ## erp
-      <FormModal @success="onRefresh" />
+      <FormModal @success="handleRefresh" />
       <Grid table-title="${subTable.classComment}列表">
         <template #toolbar-tools>
           <TableAction