From b3296b4e9711bc36e3e843f4a3076217ba592d0e Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 11 Jul 2026 21:57:16 +0800
Subject: [PATCH] fix(codegen): 修复 Vben5 Antdv Next 模板兼容问题

---
 yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/form.vue.vm                             |  50 ++++++++++++++++++++++++++++----------------------
 yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/import.vue.vm                           |   6 ++----
 yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/index.vue.vm                            |  34 +++++++++++++++++++++++-----------
 yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/form_sub_erp.vue.vm             |  46 ++++++++++++++++++++++++++--------------------
 yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/form_sub_inner.vue.vm           |   2 +-
 yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/form_sub_normal.vue.vm          |  46 ++++++++++++++++++++++++++--------------------
 yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/list_sub_erp.vue.vm             |  34 +++++++++++++++++++++++-----------
 yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/list_sub_inner.vue.vm           |   2 +-
 yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/form.vue.vm                              |   2 +-
 yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/import.vue.vm                            |   4 +---
 yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/index.vue.vm                             |   2 +-
 yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/modules/form_sub_inner.vue.vm            |   2 +-
 yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/modules/form_sub_normal.vue.vm           |  20 +++++++++++++++++++-
 yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/modules/list_sub_inner.vue.vm            |   2 +-
 yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVben5AntdvNextTest.java | 422 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 15 files changed, 576 insertions(+), 98 deletions(-)
 create mode 100644 yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVben5AntdvNextTest.java

diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/form.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/form.vue.vm
index 03db716..c8ff573 100644
--- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/form.vue.vm
+++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/form.vue.vm
@@ -1,5 +1,11 @@
+#set ($selectOptionEnable = false)
+#foreach ($column in $columns)
+  #if (($column.createOperation || $column.updateOperation) && $column.htmlType == "select")
+    #set ($selectOptionEnable = true)
+  #end
+#end
 <script lang="ts" setup>
-import type { Rule } from 'antdv-next/es/form';
+import type { Rule } from 'antdv-next';
 import type { ${simpleClassName}Api } from '#/api/${table.moduleName}/${table.businessName}';
 
 import { computed, ref } from 'vue';
@@ -9,7 +15,7 @@ import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 import { Tinymce as RichTextarea } from '#/components/tinymce';
 import { ImageUpload, FileUpload } from "#/components/upload";
