zy-react-library 1.3.18 → 1.3.19

package/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 */

package/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)>;
   /** 验证规则 */
@@ -209,33 +209,46 @@ export type FormOptionCustomRender<
   formListUniqueProps?: never;
 };
 
+/**
+ * 根据 render 类型映射生成表单项联合类型
+ */
+export type FormOptionByRenderUnion<
+  Values = any,
+  AllValues = Values,
+  IsOnlyForLabel extends boolean = false,
+  IsCustomizeRender extends boolean = false,
+  Name = NamePath<Values>,
+  Dependencies = NamePath<Values>,
+> = { [K in keyof FORM_ITEM_RENDER_TYPE_MAP]: FormOptionByRender<K, Values, AllValues, IsOnlyForLabel, IsCustomizeRender, Name, Dependencies> }[keyof FORM_ITEM_RENDER_TYPE_MAP];
+
+/**
+ * 表单配置项联合类型组合
+ */
+export type FormOptionGroup<
+  Values = any,
+  AllValues = Values,
+  Name = NamePath<Values>,
+  Dependencies = NamePath<Values>,
+>
+  = | FormOptionDefault<Values, AllValues, false, false, Name, Dependencies>
+    | FormOptionDefault<Values, AllValues, false, true, Name, Dependencies>
+    | FormOptionDefault<Values, AllValues, true, false, Name, Dependencies>
+    | FormOptionByRenderUnion<Values, AllValues, false, false, Name, Dependencies>
+    | FormOptionByRenderUnion<Values, AllValues, false, true, Name, Dependencies>
+    | FormOptionByRenderUnion<Values, AllValues, true, false, Name, Dependencies>
+    | FormOptionCustomRender<Values, AllValues, false, false, Name, Dependencies>
+    | FormOptionCustomRender<Values, AllValues, false, true, Name, Dependencies>
+    | FormOptionCustomRender<Values, AllValues, true, false, Name, Dependencies>;
+
 /**
  * 普通表单配置项
  */
-export type FormOption<Values = any, AllValues = Values>
-  = | FormOptionDefault<Values, AllValues, false, false>
-    | FormOptionDefault<Values, AllValues, false, true>
-    | FormOptionDefault<Values, AllValues, true, false>
-    | { [K in keyof FORM_ITEM_RENDER_TYPE_MAP]: FormOptionByRender<K, Values, AllValues, false, false> }[keyof FORM_ITEM_RENDER_TYPE_MAP]
-    | { [K in keyof FORM_ITEM_RENDER_TYPE_MAP]: FormOptionByRender<K, Values, AllValues, false, true> }[keyof FORM_ITEM_RENDER_TYPE_MAP]
-    | { [K in keyof FORM_ITEM_RENDER_TYPE_MAP]: FormOptionByRender<K, Values, AllValues, true, false> }[keyof FORM_ITEM_RENDER_TYPE_MAP]
-    | FormOptionCustomRender<Values, AllValues, false, false>
-    | FormOptionCustomRender<Values, AllValues, false, true>
-    | FormOptionCustomRender<Values, AllValues, true, false>;
+export type FormOption<Values = any, AllValues = Values> = FormOptionGroup<Values, AllValues>;
 
 /**
  * Form.List 子项表单配置项
  */
-export type FormListOption<Values = any, AllValues = Values>
-  = | FormOptionDefault<Values, AllValues, false, false, FormListOptionName<Values>, FormListOptionDependencies<AllValues>>
-    | FormOptionDefault<Values, AllValues, false, true, FormListOptionName<Values>, FormListOptionDependencies<AllValues>>
-    | FormOptionDefault<Values, AllValues, true, false, FormListOptionName<Values>, FormListOptionDependencies<AllValues>>
-    | { [K in keyof FORM_ITEM_RENDER_TYPE_MAP]: FormOptionByRender<K, Values, AllValues, false, false, FormListOptionName<Values>, FormListOptionDependencies<AllValues>> }[keyof FORM_ITEM_RENDER_TYPE_MAP]
-    | { [K in keyof FORM_ITEM_RENDER_TYPE_MAP]: FormOptionByRender<K, Values, AllValues, false, true, FormListOptionName<Values>, FormListOptionDependencies<AllValues>> }[keyof FORM_ITEM_RENDER_TYPE_MAP]
-    | { [K in keyof FORM_ITEM_RENDER_TYPE_MAP]: FormOptionByRender<K, Values, AllValues, true, false, FormListOptionName<Values>, FormListOptionDependencies<AllValues>> }[keyof FORM_ITEM_RENDER_TYPE_MAP]
-    | FormOptionCustomRender<Values, AllValues, false, false, FormListOptionName<Values>, FormListOptionDependencies<AllValues>>
-    | FormOptionCustomRender<Values, AllValues, false, true, FormListOptionName<Values>, FormListOptionDependencies<AllValues>>
-    | FormOptionCustomRender<Values, AllValues, true, false, FormListOptionName<Values>, FormListOptionDependencies<AllValues>>;
+export type FormListOption<Values = any, AllValues = Values> = FormOptionGroup<Values, AllValues, FormListOptionName<Values>, FormListOptionDependencies<AllValues>>;
 
 /**
  * FormItemsRenderer 组件属性
@@ -250,7 +263,7 @@ export interface FormItemsRendererProps<Values = any> {
   /** 自动生成必填规则，默认 true */
   useAutoGenerateRequired?: boolean;
   /** 初始值，用于在表单未初始化时提供默认值 */
-  initialValues?: Values;
+  initialValues?: DeepPartial<Values>;
   /** 栅格间距，继承自 FormBuilder */
   gutter?: Gutter | [Gutter, Gutter];
   /** label 栅格配置，继承自 FormBuilder */

package/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;
 }

package/enum/formItemRender/index.js

@@ -1 +1 @@
-const e={INPUT:"input",TEXTAREA:"textarea",INPUT_NUMBER:"inputNumber",NUMBER:"number",INTEGER:"number",SELECT:"select",RADIO:"radio",CHECKBOX:"checkbox",DATE:"date",DATE_MONTH:"dateMonth",DATE_YEAR:"dateYear",DATE_WEEK:"dateWeek",DATE_RANGE:"dateRange",DATETIME:"datetime",DATETIME_RANGE:"datetimeRange",DIVIDER:"divider",FORM_LIST:"formList"};export{e as FORM_ITEM_RENDER_ENUM};
+const e={INPUT:"input",TEXTAREA:"textarea",INPUT_NUMBER:"inputNumber",NUMBER:"number",INTEGER:"integer",SELECT:"select",RADIO:"radio",CHECKBOX:"checkbox",DATE:"date",DATE_MONTH:"dateMonth",DATE_YEAR:"dateYear",DATE_WEEK:"dateWeek",DATE_RANGE:"dateRange",DATETIME:"datetime",DATETIME_RANGE:"datetimeRange",DIVIDER:"divider",FORM_LIST:"formList"};export{e as FORM_ITEM_RENDER_ENUM};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zy-react-library",
   "private": false,
-  "version": "1.3.18",
+  "version": "1.3.19",
   "type": "module",
   "description": "",
   "author": "LiuJiaNan",