feat（codegen）：uniapp 表单生成器对齐 @wot-ui/ui 2.x + 修测试快照撞名

form 模板全量对齐 2.x： - :rules/formRules → :schema/createFormSchema（2.x wd-form 只认 schema） - 字段统一包 wd-form-item；下拉字典 → yd-form-picker 独立；radio shape→type - 日期时间 → wd-form-item 触发 + wd-datetime-picker 弹层 + xxxVisible； LocalDateTime 用 formatDateTime、Date/LocalDate 用 formatDate（import 按需） - 图片/文件上传 → yd-upload-img/file（原误生成文本框）；小数补 precision - 包名 wot-design-uni（未装）→ @wot-ui/ui（form + detail） search-form：日期范围 → yd-search-date-range；radio shape→type 字典 import 按实际用量门控（纯 select 不越界） writeResult：同名快照撞名补父目录 + 序号兜底，assert 路径不变

feat（codegen）：uniapp 表单生成器对齐 @wot-ui/ui 2.x + 修测试快照撞名
form 模板全量对齐 2.x： - :rules/formRules → :schema/createFormSchema（2.x wd-form 只认 schema） - 字段统一包 wd-form-item；下拉字典 → yd-form-picker 独立；radio shape→type - 日期时间 → wd-form-item 触发 + wd-datetime-picker 弹层 + xxxVisible； LocalDateTime 用 formatDateTime、Date/LocalDate 用 formatDate（import 按需） - 图片/文件上传 → yd-upload-img/file（原误生成文本框）；小数补 precision - 包名 wot-design-uni（未装）→ @wot-ui/ui（form + detail） search-form：日期范围 → yd-search-date-range；radio shape→type 字典 import 按实际用量门控（纯 select 不越界） writeResult：同名快照撞名补父目录 + 序号兜底，assert 路径不变
YunaiV
1 parent adbec22e
Showing 7 changed files with 182 additions and 220 deletions
yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/components/search-form.vue.vm
yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/views/detail/index.vue.vm
yudao-module-infra/src/main/resources/codegen/vue3_admin_uniapp/views/form/index.vue.vm
yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineAbstractTest.java
yudao-module-infra/src/test/resources/codegen/vue3_admin_uniapp_one/vue/detail/index
yudao-module-infra/src/test/resources/codegen/vue3_admin_uniapp_one/vue/form/index
yudao-module-infra/src/test/resources/codegen/vue3_admin_uniapp_one/vue/search-form
@@ -40,49 +40,13 @@
         />
       </view>
     #elseif ($column.htmlType == "datetime" && $listOperationCondition == "BETWEEN")
-      #set ($AttrName = $javaField.substring(0,1).toUpperCase() + ${javaField.substring(1)})
-      <view class="yd-search-form-item">
-        <view class="yd-search-form-label">
-          ${comment}
-        </view>
-        <view class="yd-search-form-date-range-container">
-          <view @click="visible${AttrName}[0] = true">
-            <view class="yd-search-form-date-range-picker">
-              {{ formatDate(formData.${javaField}?.[0]) || '开始日期' }}
-            </view>
-          </view>
-          -
-          <view @click="visible${AttrName}[1] = true">
-            <view class="yd-search-form-date-range-picker">
-              {{ formatDate(formData.${javaField}?.[1]) || '结束日期' }}
-            </view>
-          </view>
-        </view>
-        <wd-datetime-picker-view v-if="visible${AttrName}[0]" v-model="temp${AttrName}[0]" type="date" />
-        <view v-if="visible${AttrName}[0]" class="yd-search-form-date-range-actions">
-          <wd-button size="small" plain @click="visible${AttrName}[0] = false">
-            取消
-          </wd-button>
-          <wd-button size="small" type="primary" @click="handle${AttrName}0Confirm">
-            确定
-          </wd-button>
-        </view>
-        <wd-datetime-picker-view v-if="visible${AttrName}[1]" v-model="temp${AttrName}[1]" type="date" />
-        <view v-if="visible${AttrName}[1]" class="yd-search-form-date-range-actions">
-          <wd-button size="small" plain @click="visible${AttrName}[1] = false">
-            取消
-          </wd-button>
-          <wd-button size="small" type="primary" @click="handle${AttrName}1Confirm">
-            确定
-          </wd-button>
-        </view>
-      </view>
+      <yd-search-date-range v-model="formData.${javaField}" label="${comment}" />
     #elseif (($column.htmlType == "select" || $column.htmlType == "radio") && $dictType && "" != $dictType)
       <view class="yd-search-form-item">
         <view class="yd-search-form-label">
           ${comment}
         </view>
