From 84cfc84ddcc2948bc9ed071b60bef33712ecef89 Mon Sep 17 00:00:00 2001
From: LiuJiaNan <15703339975@163.com>
Date: Tue, 16 Jun 2026 13:46:52 +0800
Subject: [PATCH] =?UTF-8?q?FormBuilder=E7=B1=BB=E5=9E=8B=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FormBuilder/FormBuilder.d.ts       |  2 +-
 src/components/FormBuilder/FormItemsRenderer.d.ts |  6 +++---
 src/enum/formItemRender/index.d.ts                | 10 +++++-----
 src/enum/formItemRender/index.js                  |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/components/FormBuilder/FormBuilder.d.ts b/src/components/FormBuilder/FormBuilder.d.ts
index ed293d9..66ea894 100644
--- a/src/components/FormBuilder/FormBuilder.d.ts
+++ b/src/components/FormBuilder/FormBuilder.d.ts
@@ -21,7 +21,7 @@ export interface FormBuilderProps<Values = any> extends Omit<FormProps, "form" |
   /** 栅格间距，默认 24 */
   gutter?: Gutter | [Gutter, Gutter];
   /** 占据栅格列数，默认 12 */
-  span?: number | string;
+  span?: number;
   /** 自动生成必填规则，默认 true */
   useAutoGenerateRequired?: boolean;
   /** 是否显示操作按钮区域，默认 true */
diff --git a/src/components/FormBuilder/FormItemsRenderer.d.ts b/src/components/FormBuilder/FormItemsRenderer.d.ts
index 38a7850..575ae77 100644
--- a/src/components/FormBuilder/FormItemsRenderer.d.ts
+++ b/src/components/FormBuilder/FormItemsRenderer.d.ts
@@ -104,7 +104,7 @@ export interface FormOptionBase<
   /** 表单项标签 */
   label?: ReactNode;
   /** 占据栅格列数，默认 12 */
-  span?: WhenTrue<IsOnlyForLabel, number | string>;
+  span?: WhenTrue<IsOnlyForLabel, number>;
   /** 是否必填，默认 true，支持函数动态计算 */
   required?: FormOptionProperty<IsOnlyForLabel, IsCustomizeRender, boolean | ((formValues: AllValues) => boolean)>;
   /** 验证规则 */
@@ -156,7 +156,7 @@ export type FormOptionByRender<
   /** checkbox 的栅格数量，如果不传入不使用栅格，传入才使用 */
   checkboxCol?: FormOptionProperty<IsOnlyForLabel, IsCustomizeRender, RenderType extends "checkbox" ? number : never>;
   /** Form.List 独有的属性 */
-  formListUniqueProps?: FormOptionProperty<IsOnlyForLabel, IsCustomizeRender, RenderType extends "formList" ? FormListUniqueProps | ((formValues: AllValues) => FormListUniqueProps) : never>;
+  formListUniqueProps?: FormOptionProperty<IsOnlyForLabel, IsCustomizeRender, RenderType extends "formList" ? FormListUniqueProps<Values, AllValues> | ((formValues: AllValues) => FormListUniqueProps<Values, AllValues>) : never>;
 };
 
 /**
@@ -250,7 +250,7 @@ export interface FormItemsRendererProps<Values = any> {
   /** 自动生成必填规则，默认 true */
   useAutoGenerateRequired?: boolean;
   /** 初始值，用于在表单未初始化时提供默认值 */
-  initialValues?: Values;
+  initialValues?: DeepPartial<Values>;
   /** 栅格间距，继承自 FormBuilder */
   gutter?: Gutter | [Gutter, Gutter];
   /** label 栅格配置，继承自 FormBuilder */
diff --git a/src/enum/formItemRender/index.d.ts b/src/enum/formItemRender/index.d.ts
index 9b4d316..c2108a7 100644
--- a/src/enum/formItemRender/index.d.ts
+++ b/src/enum/formItemRender/index.d.ts
@@ -1,5 +1,5 @@
 import type { CheckboxProps } from "antd/es/checkbox";
-import type { DatePickerProps } from "antd/es/date-picker";
+import type { DatePickerProps, MonthPickerProps, RangePickerProps, WeekPickerProps } from "antd/es/date-picker";
 import type { DividerProps } from "antd/es/divider";
 import type { FormListProps } from "antd/es/form";
 import type { InputProps, TextAreaProps } from "antd/es/input";
@@ -57,12 +57,12 @@ export interface FORM_ITEM_RENDER_TYPE_MAP {
   radio: RadioProps;
   checkbox: CheckboxProps;
   date: DatePickerProps;
-  dateMonth: DatePickerProps;
+  dateMonth: MonthPickerProps;
   dateYear: DatePickerProps;
-  dateWeek: DatePickerProps;
-  dateRange: DatePickerProps;
+  dateWeek: WeekPickerProps;
+  dateRange: RangePickerProps;
   datetime: DatePickerProps;
-  datetimeRange: DatePickerProps;
+  datetimeRange: RangePickerProps;
   divider: DividerProps;
   formList: FormListProps;
 }
diff --git a/src/enum/formItemRender/index.js b/src/enum/formItemRender/index.js
index 632c7e7..8dcf6b7 100644
--- a/src/enum/formItemRender/index.js
+++ b/src/enum/formItemRender/index.js
@@ -11,7 +11,7 @@ export const FORM_ITEM_RENDER_ENUM = {
   /** 映射为 antd InputNumber */
   NUMBER: "number",
   /** 映射为 antd InputNumber */
-  INTEGER: "number",
+  INTEGER: "integer",
   /** 映射为 antd Select */
   SELECT: "select",
   /** 映射为 antd Radio.Group */