-import { message, Tabs, Form, Input, TextArea, Select, RadioGroup, Radio, CheckboxGroup, Checkbox, DatePicker, TreeSelect } from 'antdv-next';
+import { Checkbox, CheckboxGroup, DatePicker, Form, FormItem, Input, message, Radio, RadioGroup, Select#if ($selectOptionEnable), SelectOption#end#if ( $table.templateType == 10 || $table.templateType == 12 ), TabPane, Tabs#end, TextArea, TreeSelect } from 'antdv-next';
 #if($table.templateType == 2)## 树表需要导入这些
 import { get${simpleClassName}List } from '#/api/${table.moduleName}/${table.businessName}';
 import { handleTree } from '@vben/utils'
@@ -204,7 +210,7 @@ const [Modal, modalApi] = useVbenModal({
             #set ($dictMethod = "boolean")
           #end
           #if ( $table.templateType == 2 && $column.id == $treeParentColumn.id )
-            <Form.Item label="${comment}" name="${javaField}">
+            <FormItem label="${comment}" name="${javaField}">
               <TreeSelect
                       v-model:value="formData.${javaField}"
                       :treeData="${classNameVar}Tree"
@@ -225,25 +231,25 @@ const [Modal, modalApi] = useVbenModal({
                       treeDefaultExpandAll
                       placeholder="请选择${comment}"
               />
-            </Form.Item>
+            </FormItem>
           #elseif ($column.htmlType == "input" && !$column.primaryKey)## 忽略主键，不用在表单里
-            <Form.Item label="${comment}" name="${javaField}">
+            <FormItem label="${comment}" name="${javaField}">
               <Input v-model:value="formData.${javaField}" placeholder="请输入${comment}" />
-            </Form.Item>
+            </FormItem>
           #elseif($column.htmlType == "imageUpload")## 图片上传
-            <Form.Item label="${comment}" name="${javaField}">
+            <FormItem label="${comment}" name="${javaField}">
               <ImageUpload v-model:value="formData.${javaField}" />
-            </Form.Item>
+            </FormItem>
           #elseif($column.htmlType == "fileUpload")## 文件上传
-            <Form.Item label="${comment}" name="${javaField}">
+            <FormItem label="${comment}" name="${javaField}">
               <FileUpload v-model:value="formData.${javaField}" />
-            </Form.Item>
+            </FormItem>
           #elseif($column.htmlType == "editor")## 文本编辑器
-            <Form.Item label="${comment}" name="${javaField}">
+            <FormItem label="${comment}" name="${javaField}">
               <RichTextarea v-model="formData.${javaField}" height="500px" />
-            </Form.Item>
+            </FormItem>
           #elseif($column.htmlType == "select")## 下拉框
-            <Form.Item label="${comment}" name="${javaField}">
+            <FormItem label="${comment}" name="${javaField}">
               <Select v-model:value="formData.${javaField}" placeholder="请选择${comment}">
                 #if ("" != $dictType)## 有数据字典
                   <SelectOption
@@ -257,9 +263,9 @@ const [Modal, modalApi] = useVbenModal({
                   <SelectOption label="请选择字典生成" value="" />
                 #end
               </Select>
-            </Form.Item>
+            </FormItem>
           #elseif($column.htmlType == "checkbox")## 多选框
-            <Form.Item label="${comment}" name="${javaField}">
+            <FormItem label="${comment}" name="${javaField}">
               <CheckboxGroup v-model:value="formData.${javaField}">
                 #if ("" != $dictType)## 有数据字典
                   <Checkbox
@@ -273,9 +279,9 @@ const [Modal, modalApi] = useVbenModal({
                   <Checkbox label="请选择字典生成" />
                 #end
               </CheckboxGroup>
-            </Form.Item>
+            </FormItem>
           #elseif($column.htmlType == "radio")## 单选框
-            <Form.Item label="${comment}" name="${javaField}">
+            <FormItem label="${comment}" name="${javaField}">
               <RadioGroup v-model:value="formData.${javaField}">
                 #if ("" != $dictType)## 有数据字典
                   <Radio
@@ -289,19 +295,19 @@ const [Modal, modalApi] = useVbenModal({
                   <Radio value="1">请选择字典生成</Radio>
                 #end
               </RadioGroup>
-            </Form.Item>
+            </FormItem>
           #elseif($column.htmlType == "datetime")## 时间框
-            <Form.Item label="${comment}" name="${javaField}">
+            <FormItem label="${comment}" name="${javaField}">
               <DatePicker
                       v-model:value="formData.${javaField}"
                       valueFormat="x"
                       placeholder="选择${comment}"
               />
-            </Form.Item>
+            </FormItem>
           #elseif($column.htmlType == "textarea")## 文本框
-            <Form.Item label="${comment}" name="${javaField}">
+            <FormItem label="${comment}" name="${javaField}">
               <TextArea v-model:value="formData.${javaField}" placeholder="请输入${comment}" />
-            </Form.Item>
+            </FormItem>
           #end
         #end
       #end
diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/import.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/import.vue.vm
index b6b8f79..a825322 100644
--- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/import.vue.vm
+++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/import.vue.vm
@@ -1,6 +1,4 @@
 <script lang="ts" setup>
-import type { FileType } from 'antdv-next/es/upload/interface';
-
 import { ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
@@ -43,8 +41,8 @@ const [Modal, modalApi] = useVbenModal({
 });
 
 /** 上传前：拦截 antd Upload 的自动上传，文件存到 ref */
-function beforeUpload(file: FileType) {
-  fileRef.value = file as unknown as File;
+function beforeUpload(file: File) {
+  fileRef.value = file;
   return false;
 }
 
diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/index.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/index.vue.vm
index 166069d..a0c8c2d 100644
--- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/index.vue.vm
+++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/index.vue.vm
@@ -1,3 +1,13 @@
+#set ($rangePickerEnable = false)
+#set ($selectOptionEnable = false)
+#foreach ($column in $columns)
+  #if ($column.listOperation && $column.htmlType == "datetime" && $column.listOperationCondition == "BETWEEN")
+    #set ($rangePickerEnable = true)
+  #end
+  #if ($column.listOperation && ($column.htmlType == "select" || $column.htmlType == "radio" || $column.htmlType == "checkbox"))
+    #set ($selectOptionEnable = true)
+  #end
+#end
 <script lang="ts" setup>
 import type { ${simpleClassName}Api } from '#/api/${table.moduleName}/${table.businessName}';
 
@@ -8,12 +18,14 @@ import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 import { useTableToolbar, VbenVxeTableToolbar } from '@vben/plugins/vxe-table';
 import { cloneDeep, downloadFileFromBlobPart, formatDateTime, isEmpty } from '@vben/utils';
-import { Button, Card, message, Tabs, Pagination, Form, RangePicker, DatePicker, Select, Input } from 'antdv-next';
+import { Button, Card, DatePicker, Form, FormItem, Input, message, Pagination#if ($rangePickerEnable), DateRangePicker as RangePicker#end, Select#if ($selectOptionEnable), SelectOption#end#if ( $table.templateType == 11 || $table.templateType == 12 ), TabPane, Tabs#end } from 'antdv-next';
 import ${simpleClassName}Form from './modules/form.vue';
 import { Download, Plus, RefreshCw, Search, Trash2 } from '@vben/icons';
 import { DictTag } from '#/components/dict-tag';
 import { VxeColumn, VxeTable } from '#/adapter/vxe-table';
+#if ($rangePickerEnable)
 import { getRangePickerDefaultProps } from '#/utils/rangePickerProps';
+#end
 
 ## 特殊：主子表专属逻辑
 #if ( $table.templateType == 11 || $table.templateType == 12 )
@@ -249,7 +261,7 @@ onMounted(() => {
                       #set ($dictMethod = "boolean")
                   #end
                   #if ($column.htmlType == "input")
-                    <Form.Item label="${comment}" name="${javaField}">
+                    <FormItem label="${comment}" name="${javaField}">
                       <Input
                           v-model:value="queryParams.${javaField}"
                           placeholder="请输入${comment}"
@@ -257,9 +269,9 @@ onMounted(() => {
                           @pressEnter="handleQuery"
                            class="w-full"
                       />
-                    </Form.Item>
+                    </FormItem>
                   #elseif ($column.htmlType == "select" || $column.htmlType == "radio" || $column.htmlType == "checkbox")
-                    <Form.Item label="${comment}" name="${javaField}">
+                    <FormItem label="${comment}" name="${javaField}">
                       <Select
                           v-model:value="queryParams.${javaField}"
                           placeholder="请选择${comment}"
@@ -278,10 +290,10 @@ onMounted(() => {
                             <SelectOption label="请选择字典生成" value="" />
                           #end
                       </Select>
-                    </Form.Item>
+                    </FormItem>
                   #elseif($column.htmlType == "datetime")
                       #if ($column.listOperationCondition != "BETWEEN")## 非范围
-                        <Form.Item label="${comment}" name="${javaField}">
+                        <FormItem label="${comment}" name="${javaField}">
                           <DatePicker
                               v-model:value="queryParams.${javaField}"
                               valueFormat="YYYY-MM-DD"
@@ -289,25 +301,25 @@ onMounted(() => {
                               allowClear
                                class="w-full"
                           />
-                        </Form.Item>
+                        </FormItem>
                       #else## 范围
-                        <Form.Item label="${comment}" name="${javaField}">
+                        <FormItem label="${comment}" name="${javaField}">
                           <RangePicker
                               v-model:value="queryParams.${javaField}"
                               v-bind="getRangePickerDefaultProps()"
                               class="w-full"
                           />
-                        </Form.Item>
+                        </FormItem>
                       #end
                   #end
               #end
           #end
-        <Form.Item>
+        <FormItem>
           <Button class="ml-2" @click="resetQuery"> 重置 </Button>
           <Button class="ml-2" @click="handleQuery" type="primary">
             搜索
           </Button>
-        </Form.Item>
+        </FormItem>
       </Form>
     </Card>
 
diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/form_sub_erp.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/form_sub_erp.vue.vm
index 0cb89f4..38c8808 100644
--- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/form_sub_erp.vue.vm
+++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/form_sub_erp.vue.vm
@@ -2,8 +2,14 @@
 #set ($subColumns = $subColumnsList.get($subIndex))##当前字段数组
 #set ($subJoinColumn = $subJoinColumns.get($subIndex))##当前 join 字段
 #set ($subSimpleClassName = $subSimpleClassNames.get($subIndex))
+#set ($selectOptionEnable = false)
+#foreach ($column in $subColumns)
+  #if (($column.createOperation || $column.updateOperation) && $column.htmlType == "select")
+    #set ($selectOptionEnable = true)
+  #end
+#end
 <script lang="ts" setup>
-import type { Rule } from 'antdv-next/es/form';
+import type { Rule } from 'antdv-next';
 import type { ${simpleClassName}Api } from '#/api/${table.moduleName}/${table.businessName}';
 
 import { computed, ref } from 'vue';
@@ -13,7 +19,7 @@ import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 import { Tinymce as RichTextarea } from '#/components/tinymce';
 import { ImageUpload, FileUpload } from "#/components/upload";
-import { message, Tabs, Form, Input, TextArea, Select, RadioGroup, Radio, CheckboxGroup, Checkbox, DatePicker, TreeSelect } from 'antdv-next';
+import { Checkbox, CheckboxGroup, DatePicker, Form, FormItem, Input, message, Radio, RadioGroup, Select#if ($selectOptionEnable), SelectOption#end, TextArea, TreeSelect } from 'antdv-next';
 
 import { $t } from '#/locales';
 
@@ -130,23 +136,23 @@ function resetForm(){
             #set ($dictMethod = "boolean")
           #end
           #if ($column.htmlType == "input" && !$column.primaryKey)## 忽略主键，不用在表单里
-            <Form.Item label="${comment}" name="${javaField}">
+            <FormItem label="${comment}" name="${javaField}">
               <Input v-model:value="formData.${javaField}" placeholder="请输入${comment}" />
-            </Form.Item>
+            </FormItem>
           #elseif($column.htmlType == "imageUpload")## 图片上传
-            <Form.Item label="${comment}" name="${javaField}">
+            <FormItem label="${comment}" name="${javaField}">
               <ImageUpload v-model:value="formData.${javaField}" />
-            </Form.Item>
+            </FormItem>
           #elseif($column.htmlType == "fileUpload")## 文件上传
-            <Form.Item label="${comment}" name="${javaField}">
+            <FormItem label="${comment}" name="${javaField}">
               <FileUpload v-model:value="formData.${javaField}" />
-            </Form.Item>
+            </FormItem>
           #elseif($column.htmlType == "editor")## 文本编辑器
-            <Form.Item label="${comment}" name="${javaField}">
+            <FormItem label="${comment}" name="${javaField}">
               <RichTextarea v-model="formData.${javaField}" height="500px" />
-            </Form.Item>
+            </FormItem>
           #elseif($column.htmlType == "select")## 下拉框
-            <Form.Item label="${comment}" name="${javaField}">
+            <FormItem label="${comment}" name="${javaField}">
               <Select v-model:value="formData.${javaField}" placeholder="请选择${comment}">
                 #if ("" != $dictType)## 有数据字典
                   <SelectOption
@@ -160,9 +166,9 @@ function resetForm(){
                   <SelectOption label="请选择字典生成" value="" />
                 #end
               </Select>
-            </Form.Item>
+            </FormItem>
           #elseif($column.htmlType == "checkbox")## 多选框
-            <Form.Item label="${comment}" name="${javaField}">
+            <FormItem label="${comment}" name="${javaField}">
               <CheckboxGroup v-model:value="formData.${javaField}">
                 #if ("" != $dictType)## 有数据字典
                   <Checkbox
@@ -176,9 +182,9 @@ function resetForm(){
                   <Checkbox label="请选择字典生成" />
                 #end
               </CheckboxGroup>
-            </Form.Item>
+            </FormItem>
           #elseif($column.htmlType == "radio")## 单选框
-            <Form.Item label="${comment}" name="${javaField}">
+            <FormItem label="${comment}" name="${javaField}">
               <RadioGroup v-model:value="formData.${javaField}">
                 #if ("" != $dictType)## 有数据字典
                   <Radio
@@ -192,19 +198,19 @@ function resetForm(){
                   <Radio value="1">请选择字典生成</Radio>
                 #end
               </RadioGroup>
-            </Form.Item>
+            </FormItem>
           #elseif($column.htmlType == "datetime")## 时间框
-            <Form.Item label="${comment}" name="${javaField}">
+            <FormItem label="${comment}" name="${javaField}">
               <DatePicker
                       v-model:value="formData.${javaField}"
                       valueFormat="x"
                       placeholder="选择${comment}"
               />
-            </Form.Item>
+            </FormItem>
           #elseif($column.htmlType == "textarea")## 文本框
-            <Form.Item label="${comment}" name="${javaField}">
+            <FormItem label="${comment}" name="${javaField}">
               <TextArea v-model:value="formData.${javaField}" placeholder="请输入${comment}" />
-            </Form.Item>
+            </FormItem>
           #end
         #end
       #end
diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/form_sub_inner.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/form_sub_inner.vue.vm
index 7f0ec3a..28a8bb3 100644
--- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/form_sub_inner.vue.vm
+++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/form_sub_inner.vue.vm
@@ -1,2 +1,2 @@
 ## 主表的 normal 和 inner 使用相同的 form 表单
-#parse("codegen/vue3_vben5_antd/general/views/modules/form_sub_normal.vue.vm")
\ No newline at end of file
+#parse("codegen/vue3_vben5_antdv_next/general/views/modules/form_sub_normal.vue.vm")
diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/form_sub_normal.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/form_sub_normal.vue.vm
index e788e4c..85d226b 100644
--- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/form_sub_normal.vue.vm
+++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/form_sub_normal.vue.vm
@@ -4,6 +4,12 @@
 #set ($subSimpleClassName = $subSimpleClassNames.get($subIndex))
 #set ($subClassNameVar = $subClassNameVars.get($subIndex))
 #set ($SubJoinColumnName = $subJoinColumn.javaField.substring(0,1).toUpperCase() + ${subJoinColumn.javaField.substring(1)})##首字母大写
+#set ($selectOptionEnable = false)
+#foreach ($column in $subColumns)
+  #if (($column.createOperation || $column.updateOperation) && (!$subTable.subJoinMany || $column.id != $subJoinColumn.id) && $column.htmlType == "select")
+    #set ($selectOptionEnable = true)
+  #end
+#end
 <script lang="ts" setup>
 import type { ${simpleClassName}Api } from '#/api/${table.moduleName}/${table.businessName}';
 
@@ -12,7 +18,7 @@ import { computed, ref, h, onMounted, watch, nextTick } from 'vue';
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
-import { message, Tabs, Form, Input, TextArea, Button, Select, RadioGroup, Radio, CheckboxGroup, Checkbox, DatePicker } from 'antdv-next';
+import { Button, Checkbox, CheckboxGroup, DatePicker#if (!$subTable.subJoinMany), Form, FormItem#end, Input, Radio, RadioGroup, Select#if ($selectOptionEnable), SelectOption#end, TextArea } from 'antdv-next';
 import { $t } from '#/locales';
 
 #if ($subTable.subJoinMany) ## 一对多
@@ -22,7 +28,7 @@ import { VxeColumn, VxeTable } from '#/adapter/vxe-table';
 import { ImageUpload, FileUpload } from "#/components/upload";
 import { get${subSimpleClassName}ListBy${SubJoinColumnName} } from '#/api/${table.moduleName}/${table.businessName}';
 #else
-import type { Rule } from 'antdv-next/es/form';
+import type { Rule } from 'antdv-next';
 import { Tinymce as RichTextarea } from '#/components/tinymce';
 import { ImageUpload, FileUpload } from "#/components/upload";
 import { get${subSimpleClassName}By${SubJoinColumnName} } from '#/api/${table.moduleName}/${table.businessName}';
@@ -264,23 +270,23 @@ watch(
                   #set ($dictMethod = "boolean")
               #end
               #if ($column.htmlType == "input" && !$column.primaryKey)## 忽略主键，不用在表单里
-                <Form.Item label="${comment}" name="${javaField}">
+                <FormItem label="${comment}" name="${javaField}">
                   <Input v-model:value="formData.${javaField}" placeholder="请输入${comment}" />
-                </Form.Item>
+                </FormItem>
               #elseif($column.htmlType == "imageUpload")## 图片上传
-                <Form.Item label="${comment}" name="${javaField}">
+                <FormItem label="${comment}" name="${javaField}">
                   <ImageUpload v-model:value="formData.${javaField}" />
-                </Form.Item>
+                </FormItem>
               #elseif($column.htmlType == "fileUpload")## 文件上传
-                <Form.Item label="${comment}" name="${javaField}">
+                <FormItem label="${comment}" name="${javaField}">
                   <FileUpload v-model:value="formData.${javaField}" />
-                </Form.Item>
+                </FormItem>
               #elseif($column.htmlType == "editor")## 文本编辑器
-                <Form.Item label="${comment}" name="${javaField}">
+                <FormItem label="${comment}" name="${javaField}">
                   <RichTextarea v-model="formData.${javaField}" height="500px" />
-                </Form.Item>
+                </FormItem>
               #elseif($column.htmlType == "select")## 下拉框
-                <Form.Item label="${comment}" name="${javaField}">
+                <FormItem label="${comment}" name="${javaField}">
                   <Select v-model:value="formData.${javaField}" placeholder="请选择${comment}">
                       #if ("" != $dictType)## 有数据字典
                         <SelectOption
@@ -294,9 +300,9 @@ watch(
                         <SelectOption label="请选择字典生成" value="" />
                       #end
                   </Select>
-                </Form.Item>
+                </FormItem>
               #elseif($column.htmlType == "checkbox")## 多选框
-                <Form.Item label="${comment}" name="${javaField}">
+                <FormItem label="${comment}" name="${javaField}">
                   <CheckboxGroup v-model:value="formData.${javaField}">
                       #if ("" != $dictType)## 有数据字典
                         <Checkbox
@@ -310,9 +316,9 @@ watch(
                         <Checkbox label="请选择字典生成" />
                       #end
                   </CheckboxGroup>
-                </Form.Item>
+                </FormItem>
               #elseif($column.htmlType == "radio")## 单选框
-                <Form.Item label="${comment}" name="${javaField}">
+                <FormItem label="${comment}" name="${javaField}">
                   <RadioGroup v-model:value="formData.${javaField}">
                       #if ("" != $dictType)## 有数据字典
                         <Radio
@@ -326,19 +332,19 @@ watch(
                         <Radio value="1">请选择字典生成</Radio>
                       #end
                   </RadioGroup>
-                </Form.Item>
+                </FormItem>
               #elseif($column.htmlType == "datetime")## 时间框
-                <Form.Item label="${comment}" name="${javaField}">
+                <FormItem label="${comment}" name="${javaField}">
                   <DatePicker
                       v-model:value="formData.${javaField}"
                       valueFormat="x"
                       placeholder="选择${comment}"
                   />
-                </Form.Item>
+                </FormItem>
               #elseif($column.htmlType == "textarea")## 文本框
-                <Form.Item label="${comment}" name="${javaField}">
+                <FormItem label="${comment}" name="${javaField}">
                   <TextArea v-model:value="formData.${javaField}" placeholder="请输入${comment}" />
-                </Form.Item>
+                </FormItem>
               #end
           #end
       #end
diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/list_sub_erp.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/list_sub_erp.vue.vm
index 239aa26..42a276d 100644
--- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/list_sub_erp.vue.vm
+++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/list_sub_erp.vue.vm
@@ -5,6 +5,16 @@
 #set ($subJoinColumn = $subJoinColumns.get($subIndex))##当前 join 字段
 #set ($subSimpleClassName_strikeCase = $subSimpleClassName_strikeCases.get($subIndex))
 #set ($SubJoinColumnName = $subJoinColumn.javaField.substring(0,1).toUpperCase() + ${subJoinColumn.javaField.substring(1)})##首字母大写
+#set ($rangePickerEnable = false)
+#set ($selectOptionEnable = false)
+#foreach ($column in $subColumns)
+  #if ($column.listOperation && $column.htmlType == "datetime" && $column.listOperationCondition == "BETWEEN")
+    #set ($rangePickerEnable = true)
+  #end
+  #if ($column.listOperation && ($column.htmlType == "select" || $column.htmlType == "radio" || $column.htmlType == "checkbox"))
+    #set ($selectOptionEnable = true)
+  #end
+#end
 <script lang="ts" setup>
 import type { ${simpleClassName}Api } from '#/api/${table.moduleName}/${table.businessName}';
 import type { VxeTableInstance } from '#/adapter/vxe-table';
@@ -15,7 +25,9 @@ import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { DictTag } from '#/components/dict-tag';
+#if ($table.templateType == 11 && $rangePickerEnable)
 import { getRangePickerDefaultProps } from '#/utils/rangePickerProps';
+#end
 import { VxeColumn, VxeTable } from '#/adapter/vxe-table';
 import { formatDateTime } from '@vben/utils';
 
@@ -25,7 +37,7 @@ import { useTableToolbar, VbenVxeTableToolbar } from '@vben/plugins/vxe-table';
 import ${subSimpleClassName}Form from './${subSimpleClassName_strikeCase}-form.vue'
 import { Tinymce as RichTextarea } from '#/components/tinymce';
 import { ImageUpload, FileUpload } from "#/components/upload";
-import { message, Button, Card, Tabs, Pagination, Form, Input, TextArea, Select, RadioGroup, Radio, CheckboxGroup, Checkbox, RangePicker, DatePicker, TreeSelect } from 'antdv-next';
+import { Button, Card, Checkbox, CheckboxGroup, DatePicker, Form, FormItem, Input, message, Pagination, Radio, RadioGroup#if ($rangePickerEnable), DateRangePicker as RangePicker#end, Select#if ($selectOptionEnable), SelectOption#end, TextArea, TreeSelect } from 'antdv-next';
 import { Plus, Trash2 } from '@vben/icons';
 import { $t } from '#/locales';
 #end
@@ -224,7 +236,7 @@ onMounted(() => {
                           #set ($dictMethod = "boolean")
                       #end
                       #if ($column.htmlType == "input")
-                        <Form.Item label="${comment}" name="${javaField}">
+                        <FormItem label="${comment}" name="${javaField}">
                           <Input
                               v-model:value="queryParams.${javaField}"
                               placeholder="请输入${comment}"
@@ -232,9 +244,9 @@ onMounted(() => {
                               @pressEnter="handleQuery"
                               class="w-full"
                           />
-                        </Form.Item>
+                        </FormItem>
                       #elseif ($column.htmlType == "select" || $column.htmlType == "radio" || $column.htmlType == "checkbox")
-                        <Form.Item label="${comment}" name="${javaField}">
+                        <FormItem label="${comment}" name="${javaField}">
                           <Select
                               v-model:value="queryParams.${javaField}"
                               placeholder="请选择${comment}"
@@ -253,10 +265,10 @@ onMounted(() => {
                                 <SelectOption label="请选择字典生成" value="" />
                               #end
                           </Select>
-                        </Form.Item>
+                        </FormItem>
                       #elseif($column.htmlType == "datetime")
                           #if ($column.listOperationCondition != "BETWEEN")## 非范围
-                            <Form.Item label="${comment}" name="${javaField}">
+                            <FormItem label="${comment}" name="${javaField}">
                               <DatePicker
                                   v-model:value="queryParams.${javaField}"
                                   valueFormat="YYYY-MM-DD"
@@ -264,25 +276,25 @@ onMounted(() => {
                                   allowClear
                                   class="w-full"
                               />
-                            </Form.Item>
+                            </FormItem>
                           #else## 范围
-                            <Form.Item label="${comment}" name="${javaField}">
+                            <FormItem label="${comment}" name="${javaField}">
                               <RangePicker
                                   v-model:value="queryParams.${javaField}"
                                   v-bind="getRangePickerDefaultProps()"
                                   class="w-full"
                               />
-                            </Form.Item>
+                            </FormItem>
                           #end
                       #end
                   #end
               #end
-            <Form.Item>
+            <FormItem>
               <Button class="ml-2" @click="resetQuery"> 重置 </Button>
               <Button class="ml-2" @click="handleQuery" type="primary">
                 搜索
               </Button>
-            </Form.Item>
+            </FormItem>
           </Form>
         </Card>
 
diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/list_sub_inner.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/list_sub_inner.vue.vm
index d46037b..5235f66 100644
--- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/list_sub_inner.vue.vm
+++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/general/views/modules/list_sub_inner.vue.vm
@@ -1,4 +1,4 @@
 ## 子表的 erp 和 inner 使用相似的 list 列表，差异主要两点：
 ## 1）inner 使用 list 不分页，erp 使用 page 分页
 ## 2）erp 支持单个子表的新增、修改、删除，inner 不支持
-#parse("codegen/vue3_vben5_antd/general/views/modules/list_sub_erp.vue.vm")
\ No newline at end of file
+#parse("codegen/vue3_vben5_antdv_next/general/views/modules/list_sub_erp.vue.vm")
diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/form.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/form.vue.vm
index d140f23..28e73ef 100644
--- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/form.vue.vm
+++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/form.vue.vm
@@ -6,7 +6,7 @@ import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 
-import { message#if ($table.templateType == 11), Tabs#end } from 'antdv-next';
+import { message#if ($table.templateType == 10 || $table.templateType == 12), TabPane, Tabs#end } from 'antdv-next';
 
 import { useVbenForm } from '#/adapter/form';
 import { create${simpleClassName}, get${simpleClassName}, update${simpleClassName} } from '#/api/${table.moduleName}/${table.businessName}';
diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/import.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/import.vue.vm
index e8f90fd..bc2f971 100644
--- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/import.vue.vm
+++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/import.vue.vm
@@ -1,6 +1,4 @@
 <script lang="ts" setup>
-import type { FileType } from 'antdv-next/es/upload/interface';
-
 import { useVbenModal } from '@vben/common-ui';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
@@ -46,7 +44,7 @@ const [Modal, modalApi] = useVbenModal({
 });
 
 /** 上传前 */
-function beforeUpload(file: FileType) {
+function beforeUpload(file: File) {
   formApi.setFieldValue('file', file);
   return false;
 }
diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/index.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/index.vue.vm
index 071ecd1..f5ca471 100644
--- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/index.vue.vm
+++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/index.vue.vm
@@ -8,7 +8,7 @@ import { ref } from 'vue';
 import {#if ($table.templateType != 2 && $deleteBatchEnable) confirm,#end Page, useVbenModal } from '@vben/common-ui';
 import { downloadFileFromBlobPart#if ($table.templateType != 2 && $deleteBatchEnable), isEmpty#end } from '@vben/utils';
 
-import { message#if ($table.templateType == 11), Tabs#end } from 'antdv-next';
+import { message#if ($table.templateType == 11 || $table.templateType == 12), TabPane, Tabs#end } from 'antdv-next';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 #if (${table.templateType} == 2)## 树表接口
diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/modules/form_sub_inner.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/modules/form_sub_inner.vue.vm
index 2c59695..e94042f 100644
--- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/modules/form_sub_inner.vue.vm
+++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/modules/form_sub_inner.vue.vm
@@ -1,2 +1,2 @@
 ## 主表的 normal 和 inner 使用相同的 form 表单
-#parse("codegen/vue3_vben5_antd/schema/views/modules/form_sub_normal.vue.vm")
\ No newline at end of file
+#parse("codegen/vue3_vben5_antdv_next/schema/views/modules/form_sub_normal.vue.vm")
diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/modules/form_sub_normal.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/modules/form_sub_normal.vue.vm
index f74b03c..d8c36f6 100644
--- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/modules/form_sub_normal.vue.vm
+++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/modules/form_sub_normal.vue.vm
@@ -5,6 +5,12 @@
 #set ($subClassNameVar = $subClassNameVars.get($subIndex))
 #set ($SubJoinColumnName = $subJoinColumn.javaField.substring(0,1).toUpperCase() + ${subJoinColumn.javaField.substring(1)})##首字母大写
 #set ($apiName = "${table.moduleName.substring(0,1).toUpperCase()}${table.moduleName.substring(1)}${simpleClassName}Api")
+#set ($selectOptionEnable = false)
+#foreach ($column in $subColumns)
+  #if (($column.createOperation || $column.updateOperation) && $column.id != $subJoinColumn.id && $column.htmlType == "select")
+    #set ($selectOptionEnable = true)
+  #end
+#end
 <script lang="ts" setup>
   import type { ${apiName} } from '#/api/${table.moduleName}/${table.businessName}';
 
@@ -14,7 +20,19 @@
 
 #if ($subTable.subJoinMany) ## 一对多
 import { Plus } from "@vben/icons";
-import { Button, Tabs, Checkbox, Input, TextArea, Select,RadioGroup,CheckboxGroup, DatePicker } from 'antdv-next';
+import {
+  Button,
+  Checkbox,
+  CheckboxGroup,
+  DatePicker,
+  Input,
+  RadioGroup,
+  Select,
+#if ($selectOptionEnable)
+  SelectOption,
+#end
+  TextArea,
+} from 'antdv-next';
 import { ImageUpload, FileUpload } from "#/components/upload";
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { use${subSimpleClassName}GridEditColumns } from '../data';
diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/modules/list_sub_inner.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/modules/list_sub_inner.vue.vm
index 2d8aa20..dfcdb0f 100644
--- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/modules/list_sub_inner.vue.vm
+++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antdv_next/schema/views/modules/list_sub_inner.vue.vm
@@ -1,4 +1,4 @@
 ## 子表的 erp 和 inner 使用相似的 list 列表，差异主要两点：
 ## 1）inner 使用 list 不分页，erp 使用 page 分页
 ## 2）erp 支持单个子表的新增、修改、删除，inner 不支持
-#parse("codegen/vue3_vben5_antd/schema/views/modules/list_sub_erp.vue.vm")
\ No newline at end of file
+#parse("codegen/vue3_vben5_antdv_next/schema/views/modules/list_sub_erp.vue.vm")
diff --git a/yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVben5AntdvNextTest.java b/yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVben5AntdvNextTest.java
new file mode 100644
index 0000000..c469204
--- /dev/null
+++ b/yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVben5AntdvNextTest.java
@@ -0,0 +1,422 @@
+package cn.iocoder.yudao.module.infra.service.codegen.inner;
+
+import cn.hutool.core.io.resource.ResourceUtil;
+import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenColumnDO;
+import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenTableDO;
+import cn.iocoder.yudao.module.infra.enums.codegen.CodegenFrontTypeEnum;
+import cn.iocoder.yudao.module.infra.enums.codegen.CodegenTemplateTypeEnum;
+import com.baomidou.mybatisplus.annotation.DbType;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * {@link CodegenEngine} 的 Vue3 + Vben5 + Antdv Next 单元测试
+ *
+ * @author 芋道源码
+ */
+public class CodegenEngineVben5AntdvNextTest extends CodegenEngineAbstractTest {
+
+    private static final Pattern ANTDV_NEXT_VALUE_IMPORT_PATTERN = Pattern.compile(
+            "import\\s*\\{([^}]*)}\\s*from\\s*'antdv-next';?", Pattern.DOTALL);
+    private static final Pattern RANGE_PICKER_COMPONENT_PATTERN = Pattern.compile("<RangePicker\\b");
+    private static final Pattern RANGE_PICKER_HELPER_BINDING_PATTERN = Pattern.compile(
+            "\\bv-bind\\s*=\\s*([\"'])\\s*getRangePickerDefaultProps\\s*\\(\\s*\\)\\s*\\1");
+    private static final Pattern RANGE_PICKER_HELPER_CALL_PATTERN = Pattern.compile(
+            "\\bgetRangePickerDefaultProps\\s*\\(\\s*\\)");
+    private static final Pattern RANGE_PICKER_HELPER_IMPORT_PATTERN = Pattern.compile(
+            "import\\s*\\{[^}]*\\bgetRangePickerDefaultProps\\b[^}]*}"
+                    + "\\s*from\\s*'#/utils(?:/rangePickerProps)?';?", Pattern.DOTALL);
+    private static final Pattern SCHEMA_RANGE_PICKER_COMPONENT_PATTERN = Pattern.compile(
+            "\\bcomponent\\s*:\\s*([\"'])RangePicker\\1");
+    private static final Pattern SCHEMA_RANGE_PICKER_HELPER_SPREAD_PATTERN = Pattern.compile(
+            "\\.\\.\\.\\s*getRangePickerDefaultProps\\s*\\(\\s*\\)");
+
+    private static final String IMPORT_FORM_PATH =
+            "yudao-ui-admin-vben/src/views/infra/demo/modules/import-form.vue";
+    private static final String SCHEMA_DATA_PATH =
+            "yudao-ui-admin-vben/src/views/infra/demo/data.ts";
+    private static final String STUDENT_CONTACT_FORM_PATH =
+            "yudao-ui-admin-vben/src/views/infra/demo/modules/student-contact-form.vue";
+    private static final String STUDENT_TEACHER_FORM_PATH =
+            "yudao-ui-admin-vben/src/views/infra/demo/modules/student-teacher-form.vue";
+
+    private static final List<String> INNER_TEMPLATE_PATHS = Arrays.asList(
+            "codegen/vue3_vben5_antdv_next/general/views/modules/form_sub_inner.vue.vm",
+            "codegen/vue3_vben5_antdv_next/general/views/modules/list_sub_inner.vue.vm",
+            "codegen/vue3_vben5_antdv_next/schema/views/modules/form_sub_inner.vue.vm",
+            "codegen/vue3_vben5_antdv_next/schema/views/modules/list_sub_inner.vue.vm");
+
+    @Test
+    public void testExecute_schemaMasterNormal() {
+        // 调用
+        Map<String, String> result = executeMaster(CodegenFrontTypeEnum.VUE3_VBEN5_ANTDV_NEXT_SCHEMA.getType(),
+                CodegenTemplateTypeEnum.MASTER_NORMAL);
+
+        // 断言
+        assertGeneratedCodeCompatibleWithAntdvNext(result);
+        assertSchemaRangePickerGenerated(result);
+        assertTabsGenerated(result);
+    }
+
+    @Test
+    public void testExecute_schemaMasterErp() {
+        // 调用
+        Map<String, String> result = executeMaster(CodegenFrontTypeEnum.VUE3_VBEN5_ANTDV_NEXT_SCHEMA.getType(),
+                CodegenTemplateTypeEnum.MASTER_ERP);
+
+        // 断言
+        assertGeneratedCodeCompatibleWithAntdvNext(result);
+        assertSchemaRangePickerGenerated(result);
+        assertTabsGenerated(result);
+    }
+
+    @Test
+    public void testExecute_schemaMasterInner() {
+        // 调用
+        Map<String, String> result = executeMaster(CodegenFrontTypeEnum.VUE3_VBEN5_ANTDV_NEXT_SCHEMA.getType(),
+                CodegenTemplateTypeEnum.MASTER_INNER);
+
+        // 断言
+        assertGeneratedCodeCompatibleWithAntdvNext(result);
+        assertSchemaRangePickerGenerated(result);
+        assertTabsGenerated(result);
+    }
+
+    @Test
+    public void testExecute_generalTree() {
+        // 调用
+        Map<String, String> result = executeTree(CodegenFrontTypeEnum.VUE3_VBEN5_ANTDV_NEXT_GENERAL.getType());
+
+        // 断言
+        assertGeneratedCodeCompatibleWithAntdvNext(result);
+        assertRuleGenerated(result);
+        assertComponentGenerated(result, "FormItem");
+        assertComponentGenerated(result, "TreeSelect");
+    }
+
+    @Test
+    public void testExecute_generalMasterNormal() {
+        // 调用
+        Map<String, String> result = executeMaster(CodegenFrontTypeEnum.VUE3_VBEN5_ANTDV_NEXT_GENERAL.getType(),
+                CodegenTemplateTypeEnum.MASTER_NORMAL);
+
+        // 断言
+        assertGeneratedCodeCompatibleWithAntdvNext(result);
+        assertRuleGenerated(result);
+        assertGeneralCrudComponentsGenerated(result);
+        assertTabsGenerated(result);
+    }
+
+    @Test
+    public void testExecute_generalMasterNormal_oneToOneJoinColumnOnlySelect() {
+        // 调用
+        Map<String, String> result = executeGeneralMasterNormalWithOneToOneJoinSelect();
+
+        // 断言
+        assertGeneratedCodeCompatibleWithAntdvNext(result);
+        String content = result.get(STUDENT_TEACHER_FORM_PATH);
+        assertNotNull(content, STUDENT_TEACHER_FORM_PATH + "：未生成一对一子表表单");
+        assertTrue(content.contains("<Select v-model:value=\"formData.studentId\""),
+                STUDENT_TEACHER_FORM_PATH + "：应渲染 join 列的 Select 组件");
+        assertTrue(content.contains("<SelectOption"), STUDENT_TEACHER_FORM_PATH + "：应渲染 SelectOption 组件");
+        assertRootValueImport(STUDENT_TEACHER_FORM_PATH, content, "\\bSelectOption\\b");
+    }
+
+    @Test
+    public void testExecute_generalMasterNormal_oneToManyJoinColumnOnlySelect() {
+        // 调用
+        Map<String, String> result = executeGeneralMasterNormalWithOneToManyJoinSelect();
+
+        // 断言
+        assertGeneratedCodeCompatibleWithAntdvNext(result);
+        String content = result.get(STUDENT_CONTACT_FORM_PATH);
+        assertNotNull(content, STUDENT_CONTACT_FORM_PATH + "：未生成一对多子表表单");
+        assertTrue(content.contains("<VxeTable"), STUDENT_CONTACT_FORM_PATH + "：应生成一对多子表表格");
+        assertFalse(content.contains("<VxeColumn field=\"studentId\""),
+                STUDENT_CONTACT_FORM_PATH + "：不应生成 join 列");
+        assertFalse(content.contains("<Select v-model:value=\"row.studentId\""),
+                STUDENT_CONTACT_FORM_PATH + "：不应渲染 join 列的 Select 组件");
+        assertFalse(content.contains("<SelectOption"), STUDENT_CONTACT_FORM_PATH + "：不应渲染 SelectOption 组件");
+        assertFalse(createRootImportPattern("import\\s*\\{", "\\bSelectOption\\b").matcher(content).find(),
+                STUDENT_CONTACT_FORM_PATH + "：不应导入 SelectOption 组件");
+    }
+
+    @Test
+    public void testExecute_generalMasterInner() {
+        // 调用
+        Map<String, String> result = executeMaster(CodegenFrontTypeEnum.VUE3_VBEN5_ANTDV_NEXT_GENERAL.getType(),
+                CodegenTemplateTypeEnum.MASTER_INNER);
+
+        // 断言
+        assertGeneratedCodeCompatibleWithAntdvNext(result);
+        assertRuleGenerated(result);
+        assertGeneralCrudComponentsGenerated(result);
+        assertTabsGenerated(result);
+    }
+
+    @Test
+    public void testExecute_generalMasterErp() {
+        // 调用
+        Map<String, String> result = executeMaster(CodegenFrontTypeEnum.VUE3_VBEN5_ANTDV_NEXT_GENERAL.getType(),
+                CodegenTemplateTypeEnum.MASTER_ERP);
+
+        // 断言
+        assertGeneratedCodeCompatibleWithAntdvNext(result);
+        assertRuleGenerated(result);
+        assertGeneralCrudComponentsGenerated(result);
+        assertTabsGenerated(result);
+    }
+
+    @Test
+    public void testExecute_oneImportEnable() {
+        // 开启 import 开关
+        codegenProperties.setImportEnable(true);
+        codegenEngine.initGlobalBindingMap();
+
+        // 调用并断言
+        assertImportFormCompatibleWithAntdvNext(
+                executeOne(CodegenFrontTypeEnum.VUE3_VBEN5_ANTDV_NEXT_SCHEMA.getType()));
+        assertImportFormCompatibleWithAntdvNext(
+                executeOne(CodegenFrontTypeEnum.VUE3_VBEN5_ANTDV_NEXT_GENERAL.getType()));
+    }
+
+    @Test
+    public void testInnerTemplatesParseAntdvNext() {
+        INNER_TEMPLATE_PATHS.forEach(path -> {
+            String template = ResourceUtil.readUtf8Str(path);
+            assertFalse(template.contains("codegen/vue3_vben5_antd/"), path + "：不应引用 Ant Design Vue 模板");
+            assertTrue(template.contains("codegen/vue3_vben5_antdv_next/"), path + "：应引用 Antdv Next 模板");
+        });
+    }
+
+    private Map<String, String> executeOne(Integer frontType) {
+        CodegenTableDO table = getTable("student")
+                .setFrontType(frontType)
+                .setTemplateType(CodegenTemplateTypeEnum.ONE.getType());
+        return codegenEngine.execute(DbType.MYSQL, table, getColumnList("student"), null, null);
+    }
+
+    private Map<String, String> executeTree(Integer frontType) {
+        CodegenTableDO table = getTable("category")
+                .setFrontType(frontType)
+                .setTemplateType(CodegenTemplateTypeEnum.TREE.getType());
+        return codegenEngine.execute(DbType.MYSQL, table, getColumnList("category"), null, null);
+    }
+
+    private Map<String, String> executeGeneralMasterNormalWithOneToOneJoinSelect() {
+        return executeGeneralMasterNormalWithJoinSelect("teacher", 200L, false);
+    }
+
+    private Map<String, String> executeGeneralMasterNormalWithOneToManyJoinSelect() {
+        return executeGeneralMasterNormalWithJoinSelect("contact", 100L, true);
+    }
+
+    private Map<String, String> executeGeneralMasterNormalWithJoinSelect(String subTableName,
+                                                                         Long subJoinColumnId,
+                                                                         boolean subJoinMany) {
+        CodegenTableDO table = getTable("student")
+                .setFrontType(CodegenFrontTypeEnum.VUE3_VBEN5_ANTDV_NEXT_GENERAL.getType())
+                .setTemplateType(CodegenTemplateTypeEnum.MASTER_NORMAL.getType());
+        CodegenTableDO subTable = getTable(subTableName)
+                .setTemplateType(CodegenTemplateTypeEnum.SUB.getType())
+                .setFrontType(CodegenFrontTypeEnum.VUE3_VBEN5_ANTDV_NEXT_GENERAL.getType())
+                .setSubJoinColumnId(subJoinColumnId).setSubJoinMany(subJoinMany);
+        List<CodegenColumnDO> subColumns = getColumnList(subTableName);
+        // 稀疏场景：join 列是唯一的 select，避免其它 select 掩盖 join 列对导入判定的影响。
+        subColumns.forEach(column -> {
+            if (subJoinColumnId.equals(column.getId())) {
+                column.setHtmlType("select");
+                column.setDictType("");
+            } else if ("select".equals(column.getHtmlType())) {
+                column.setHtmlType("input");
+            }
+        });
+        return codegenEngine.execute(DbType.MYSQL, table, getColumnList("student"),
+                List.of(subTable), List.of(subColumns));
+    }
+
+    private Map<String, String> executeMaster(Integer frontType, CodegenTemplateTypeEnum templateType) {
+        // 准备参数
+        CodegenTableDO table = getTable("student")
+                .setFrontType(frontType)
+                .setTemplateType(templateType.getType());
+        List<CodegenColumnDO> columns = getColumnList("student");
+        // 准备参数（子表）
+        CodegenTableDO contactTable = getTable("contact")
+                .setTemplateType(CodegenTemplateTypeEnum.SUB.getType())
+                .setFrontType(frontType)
+                .setSubJoinColumnId(100L).setSubJoinMany(true);
+        List<CodegenColumnDO> contactColumns = getColumnList("contact");
+        // 准备参数（班主任）
+        CodegenTableDO teacherTable = getTable("teacher")
+                .setTemplateType(CodegenTemplateTypeEnum.SUB.getType())
+                .setFrontType(frontType)
+                .setSubJoinColumnId(200L).setSubJoinMany(false);
+        List<CodegenColumnDO> teacherColumns = getColumnList("teacher");
+
+        // 调用
+        return codegenEngine.execute(DbType.MYSQL, table, columns,
+                Arrays.asList(contactTable, teacherTable), Arrays.asList(contactColumns, teacherColumns));
+    }
+
+    private static void assertGeneratedCodeCompatibleWithAntdvNext(Map<String, String> result) {
+        assertTrue(result.values().stream().anyMatch(content -> content.contains("from 'antdv-next")),
+                "生成结果应使用 antdv-next");
+        result.forEach((filePath, content) -> {
+            assertFalse(content.contains("ant-design-vue"), filePath + "：不应使用 ant-design-vue");
+            assertFalse(content.contains("antdv-next/es/"), filePath + "：不应使用未导出的 antdv-next 深层路径");
+            assertFalse(content.contains("<Form.Item"), filePath + "：不应使用 Form.Item");
+            assertFalse(content.contains("</Form.Item>"), filePath + "：不应使用 Form.Item");
+            assertRootValueImportsSorted(filePath, content);
+            assertRootValueImportMatchesUsage(filePath, content,
+                    "\\bDateRangePicker\\s+as\\s+RangePicker\\b", "<RangePicker\\b", "RangePicker");
+            assertRootValueImportMatchesUsage(filePath, content,
+                    "\\bFormItem\\b", "<FormItem\\b", "FormItem");
+            assertRootValueImportMatchesUsage(filePath, content,
+                    "\\bSelectOption\\b", "<SelectOption\\b", "SelectOption");
+            assertRootValueImportMatchesUsage(filePath, content,
+                    "\\bTabPane\\b", "<TabPane\\b", "TabPane");
+            assertRootValueImportMatchesUsage(filePath, content,
+                    "\\bTabs\\b", "<Tabs\\b", "Tabs");
+            assertRootTypeImportMatchesUsage(filePath, content,
+                    "\\bRule\\b", "\\bRule\\b", "Rule");
+            assertRangePickerHelperImportMatchesUsage(filePath, content);
+            if (filePath.endsWith(".vue")) {
+                assertRangePickerHelperBindingMatchesComponent(filePath, content);
+            } else if (filePath.endsWith(".ts")) {
+                assertSchemaRangePickerHelperMatchesComponent(filePath, content);
+            }
+        });
+    }
+
+    private static void assertImportFormCompatibleWithAntdvNext(Map<String, String> result) {
+        assertGeneratedCodeCompatibleWithAntdvNext(result);
+        String content = result.get(IMPORT_FORM_PATH);
+        assertNotNull(content, IMPORT_FORM_PATH + "：未生成导入表单");
+        assertTrue(content.contains("<Upload"), IMPORT_FORM_PATH + "：应生成 Upload 组件");
+        assertRootValueImport(IMPORT_FORM_PATH, content, "\\bUpload\\b");
+        assertTrue(content.contains("beforeUpload(file: File)"), IMPORT_FORM_PATH + "：上传参数应使用原生 File 类型");
+        assertFalse(content.contains("UploadFile"), IMPORT_FORM_PATH + "：不应使用上传列表项类型 UploadFile");
+        assertFalse(content.contains("as unknown as File"), IMPORT_FORM_PATH + "：不应通过双重断言转换上传文件");
+        assertFalse(content.contains("FileType"), IMPORT_FORM_PATH + "：不应继续使用旧 FileType");
+    }
+
+    private static void assertTabsGenerated(Map<String, String> result) {
+        assertComponentGenerated(result, "Tabs");
+        assertComponentGenerated(result, "TabPane");
+    }
+
+    private static void assertGeneralCrudComponentsGenerated(Map<String, String> result) {
+        assertComponentGenerated(result, "FormItem");
+        assertComponentGenerated(result, "RangePicker");
+        assertComponentGenerated(result, "SelectOption");
+    }
+
+    private static void assertRuleGenerated(Map<String, String> result) {
+        assertTrue(result.values().stream().map(CodegenEngineVben5AntdvNextTest::removeAntdvNextRootImports)
+                        .anyMatch(content -> Pattern.compile("\\bRule\\b").matcher(content).find()),
+                "生成结果应包含 Rule 类型校验规则");
+    }
+
+    private static void assertSchemaRangePickerGenerated(Map<String, String> result) {
+        String content = result.get(SCHEMA_DATA_PATH);
+        assertNotNull(content, SCHEMA_DATA_PATH + "：未生成 Schema 配置");
+        long componentCount = countMatches(SCHEMA_RANGE_PICKER_COMPONENT_PATTERN, content);
+        assertTrue(componentCount > 0, SCHEMA_DATA_PATH + "：应生成 RangePicker 组件配置");
+    }
+
+    private static void assertComponentGenerated(Map<String, String> result, String component) {
+        assertTrue(result.values().stream().anyMatch(content -> content.contains("<" + component)),
+                "生成结果应包含 " + component + " 组件");
+    }
+
+    private static void assertRootValueImportMatchesUsage(String filePath, String content,
+                                                           String expectedImportRegex, String usageRegex,
+                                                           String bindingName) {
+        assertRootImportMatchesUsage(filePath, content, "import\\s*\\{", expectedImportRegex,
+                usageRegex, bindingName);
+    }
+
+    private static void assertRootTypeImportMatchesUsage(String filePath, String content,
+                                                          String expectedImportRegex, String usageRegex,
+                                                          String bindingName) {
+        assertRootImportMatchesUsage(filePath, content, "import\\s+type\\s*\\{", expectedImportRegex,
+                usageRegex, bindingName);
+    }
+
+    private static void assertRootImportMatchesUsage(String filePath, String content, String importPrefix,
+                                                      String expectedImportRegex, String usageRegex,
+                                                      String bindingName) {
+        boolean imported = createRootImportPattern(importPrefix, expectedImportRegex).matcher(content).find();
+        boolean used = Pattern.compile(usageRegex).matcher(removeAntdvNextRootImports(content)).find();
+        assertEquals(used, imported, filePath + "：" + bindingName + (used ? " 缺少合法根导入" : " 存在孤立根导入"));
+    }
+
+    private static String removeAntdvNextRootImports(String content) {
+        Pattern pattern = Pattern.compile("import\\s+(?:type\\s+)?\\{[^}]*}\\s*from\\s*'antdv-next';?",
+                Pattern.DOTALL);
+        return pattern.matcher(content).replaceAll("");
+    }
+
+    private static void assertRootValueImport(String filePath, String content, String expectedRegex) {
+        assertRootImport(filePath, content, "import\\s*\\{", expectedRegex);
+    }
+
+    private static void assertRootValueImportsSorted(String filePath, String content) {
+        var matcher = ANTDV_NEXT_VALUE_IMPORT_PATTERN.matcher(content);
+        while (matcher.find()) {
+            List<String> actual = Arrays.stream(matcher.group(1).split(","))
+                    .map(String::trim)
+                    .filter(item -> !item.isEmpty())
+                    .map(item -> item.replaceFirst("^.*\\s+as\\s+", ""))
+                    .toList();
+            List<String> expected = actual.stream().sorted(String.CASE_INSENSITIVE_ORDER).toList();
+            assertEquals(expected, actual, filePath + "：antdv-next 命名导入未按 natural 顺序排列");
+        }
+    }
+
+    private static void assertRangePickerHelperImportMatchesUsage(String filePath, String content) {
+        boolean imported = RANGE_PICKER_HELPER_IMPORT_PATTERN.matcher(content).find();
+        boolean called = RANGE_PICKER_HELPER_CALL_PATTERN.matcher(content).find();
+        assertEquals(called, imported,
+                filePath + "：getRangePickerDefaultProps() 调用与导入不一致");
+    }
+
+    private static void assertRangePickerHelperBindingMatchesComponent(String filePath, String content) {
+        long componentCount = countMatches(RANGE_PICKER_COMPONENT_PATTERN, content);
+        long bindingCount = countMatches(RANGE_PICKER_HELPER_BINDING_PATTERN, content);
+        assertEquals(componentCount, bindingCount,
+                filePath + "：RangePicker 与 getRangePickerDefaultProps() 绑定数量不一致");
+    }
+
+    private static void assertSchemaRangePickerHelperMatchesComponent(String filePath, String content) {
+        long componentCount = countMatches(SCHEMA_RANGE_PICKER_COMPONENT_PATTERN, content);
+        long helperSpreadCount = countMatches(SCHEMA_RANGE_PICKER_HELPER_SPREAD_PATTERN, content);
+        assertEquals(componentCount, helperSpreadCount,
+                filePath + "：Schema RangePicker 与 getRangePickerDefaultProps() 展开数量不一致");
+    }
+
+    private static long countMatches(Pattern pattern, String content) {
+        return pattern.matcher(content).results().count();
+    }
+
+    private static void assertRootImport(String filePath, String content, String importPrefix, String expectedRegex) {
+        Pattern pattern = createRootImportPattern(importPrefix, expectedRegex);
+        assertTrue(pattern.matcher(content).find(), filePath + "：缺少合法的 antdv-next 根导入 " + expectedRegex);
+    }
+
+    private static Pattern createRootImportPattern(String importPrefix, String expectedRegex) {
+        return Pattern.compile(importPrefix + "[^}]*" + expectedRegex
+                + "[^}]*}\\s*from\\s*'antdv-next';?", Pattern.DOTALL);
+    }
+
+}
--
libgit2 0.21.4