-        <wd-radio-group v-model="formData.${javaField}" shape="button">
+        <wd-radio-group v-model="formData.${javaField}" type="button">
           <wd-radio :value="-1">
             全部
           </wd-radio>
@@ -236,29 +200,6 @@ const placeholder = computed(() =&gt; {
   return conditions.length > 0 ? conditions.join(' | ') : '搜索${table.classComment}'
 })
  
-#if ($hasDateTimeBetween == 1)
-#foreach($column in $columns)
-  #if ($column.listOperation && $column.htmlType == "datetime" && $column.listOperationCondition == "BETWEEN")
-    #set ($javaField = $column.javaField)
-    #set ($AttrName = $javaField.substring(0,1).toUpperCase() + ${javaField.substring(1)})
-const visible${AttrName} = ref<[boolean, boolean]>([false, false]) // ${column.columnComment}选择器状态
-const temp${AttrName} = ref<[number, number]>([Date.now(), Date.now()]) // ${column.columnComment}临时值
-
-/** 确认${column.columnComment}开始日期 */
-function handle${AttrName}0Confirm() {
-  formData.${javaField} = [temp${AttrName}.value[0], formData.${javaField}?.[1]]
-  visible${AttrName}.value[0] = false
-}
-
-/** 确认${column.columnComment}结束日期 */
-function handle${AttrName}1Confirm() {
-  formData.${javaField} = [formData.${javaField}?.[0], temp${AttrName}.value[1]]
-  visible${AttrName}.value[1] = false
-}
-  #end
-#end
-#end
-
 /** 搜索按钮操作 */
 function handleSearch() {
   visible.value = false
@@ -64,7 +64,7 @@
 import type { ${simpleClassName} } from '@/api/${table.moduleName}/${table.businessName}'
 import { onUnload } from '@dcloudio/uni-app'
 import { onMounted, ref } from 'vue'
-import { useToast } from 'wot-design-uni'
+import { useToast } from '@wot-ui/ui/components/wd-toast'
 import { delete${simpleClassName}, get${simpleClassName} } from '@/api/${table.moduleName}/${table.businessName}'
 import { useAccess } from '@/hooks/useAccess'
 import { navigateBackPlus } from '@/utils'
@@ -9,7 +9,7 @@
  
     <!-- 表单区域 -->
     <view>
-      <wd-form ref="formRef" :model="formData" :rules="formRules">
+      <wd-form ref="formRef" :model="formData" :schema="formSchema">
         <wd-cell-group border>
 #foreach($column in $columns)
   #if (($column.createOperation || $column.updateOperation) && !$column.primaryKey)
@@ -25,10 +25,23 @@
     #elseif ($javaType == "Boolean")
       #set ($dictMethod = "getBoolDictOptions")
     #end
-    ## 优先判断是否有字典，有字典则使用 radio-group
-    #if (($column.htmlType == "select" || $column.htmlType == "radio") && $dictType && "" != $dictType)
-          <wd-cell title="${comment}" title-width="180rpx" prop="${javaField}" center>
-            <wd-radio-group v-model="formData.${javaField}" shape="button">
+    ## 下拉选择（字典）→ yd-form-picker，内部按 dictType 解析选项，适合选项较多
+    #if ($column.htmlType == "select" && $dictType && "" != $dictType)
+          <yd-form-picker
+            v-model="formData.${javaField}"
+            label="${comment}"
+            label-width="180rpx"
+            prop="${javaField}"
+            :dict-type="DICT_TYPE.${dictType.toUpperCase()}"
+#if ($javaType == "String")
+            dict-kind="str"
+#end
+            placeholder="请选择${comment}"
+          />
+    ## 单选（字典）→ radio-group，适合选项较少
+    #elseif ($column.htmlType == "radio" && $dictType && "" != $dictType)
+          <wd-form-item title="${comment}" title-width="180rpx" prop="${javaField}" center>
+            <wd-radio-group v-model="formData.${javaField}" type="button">
               <wd-radio
                 v-for="dict in $dictMethod(DICT_TYPE.${dictType.toUpperCase()})"
                 :key="dict.value"
@@ -37,54 +50,78 @@
                 {{ dict.label }}
               </wd-radio>
             </wd-radio-group>
-          </wd-cell>
+          </wd-form-item>
     ## 数字类型（无字典）
     #elseif (${javaType.toLowerCase()} == "long" || ${javaType.toLowerCase()} == "integer" || ${javaType.toLowerCase()} == "short" || ${javaType.toLowerCase()} == "double" || ${javaType.toLowerCase()} == "bigdecimal" || ${javaType.toLowerCase()} == "byte")
-          <wd-cell title="${comment}" title-width="180rpx" prop="${javaField}" center>
+          <wd-form-item title="${comment}" title-width="180rpx" prop="${javaField}">
             <wd-input-number
               v-model="formData.${javaField}"
+#if (${javaType.toLowerCase()} == "double" || ${javaType.toLowerCase()} == "bigdecimal")
+              :precision="2"
+              input-type="number"
+#end
               :min="0"
             />
-          </wd-cell>
+          </wd-form-item>
     ## 布尔类型
     #elseif (${javaType.toLowerCase()} == "boolean")
-          <wd-cell title="${comment}" title-width="180rpx" prop="${javaField}" center>
+          <wd-form-item title="${comment}" title-width="180rpx" prop="${javaField}" center>
             <wd-switch v-model="formData.${javaField}" />
-          </wd-cell>
+          </wd-form-item>
     ## 日期时间类型
     #elseif (${javaType.toLowerCase()} == "date" || ${javaType.toLowerCase()} == "localdate" || ${javaType.toLowerCase()} == "localdatetime")
       #set ($pickerType = "date")
       #if (${javaType.toLowerCase()} == "localdatetime")
         #set ($pickerType = "datetime")
       #end
+          <wd-form-item
+            title="${comment}"
+            title-width="180rpx"
+            prop="${javaField}"
+            is-link
+#if ($pickerType == "datetime")
+            :value="formatDateTime(formData.${javaField})"
+#else
+            :value="formatDate(formData.${javaField})"
+#end
+            placeholder="请选择${comment}"
+            @click="${javaField}Visible = true"
+          />
           <wd-datetime-picker
             v-model="formData.${javaField}"
+            v-model:visible="${javaField}Visible"
             type="${pickerType}"
-            label="${comment}"
-            label-width="180rpx"
-            prop="${javaField}"
           />
     ## 文本域
     #elseif ($column.htmlType == "textarea")
-          <wd-textarea
-            v-model="formData.${javaField}"
-            label="${comment}"
-            label-width="180rpx"
-            placeholder="请输入${comment}"
-            :maxlength="200"
-            show-word-limit
-            clearable
-          />
+          <wd-form-item title="${comment}" title-width="180rpx" prop="${javaField}">
+            <wd-textarea
+              v-model="formData.${javaField}"
+              clearable
+              placeholder="请输入${comment}"
+              :maxlength="200"
+              show-word-limit
+            />
+          </wd-form-item>
+    ## 图片上传 → yd-upload-img（包 wd-form-item 才能注册到 wd-form 做校验/错误展示）
+    #elseif ($column.htmlType == "imageUpload")
+          <wd-form-item title="${comment}" title-width="180rpx" prop="${javaField}">
+            <yd-upload-img v-model="formData.${javaField}" directory="${table.moduleName}/${table.businessName}" />
+          </wd-form-item>
+    ## 文件上传 → yd-upload-file
+    #elseif ($column.htmlType == "fileUpload")
+          <wd-form-item title="${comment}" title-width="180rpx" prop="${javaField}">
+            <yd-upload-file v-model="formData.${javaField}" directory="${table.moduleName}/${table.businessName}" />
+          </wd-form-item>
     ## 默认：文本输入
     #else
-          <wd-input
-            v-model="formData.${javaField}"
-            label="${comment}"
-            label-width="180rpx"
-            prop="${javaField}"
-            clearable
-            placeholder="请输入${comment}"
-          />
+          <wd-form-item title="${comment}" title-width="180rpx" prop="${javaField}">
+            <wd-input
+              v-model="formData.${javaField}"
+              clearable
+              placeholder="请输入${comment}"
+            />
+          </wd-form-item>
     #end
   #end
 #end
@@ -107,7 +144,7 @@
 </template>
  
 <script lang="ts" setup>
-import type { FormInstance } from 'wot-design-uni/components/wd-form/types'
+import type { FormInstance } from '@wot-ui/ui/components/wd-form/types'
 #set ($primaryJavaType = $primaryColumn.javaType.toLowerCase())
 #if(${primaryJavaType} == "long" || ${primaryJavaType} == "integer" || ${primaryJavaType} == "short" || ${primaryJavaType} == "double" || ${primaryJavaType} == "bigdecimal" || ${primaryJavaType} == "byte")
 #set ($primaryTsType = "number")
@@ -115,6 +152,8 @@ import type { FormInstance } from &#39;wot-design-uni/components/wd-form/types&#39;
 #set ($primaryTsType = "string")
 #end
 #set ($hasDict = 0)
+#set ($hasDate = 0)
+#set ($hasDateTime = 0)
 #set ($hasGetDictOptions = 0)
 #set ($hasGetIntDictOptions = 0)
 #set ($hasGetStrDictOptions = 0)
@@ -124,22 +163,30 @@ import type { FormInstance } from &#39;wot-design-uni/components/wd-form/types&#39;
       && ($column.htmlType == "select" || $column.htmlType == "radio")
       && $column.dictType && "" != $column.dictType)
     #set ($hasDict = 1)
-    #if ($column.javaType == "Integer" || $column.javaType == "Long" || $column.javaType == "Byte" || $column.javaType == "Short")
+    #if ($column.htmlType == "radio" && ($column.javaType == "Integer" || $column.javaType == "Long" || $column.javaType == "Byte" || $column.javaType == "Short"))
       #set ($hasGetIntDictOptions = 1)
-    #elseif ($column.javaType == "String")
+    #elseif ($column.htmlType == "radio" && $column.javaType == "String")
       #set ($hasGetStrDictOptions = 1)
-    #elseif ($column.javaType == "Boolean")
+    #elseif ($column.htmlType == "radio" && $column.javaType == "Boolean")
       #set ($hasGetBoolDictOptions = 1)
-    #else
+    #elseif ($column.htmlType == "radio")
       #set ($hasGetDictOptions = 1)
     #end
   #end
+  #if (($column.createOperation || $column.updateOperation) && !$column.primaryKey
+      && (${column.javaType.toLowerCase()} == "date" || ${column.javaType.toLowerCase()} == "localdate"))
+    #set ($hasDate = 1)
+  #end
+  #if (($column.createOperation || $column.updateOperation) && !$column.primaryKey
+      && ${column.javaType.toLowerCase()} == "localdatetime")
+    #set ($hasDateTime = 1)
+  #end
 #end
 import type { ${simpleClassName} } from '@/api/${table.moduleName}/${table.businessName}'
 import { computed, onMounted, ref } from 'vue'
-import { useToast } from 'wot-design-uni'
+import { useToast } from '@wot-ui/ui/components/wd-toast'
 import { create${simpleClassName}, get${simpleClassName}, update${simpleClassName} } from '@/api/${table.moduleName}/${table.businessName}'
-#if ($hasDict == 1)
+#if ($hasGetDictOptions == 1 || $hasGetIntDictOptions == 1 || $hasGetStrDictOptions == 1 || $hasGetBoolDictOptions == 1)
   #set ($dictImportNames = "")
   #if ($hasGetDictOptions == 1)
     #set ($dictImportNames = "${dictImportNames}getDictOptions, ")
@@ -161,6 +208,19 @@ import { navigateBackPlus } from &#39;@/utils&#39;
 #if ($hasDict == 1)
 import { DICT_TYPE } from '@/utils/constants'
 #end
+#if ($hasDate == 1 || $hasDateTime == 1)
+  #set ($dateImportNames = "")
+  #if ($hasDate == 1)
+    #set ($dateImportNames = "${dateImportNames}formatDate, ")
+  #end
+  #if ($hasDateTime == 1)
+    #set ($dateImportNames = "${dateImportNames}formatDateTime, ")
+  #end
+  #set ($dateImportNames = $dateImportNames.trim())
+  #set ($dateImportNames = $dateImportNames.substring(0, $dateImportNames.length() - 1))
+import { $dateImportNames } from '@/utils/date'
+#end
+import { createFormSchema } from '@/utils/wot'
  
 const props = defineProps<{
   id?: ${primaryTsType} | any
@@ -196,7 +256,12 @@ const formData = ref&lt;${simpleClassName}&gt;({
   #end
 #end
 }) // 表单数据
-const formRules = {
+#foreach($column in $columns)
+  #if (($column.createOperation || $column.updateOperation) && !$column.primaryKey && (${column.javaType.toLowerCase()} == "date" || ${column.javaType.toLowerCase()} == "localdate" || ${column.javaType.toLowerCase()} == "localdatetime"))
+const ${column.javaField}Visible = ref(false) // ${column.columnComment}选择器状态
+  #end
+#end
+const formSchema = createFormSchema({
 #foreach($column in $columns)
   #set ($javaFieldLower = $column.javaField.toLowerCase())
   #if (($column.createOperation || $column.updateOperation) && !$column.nullable && !$column.primaryKey
@@ -204,7 +269,7 @@ const formRules = {
   ${column.javaField}: [{ required: true, message: '${column.columnComment}不能为空' }],
   #end
 #end
-} // 表单校验规则
+}) // 表单校验规则
 const formRef = ref<FormInstance>() // 表单组件引用
  
 /** 返回上一页 */
@@ -152,10 +152,21 @@ public abstract class CodegenEngineAbstractTest extends BaseMockitoUnitTest {
     protected void writeResult(Map<String, String> result, String basePath) {
         // 写入文件内容
         List<Map<String, String>> asserts = new ArrayList<>();
+        Set<String> usedContentPaths = new LinkedHashSet<>();
         result.forEach((filePath, fileContent) -> {
             String lastFilePath = StrUtil.subAfter(filePath, '/', true);
-            String contentPath = StrUtil.subAfter(lastFilePath, '.', true)
-                    + '/' + StrUtil.subBefore(lastFilePath, '.', true);
+            String ext = StrUtil.subAfter(lastFilePath, '.', true);
+            String name = StrUtil.subBefore(lastFilePath, '.', true);
+            String contentPath = ext + '/' + name;
+            // 同名文件（如 index.vue 同时出现在 列表/form/detail）会撞名，撞名时前缀补上级目录区分；仍撞则加序号兜底，避免快照互相覆盖
+            if (usedContentPaths.contains(contentPath)) {
+                String parentDir = StrUtil.subAfter(StrUtil.subBefore(filePath, '/' + lastFilePath, true), '/', true);
+                contentPath = ext + '/' + parentDir + '/' + name;
+                for (int i = 2; usedContentPaths.contains(contentPath); i++) {
+                    contentPath = ext + '/' + parentDir + '/' + name + '-' + i;
+                }
+            }
+            usedContentPaths.add(contentPath);
             asserts.add(MapUtil.<String, String>builder().put("filePath", filePath)
                     .put("contentPath", contentPath).build());
             FileUtil.writeUtf8String(fileContent, basePath + "/" + contentPath);
@@ -51,7 +51,7 @@
 import type { Student } from '@/api/infra/demo'
 import { onUnload } from '@dcloudio/uni-app'
 import { onMounted, ref } from 'vue'
-import { useToast } from 'wot-design-uni'
+import { useToast } from '@wot-ui/ui/components/wd-toast'
 import { deleteStudent, getStudent } from '@/api/infra/demo'
 import { useAccess } from '@/hooks/useAccess'
 import { navigateBackPlus } from '@/utils'
@@ -9,45 +9,48 @@
  
     <!-- 表单区域 -->
     <view>
-      <wd-form ref="formRef" :model="formData" :rules="formRules">
+      <wd-form ref="formRef" :model="formData" :schema="formSchema">
         <wd-cell-group border>
-              <wd-input
-            v-model="formData.name"
-            label="名字"
-            label-width="180rpx"
-            prop="name"
-            clearable
-            placeholder="请输入名字"
-          />
-              <wd-textarea
-            v-model="formData.description"
-            label="简介"
-            label-width="180rpx"
-            placeholder="请输入简介"
-            :maxlength="200"
-            show-word-limit
-            clearable
+              <wd-form-item title="名字" title-width="180rpx" prop="name">
+            <wd-input
+              v-model="formData.name"
+              clearable
+              placeholder="请输入名字"
+            />
+          </wd-form-item>
+              <wd-form-item title="简介" title-width="180rpx" prop="description">
+            <wd-textarea
+              v-model="formData.description"
+              clearable
+              placeholder="请输入简介"
+              :maxlength="200"
+              show-word-limit
+            />
+          </wd-form-item>
+                  <wd-form-item
+            title="出生日期"
+            title-width="180rpx"
+            prop="birthday"
+            is-link
+            :value="formatDateTime(formData.birthday)"
+            placeholder="请选择出生日期"
+            @click="birthdayVisible = true"
           />
-                  <wd-datetime-picker
+          <wd-datetime-picker
             v-model="formData.birthday"
+            v-model:visible="birthdayVisible"
             type="datetime"
-            label="出生日期"
+          />
+                  <yd-form-picker
+            v-model="formData.sex"
+            label="性别"
             label-width="180rpx"
-            prop="birthday"
+            prop="sex"
+            :dict-type="DICT_TYPE.SYSTEM_USER_SEX"
+            placeholder="请选择性别"
           />
-                  <wd-cell title="性别" title-width="180rpx" prop="sex" center>
-            <wd-radio-group v-model="formData.sex" shape="button">
-              <wd-radio
-                v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
-                :key="dict.value"
-                :value="dict.value"
-              >
-                {{ dict.label }}
-              </wd-radio>
-            </wd-radio-group>
-          </wd-cell>
-                  <wd-cell title="是否有效" title-width="180rpx" prop="enabled" center>
-            <wd-radio-group v-model="formData.enabled" shape="button">
+                  <wd-form-item title="是否有效" title-width="180rpx" prop="enabled" center>
+            <wd-radio-group v-model="formData.enabled" type="button">
               <wd-radio
                 v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
                 :key="dict.value"
@@ -56,31 +59,20 @@
                 {{ dict.label }}
               </wd-radio>
             </wd-radio-group>
-          </wd-cell>
-                  <wd-input
-            v-model="formData.avatar"
-            label="头像"
-            label-width="180rpx"
-            prop="avatar"
-            clearable
-            placeholder="请输入头像"
-          />
-              <wd-input
-            v-model="formData.video"
-            label="附件"
-            label-width="180rpx"
-            prop="video"
-            clearable
-            placeholder="请输入附件"
-          />
-              <wd-input
-            v-model="formData.memo"
-            label="备注"
-            label-width="180rpx"
-            prop="memo"
-            clearable
-            placeholder="请输入备注"
-          />
+          </wd-form-item>
+                  <wd-form-item title="头像" title-width="180rpx" prop="avatar">
+            <yd-upload-img v-model="formData.avatar" directory="infra/demo" />
+          </wd-form-item>
+                  <wd-form-item title="附件" title-width="180rpx" prop="video">
+            <yd-upload-file v-model="formData.video" directory="infra/demo" />
+          </wd-form-item>
+                  <wd-form-item title="备注" title-width="180rpx" prop="memo">
+            <wd-input
+              v-model="formData.memo"
+              clearable
+              placeholder="请输入备注"
+            />
+          </wd-form-item>
         </wd-cell-group>
       </wd-form>
     </view>
@@ -100,14 +92,16 @@
 </template>
  
 <script lang="ts" setup>
-import type { FormInstance } from 'wot-design-uni/components/wd-form/types'
+import type { FormInstance } from '@wot-ui/ui/components/wd-form/types'
 import type { Student } from '@/api/infra/demo'
 import { computed, onMounted, ref } from 'vue'
-import { useToast } from 'wot-design-uni'
+import { useToast } from '@wot-ui/ui/components/wd-toast'
 import { createStudent, getStudent, updateStudent } from '@/api/infra/demo'
-import { getIntDictOptions, getBoolDictOptions } from '@/hooks/useDict'
+import { getBoolDictOptions } from '@/hooks/useDict'
 import { navigateBackPlus } from '@/utils'
 import { DICT_TYPE } from '@/utils/constants'
+import { formatDateTime } from '@/utils/date'
+import { createFormSchema } from '@/utils/wot'
  
 const props = defineProps<{
   id?: number | any
@@ -134,7 +128,8 @@ const formData = ref&lt;Student&gt;({
   video: '',
   memo: '',
 }) // 表单数据
-const formRules = {
+const birthdayVisible = ref(false) // 出生日期选择器状态
+const formSchema = createFormSchema({
   name: [{ required: true, message: '名字不能为空' }],
   description: [{ required: true, message: '简介不能为空' }],
   birthday: [{ required: true, message: '出生日期不能为空' }],
@@ -143,7 +138,7 @@ const formRules = {
   avatar: [{ required: true, message: '头像不能为空' }],
   video: [{ required: true, message: '附件不能为空' }],
   memo: [{ required: true, message: '备注不能为空' }],
-} // 表单校验规则
+}) // 表单校验规则
 const formRef = ref<FormInstance>() // 表单组件引用
  
 /** 返回上一页 */
@@ -31,7 +31,7 @@
         <view class="yd-search-form-label">
           性别
         </view>
-        <wd-radio-group v-model="formData.sex" shape="button">
+        <wd-radio-group v-model="formData.sex" type="button">
           <wd-radio :value="-1">
             全部
           </wd-radio>
@@ -48,7 +48,7 @@
         <view class="yd-search-form-label">
           是否有效
         </view>
-        <wd-radio-group v-model="formData.enabled" shape="button">
+        <wd-radio-group v-model="formData.enabled" type="button">
           <wd-radio :value="-1">
             全部
           </wd-radio>
@@ -61,42 +61,7 @@
           </wd-radio>
         </wd-radio-group>
       </view>
-      <view class="yd-search-form-item">
-        <view class="yd-search-form-label">
-          创建时间
-        </view>
-        <view class="yd-search-form-date-range-container">
-          <view @click="visibleCreateTime[0] = true">
-            <view class="yd-search-form-date-range-picker">
-              {{ formatDate(formData.createTime?.[0]) || '开始日期' }}
-            </view>
-          </view>
-          -
-          <view @click="visibleCreateTime[1] = true">
-            <view class="yd-search-form-date-range-picker">
-              {{ formatDate(formData.createTime?.[1]) || '结束日期' }}
-            </view>
-          </view>
-        </view>
-        <wd-datetime-picker-view v-if="visibleCreateTime[0]" v-model="tempCreateTime[0]" type="date" />
-        <view v-if="visibleCreateTime[0]" class="yd-search-form-date-range-actions">
-          <wd-button size="small" plain @click="visibleCreateTime[0] = false">
-            取消
-          </wd-button>
-          <wd-button size="small" type="primary" @click="handleCreateTime0Confirm">
-            确定
-          </wd-button>
-        </view>
-        <wd-datetime-picker-view v-if="visibleCreateTime[1]" v-model="tempCreateTime[1]" type="date" />
-        <view v-if="visibleCreateTime[1]" class="yd-search-form-date-range-actions">
-          <wd-button size="small" plain @click="visibleCreateTime[1] = false">
-            取消
-          </wd-button>
-          <wd-button size="small" type="primary" @click="handleCreateTime1Confirm">
-            确定
-          </wd-button>
-        </view>
-      </view>
+      <yd-search-date-range v-model="formData.createTime" label="创建时间" />
       <view class="yd-search-form-actions">
         <wd-button class="flex-1" plain @click="handleReset">
           重置
@@ -151,21 +116,6 @@ const placeholder = computed(() =&gt; {
   return conditions.length > 0 ? conditions.join(' | ') : '搜索学生'
 })
  
-const visibleCreateTime = ref<[boolean, boolean]>([false, false]) // 创建时间选择器状态
-const tempCreateTime = ref<[number, number]>([Date.now(), Date.now()]) // 创建时间临时值
-
-/** 确认创建时间开始日期 */
-function handleCreateTime0Confirm() {
-  formData.createTime = [tempCreateTime.value[0], formData.createTime?.[1]]
-  visibleCreateTime.value[0] = false
-}
-
-/** 确认创建时间结束日期 */
-function handleCreateTime1Confirm() {
-  formData.createTime = [formData.createTime?.[0], tempCreateTime.value[1]]
-  visibleCreateTime.value[1] = false
-}
-
 /** 搜索按钮操作 */
 function handleSearch() {
   visible.value = false