zy-react-library 1.2.38 → 1.3.0

package/components/Cascader/Area/index.d.ts

@@ -1,11 +1,20 @@
 import type { FC } from "react";
 import type { BasicCascaderProps } from "../Basic";
 
+interface Data {
+  value: string;
+  label: string;
+  children: Data[];
+}
+
 /**
  * 组件属性
  */
-export interface AreaCascaderProps extends Omit<BasicCascaderProps, "options" | "placeholder" | "nameKey" | "idKey" | "childrenKey"> {
-
+export interface AreaCascaderProps extends Omit<BasicCascaderProps, "options" | "placeholder" | "nameKey" | "idKey" | "childrenKey" | "onGetNodePaths" | "onGetData"> {
+  /** 获取父级节点 */
+  onGetNodePaths?: (nodes: Data[]) => void;
+  /** 获取数据 */
+  onGetData?: (data: Data[], processedData: Data[]) => void;
 }
 
 /**

package/components/Cascader/Dictionary/index.d.ts

@@ -1,10 +1,17 @@
 import type { FC } from "react";
 import type { BasicCascaderProps } from "../Basic";
 
+interface Data {
+  dictValue: string;
+  dictLabel: string;
+  children: Data[];
+  [key: string]: any;
+}
+
 /**
  * 组件属性
  */
-export interface DictionaryCascaderProps extends Omit<BasicCascaderProps, "options" | "nameKey" | "idKey" | "childrenKey"> {
+export interface DictionaryCascaderProps extends Omit<BasicCascaderProps, "options" | "nameKey" | "idKey" | "childrenKey" | "onGetNodePaths" | "onGetData"> {
   /** appKey，默认 DICTIONARY_APP_KEY_ENUM.DEFAULT（0bb989ecada5470c87635018ece9f327） */
   appKey?: string;
   /** 要获取的字典 */
@@ -13,6 +20,10 @@ export interface DictionaryCascaderProps extends Omit<BasicCascaderProps, "optio
   nameKey?: string;
   /** 树形数据 value 字段，默认 dictValue */
   idKey?: string;
+  /** 获取父级节点 */
+  onGetNodePaths?: (nodes: Data[]) => void;
+  /** 获取数据 */
+  onGetData?: (data: Data[], processedData: Data[]) => void;
 }
 
 /**

package/components/Cascader/Industry/index.d.ts

@@ -1,11 +1,20 @@
 import type { FC } from "react";
 import type { BasicCascaderProps } from "../Basic";
 
+interface Data {
+  dict_value: string;
+  dict_label: string;
+  childrenList: Data[];
+}
+
 /**
  * 组件属性
  */
-export interface IndustryCascaderProps extends Omit<BasicCascaderProps, "options" | "placeholder" | "nameKey" | "idKey" | "childrenKey"> {
-
+export interface IndustryCascaderProps extends Omit<BasicCascaderProps, "options" | "placeholder" | "nameKey" | "idKey" | "childrenKey" | "onGetNodePaths" | "onGetData"> {
+  /** 获取父级节点 */
+  onGetNodePaths?: (nodes: Data[]) => void;
+  /** 获取数据 */
+  onGetData?: (data: Data[], processedData: Data[]) => void;
 }
 
 /**

package/components/FormBuilder/FormBuilder.d.ts

@@ -1,17 +1,23 @@
 import type { FormInstance, FormProps } from "antd/es/form";
 import type { Gutter } from "antd/es/grid/row";
-import type { Store } from "rc-field-form/lib/interface";
-import type { FC, ReactNode } from "react";
+import type { ReactElement, ReactNode } from "react";
 import type { FormOption } from "./FormItemsRenderer";
 
+/**
+ * 深度部分类型，将所有嵌套属性都变为可选
+ */
+export type DeepPartial<T> = T extends object
+  ? { [P in keyof T]?: DeepPartial<T[P]> }
+  : T;
+
 /**
  * FormBuilder 组件属性
  */
-export interface FormBuilderProps extends Omit<FormProps, "form"> {
+export interface FormBuilderProps<Values = any> extends Omit<FormProps, "form" | "onFinish"> {
   /** 表单初始值 */
-  values?: Store;
+  values?: DeepPartial<Values>;
   /** 表单配置项数组 */
-  options: FormOption[];
+  options: FormOption<Values>[];
   /** 栅格间距，默认 24 */
   gutter?: Gutter | [Gutter, Gutter];
   /** 占据栅格列数，默认 12 */
@@ -35,15 +41,21 @@ export interface FormBuilderProps extends Omit<FormProps, "form"> {
   /** 是否处于加载状态，默认 false */
   loading?: boolean;
   /** 表单实例（通过 Form.useForm() 创建） */
-  form: FormInstance;
+  form: FormInstance<Values>;
+  /** 表单提交时的回调函数 */
+  onFinish?: (values: Values) => void;
 }
 
 /**
  * 表单构建器组件
  */
-declare const FormBuilder: FC<FormBuilderProps> & {
+type FormBuilderComponent = {
   useForm: typeof import("antd").Form.useForm;
   useWatch: typeof import("antd").Form.useWatch;
+} & {
+  <Values = any>(props: FormBuilderProps<Values>): ReactElement;
 };
 
+declare const FormBuilder: FormBuilderComponent;
+
 export default FormBuilder;

package/components/FormBuilder/FormItemsRenderer.d.ts

@@ -2,13 +2,10 @@ import type { ColProps } from "antd/es/col";
 import type { FormItemProps, Rule } from "antd/es/form";
 import type { FormListFieldData } from "antd/es/form/FormList";
 import type { Gutter } from "antd/es/grid/row";
-import type { Store } from "rc-field-form/lib/interface";
-import type { FC, ReactNode } from "react";
+import type { NamePath, Store } from "rc-field-form/lib/interface";
+import type { ReactElement, ReactNode } from "react";
 import type { FORM_ITEM_RENDER_TYPE_MAP } from "../../enum/formItemRender";
 
-/** 表单项 name */
-export type FormFieldName = string | number | (string | number)[];
-
 /**
  * 选择项数据类型
  */
@@ -61,7 +58,7 @@ export interface FormListUniqueProps {
   /** 删除按钮的文本，默认 '删除' */
   removeButtonText?: string;
   /** 表单配置项 */
-  options: (field: FormListFieldData, fieldIndex: number, operations: FormListOperations) => FormOption[];
+  options: (field: FormListFieldData, fieldIndex: number, operations: FormListOperations) => FormListOption[];
   /** 点击新增按钮时的默认值 */
   addDefaultValue?: Store;
   /** 点击新增按钮时插入的索引位置 */
@@ -76,74 +73,74 @@ type WhenTrue<Condition extends boolean, T> = Condition extends true ? never : T
 /**
  * 表单配置项属性类型辅助工具
  */
-type FormOptionProperty<O extends boolean, C extends boolean, T> = WhenTrue<O, WhenTrue<C, T>>;
+type FormOptionProperty<IsOnlyForLabel extends boolean, IsCustomizeRender extends boolean, T> = WhenTrue<IsOnlyForLabel, WhenTrue<IsCustomizeRender, T>>;
 
 /**
  * 表单配置项公共字段
  */
-export interface FormOptionBase<O extends boolean = false, C extends boolean = false> {
+export interface FormOptionBase<Values = any, IsOnlyForLabel extends boolean = false, IsCustomizeRender extends boolean = false, Name = NamePath<Values>> {
   /** React 需要的 key，如果传递了唯一的 name，则不需要 */
   key?: string;
   /** 表单项字段名 */
-  name?: FormFieldName;
+  name?: Name;
   /** 表单项标签 */
   label?: ReactNode;
   /** 占据栅格列数，默认 12 */
-  span?: WhenTrue<O, number | string>;
+  span?: WhenTrue<IsOnlyForLabel, number | string>;
   /** 是否必填，默认 true，支持函数动态计算 */
-  required?: FormOptionProperty<O, C, boolean | ((formValues: Store) => boolean)>;
+  required?: FormOptionProperty<IsOnlyForLabel, IsCustomizeRender, boolean | ((formValues: Values) => boolean)>;
   /** 验证规则 */
-  rules?: FormOptionProperty<O, C, Rule | Rule[]>;
+  rules?: FormOptionProperty<IsOnlyForLabel, IsCustomizeRender, Rule | Rule[]>;
   /** 是否使用字符验证限制 */
-  useConstraints?: FormOptionProperty<O, C, boolean>;
+  useConstraints?: FormOptionProperty<IsOnlyForLabel, IsCustomizeRender, boolean>;
   /** 占位符文本，默认会根据传入的 render 类型自动判断（请选择、请输入）和 label 组合 */
-  placeholder?: FormOptionProperty<O, C, ReactNode>;
+  placeholder?: FormOptionProperty<IsOnlyForLabel, IsCustomizeRender, ReactNode>;
   /** 提示信息，传入将在 label 右侧生成图标展示 tooltip */
-  tip?: FormOptionProperty<O, C, ReactNode>;
+  tip?: FormOptionProperty<IsOnlyForLabel, IsCustomizeRender, ReactNode>;
   /** 是否隐藏，默认 false，支持函数动态计算 */
-  hidden?: WhenTrue<O, boolean | ((formValues: Store) => boolean)>;
+  hidden?: WhenTrue<IsOnlyForLabel, boolean | ((formValues: Values) => boolean)>;
   /** 是否自定义渲染，完全交给外部控制渲染，默认 false */
-  customizeRender?: C;
+  customizeRender?: IsCustomizeRender;
   /** 传递给 Form.Item 的属性，支持函数动态计算 */
-  formItemProps?: FormOptionProperty<O, C, FormItemProps | ((formValues: Store) => FormItemProps)>;
+  formItemProps?: FormOptionProperty<IsOnlyForLabel, IsCustomizeRender, FormItemProps | ((formValues: Values) => FormItemProps)>;
   /** label 栅格配置，默认直接使用外层的 labelCol，如果 span 等于 24，是外层的 labelCol.span 一半 */
-  labelCol?: FormOptionProperty<O, C, ColProps>;
+  labelCol?: FormOptionProperty<IsOnlyForLabel, IsCustomizeRender, ColProps>;
   /** wrapper 栅格配置，默认 24 - labelCol.span */
-  wrapperCol?: FormOptionProperty<O, C, ColProps>;
+  wrapperCol?: FormOptionProperty<IsOnlyForLabel, IsCustomizeRender, ColProps>;
   /** 是否应该更新（用于表单联动） */
-  shouldUpdate?: FormOptionProperty<O, C, boolean | ((prevValues: Store, nextValues: Store, info: { source?: string }) => boolean)>;
+  shouldUpdate?: FormOptionProperty<IsOnlyForLabel, IsCustomizeRender, boolean | ((prevValues: Values, nextValues: Values, info: { source?: string }) => boolean)>;
   /** 依赖字段（用于表单联动） */
-  dependencies?: FormOptionProperty<O, C, FormFieldName[]>;
+  dependencies?: FormOptionProperty<IsOnlyForLabel, IsCustomizeRender, Name[]>;
   /** 是否仅用于保存标签，不渲染到页面上，只在表单中保存数据，默认 false */
-  onlyForLabel?: O;
+  onlyForLabel?: IsOnlyForLabel;
 }
 
 /**
  * 按 render 类型区分的表单项
  */
-export type FormOptionByRender<R extends keyof FORM_ITEM_RENDER_TYPE_MAP, O extends boolean = false, C extends boolean = false> = FormOptionBase<O, C> & {
+export type FormOptionByRender<RenderType extends keyof FORM_ITEM_RENDER_TYPE_MAP, Values = any, IsOnlyForLabel extends boolean = false, IsCustomizeRender extends boolean = false, Name = NamePath<Values>> = FormOptionBase<Values, IsOnlyForLabel, IsCustomizeRender, Name> & {
   /** 渲染类型（写字面量时 componentProps 会按该类型推导） */
-  render: R;
+  render: RenderType;
   /** 传递给表单控件的属性，类型由 render 决定 */
-  componentProps?: FormOptionProperty<O, C, FORM_ITEM_RENDER_TYPE_MAP[R] | ((formValues: Store) => FORM_ITEM_RENDER_TYPE_MAP[R])>;
+  componentProps?: FormOptionProperty<IsOnlyForLabel, IsCustomizeRender, FORM_ITEM_RENDER_TYPE_MAP[RenderType] | ((formValues: Values) => FORM_ITEM_RENDER_TYPE_MAP[RenderType])>;
   /** 选项数据（用于 select、radio、checkbox） */
-  items?: FormOptionProperty<O, C, R extends "select" | "radio" | "checkbox" ? OptionItem[] : never>;
+  items?: FormOptionProperty<IsOnlyForLabel, IsCustomizeRender, RenderType extends "select" | "radio" | "checkbox" ? OptionItem[] : never>;
   /** 字段键配置 */
-  itemsField?: FormOptionProperty<O, C, R extends "select" | "radio" | "checkbox" ? ItemsFieldConfig : never>;
+  itemsField?: FormOptionProperty<IsOnlyForLabel, IsCustomizeRender, RenderType extends "select" | "radio" | "checkbox" ? ItemsFieldConfig : never>;
   /** checkbox 的栅格数量，如果不传入不使用栅格，传入才使用 */
-  checkboxCol?: FormOptionProperty<O, C, R extends "checkbox" ? number : never>;
+  checkboxCol?: FormOptionProperty<IsOnlyForLabel, IsCustomizeRender, RenderType extends "checkbox" ? number : never>;
   /** Form.List 独有的属性 */
-  formListUniqueProps?: FormOptionProperty<O, C, R extends "formList" ? FormListUniqueProps | ((formValues: Store) => FormListUniqueProps) : never>;
+  formListUniqueProps?: FormOptionProperty<IsOnlyForLabel, IsCustomizeRender, RenderType extends "formList" ? FormListUniqueProps | ((formValues: Values) => FormListUniqueProps) : never>;
 };
 
 /**
  * 不写 render 或 render 为 input 时的表单项（默认按输入框）
  */
-export type FormOptionDefault<O extends boolean = false, C extends boolean = false> = FormOptionBase<O, C> & {
+export type FormOptionDefault<Values = any, IsOnlyForLabel extends boolean = false, IsCustomizeRender extends boolean = false, Name = NamePath<Values>> = FormOptionBase<Values, IsOnlyForLabel, IsCustomizeRender, Name> & {
   /** 渲染类型，默认 input */
   render?: "input" | undefined;
   /** 传递给 Input 的属性 */
-  componentProps?: FORM_ITEM_RENDER_TYPE_MAP["input"] | ((formValues: Store) => FORM_ITEM_RENDER_TYPE_MAP["input"]);
+  componentProps?: FORM_ITEM_RENDER_TYPE_MAP["input"] | ((formValues: Values) => FORM_ITEM_RENDER_TYPE_MAP["input"]);
   /** 选项数据（用于 select、radio、checkbox），input 时不需要 */
   items?: never;
   /** 字段键配置，input 时不需要 */
@@ -157,7 +154,7 @@ export type FormOptionDefault<O extends boolean = false, C extends boolean = fal
 /**
  * 自定义渲染时的表单项（render 为 ReactNode 时使用）
  */
-export type FormOptionCustomRender<O extends boolean = false, C extends boolean = false> = FormOptionBase<O, C> & {
+export type FormOptionCustomRender<Values = any, IsOnlyForLabel extends boolean = false, IsCustomizeRender extends boolean = false, Name = NamePath<Values>> = FormOptionBase<Values, IsOnlyForLabel, IsCustomizeRender, Name> & {
   /** 渲染类型，默认 ReactNode */
   render: ReactNode;
   /** 传递给表单控件的属性，自定义渲染时不需要 */
@@ -173,25 +170,39 @@ export type FormOptionCustomRender<O extends boolean = false, C extends boolean
 };
 
 /**
- * 表单配置项
+ * 表单配置项（普通表单项）
+ */
+export type FormOption<Values = any>
+  = | FormOptionDefault<Values, false, false>
+    | FormOptionDefault<Values, false, true>
+    | FormOptionDefault<Values, true, false>
+    | { [K in keyof FORM_ITEM_RENDER_TYPE_MAP]: FormOptionByRender<K, Values, false, false> }[keyof FORM_ITEM_RENDER_TYPE_MAP]
+    | { [K in keyof FORM_ITEM_RENDER_TYPE_MAP]: FormOptionByRender<K, Values, false, true> }[keyof FORM_ITEM_RENDER_TYPE_MAP]
+    | { [K in keyof FORM_ITEM_RENDER_TYPE_MAP]: FormOptionByRender<K, Values, true, false> }[keyof FORM_ITEM_RENDER_TYPE_MAP]
+    | FormOptionCustomRender<Values, false, false>
+    | FormOptionCustomRender<Values, false, true>
+    | FormOptionCustomRender<Values, true, false>;
+
+/**
+ * Form.List 子项表单配置项（使用 [number, NamePath] 作为 name 类型）
  */
-export type FormOption
-  = | FormOptionDefault<false, false>
-    | FormOptionDefault<false, true>
-    | FormOptionDefault<true, false>
-    | { [K in keyof FORM_ITEM_RENDER_TYPE_MAP]: FormOptionByRender<K, false, false> }[keyof FORM_ITEM_RENDER_TYPE_MAP]
-    | { [K in keyof FORM_ITEM_RENDER_TYPE_MAP]: FormOptionByRender<K, false, true> }[keyof FORM_ITEM_RENDER_TYPE_MAP]
-    | { [K in keyof FORM_ITEM_RENDER_TYPE_MAP]: FormOptionByRender<K, true, false> }[keyof FORM_ITEM_RENDER_TYPE_MAP]
-    | FormOptionCustomRender<false, false>
-    | FormOptionCustomRender<false, true>
-    | FormOptionCustomRender<true, false>;
+export type FormListOption<Values = any>
+  = | FormOptionDefault<Values, false, false, [number, NamePath<Values>]>
+    | FormOptionDefault<Values, false, true, [number, NamePath<Values>]>
+    | FormOptionDefault<Values, true, false, [number, NamePath<Values>]>
+    | { [K in keyof FORM_ITEM_RENDER_TYPE_MAP]: FormOptionByRender<K, Values, false, false, [number, NamePath<Values>]> }[keyof FORM_ITEM_RENDER_TYPE_MAP]
+    | { [K in keyof FORM_ITEM_RENDER_TYPE_MAP]: FormOptionByRender<K, Values, false, true, [number, NamePath<Values>]> }[keyof FORM_ITEM_RENDER_TYPE_MAP]
+    | { [K in keyof FORM_ITEM_RENDER_TYPE_MAP]: FormOptionByRender<K, Values, true, false, [number, NamePath<Values>]> }[keyof FORM_ITEM_RENDER_TYPE_MAP]
+    | FormOptionCustomRender<Values, false, false, [number, NamePath<Values>]>
+    | FormOptionCustomRender<Values, false, true, [number, NamePath<Values>]>
+    | FormOptionCustomRender<Values, true, false, [number, NamePath<Values>]>;
 
 /**
  * FormItemsRenderer 组件属性
  */
-export interface FormItemsRendererProps {
+export interface FormItemsRendererProps<Values = any> {
   /** 表单配置项数组 */
-  options: FormOption[];
+  options: FormOption<Values>[];
   /** 默认栅格占据列数，默认 12 */
   span?: number;
   /** 是否折叠（仅显示前3项），默认 false */
@@ -199,7 +210,7 @@ export interface FormItemsRendererProps {
   /** 自动生成必填规则，默认 true */
   useAutoGenerateRequired?: boolean;
   /** 初始值，用于在表单未初始化时提供默认值 */
-  initialValues?: Store;
+  initialValues?: Values;
   /** 栅格间距，继承自 FormBuilder */
   gutter?: Gutter | [Gutter, Gutter];
   /** label 栅格配置，继承自 FormBuilder */
@@ -209,6 +220,6 @@ export interface FormItemsRendererProps {
 /**
  * 表单项渲染器组件
  */
-declare const FormItemsRenderer: FC<FormItemsRendererProps>;
+declare const FormItemsRenderer: <Values = any>(props: FormItemsRendererProps<Values>) => ReactElement;
 
 export default FormItemsRenderer;

package/components/FormBuilder/FormItemsRenderer.js

@@ -1 +1 @@
-import{InfoCircleOutlined as e}from"@ant-design/icons";import{Input as r,DatePicker as t,Form as n,Col as l,Divider as s,Row as a,Button as o,Checkbox as d,Radio as i,Select as u,InputNumber as p,Tooltip as c}from"antd";import m from"dayjs";import{FORM_ITEM_RENDER_ENUM as h}from"../../enum/formItemRender/index.js";import{jsx as y,Fragment as E,jsxs as b}from"react/jsx-runtime";const{TextArea:T}=r,{RangePicker:f}=t,I=({options:I,labelCol:v,gutter:A=24,span:R=12,collapse:Y=!1,useAutoGenerateRequired:D=!0,initialValues:C})=>{const N=n.useFormInstance(),w=()=>{const e=N.getFieldsValue();return 0===Object.keys(e).length&&C?C:e},P=e=>"function"==typeof e.componentProps?e.componentProps(w()):e.componentProps||{},U=e=>{const r="function"==typeof e.formItemProps?e.formItemProps(w()):e.formItemProps||{};return[h.DATE,h.DATE_MONTH,h.DATE_YEAR,h.DATETIME].includes(e.render)&&(r.getValueFromEvent=(e,r)=>r,r.getValueProps=e=>({value:e?m(e):void 0})),[h.DATE_WEEK].includes(e.render)&&(r.getValueFromEvent=(e,r)=>r,r.getValueProps=e=>({value:e?m(e,"YYYY-wo"):void 0})),[h.DATE_RANGE,h.DATETIME_RANGE].includes(e.render)&&(r.getValueFromEvent=(e,r)=>r,r.getValueProps=e=>({value:Array.isArray(e)?e.map(e=>e?m(e):void 0):void 0})),r},M=e=>"function"==typeof e?e(w()):e??!0,x=e=>{if(e.render===h.DIVIDER)return[];const r=[];switch(e.render||h.INPUT){case h.INPUT:!1!==e.useConstraints&&r.push({max:50,message:"最多输入50字符"});break;case h.TEXTAREA:!1!==e.useConstraints&&r.push({max:500,message:"最多输入500字符"});break;case h.INPUT_NUMBER:case h.NUMBER:!1!==e.useConstraints&&r.push({pattern:/^(\d+)(\.\d{1,2})?$/,message:"请输入正确的数字，最多保留两位小数"}),!1!==e.useConstraints&&r.push({validator:(e,r)=>r&&Math.abs(Number.parseFloat(r))>999999999?Promise.reject("输入数值超出安全范围"):Promise.resolve()});break;case h.INTEGER:!1!==e.useConstraints&&r.push({pattern:/^(\d+)$/,message:"请输入正确的整数"}),!1!==e.useConstraints&&r.push({validator:(e,r)=>r&&Math.abs(Number.parseFloat(r))>999999999?Promise.reject("输入数值超出安全范围"):Promise.resolve()})}if(!D)return e.rules?Array.isArray(e.rules)?[...e.rules,...r]:[e.rules,...r]:r;if(M(e.required)){const t=!e.render||[h.INPUT,h.TEXTAREA,h.INPUT_NUMBER,h.NUMBER,h.INTEGER].includes(e.render);return r.push({required:!0,message:`${t?"请输入":"请选择"}${e.label}`}),e.rules&&(Array.isArray(e.rules)?r.push(...e.rules):r.push(e.rules)),r}return e.rules?Array.isArray(e.rules)?[...e.rules,...r]:[e.rules,...r]:r},g=e=>e.key||e.name,B=e=>{const r=e.render===h.DIVIDER?24:e.span??R,t=e.labelCol??(24===r?{span:v.span/2}:v);return{span:r,labelCol:t,wrapperCol:e.wrapperCol??{span:24-t.span}}},_=(e,r)=>({value:e[r.valueKey],label:"function"==typeof r.labelKey?r.labelKey(e):e[r.labelKey],disabled:e.disabled}),k=e=>{const n=P(e),s=(e=>({valueKey:e?.itemsField?.valueKey||"bianma",labelKey:e?.itemsField?.labelKey||"name"}))(e),o=e.render||h.INPUT,c=e.placeholder||`请${[h.INPUT,h.TEXTAREA,h.INPUT_NUMBER,h.NUMBER,h.INTEGER].includes(o)?"输入":"选择"}${e.label}`;switch(o){case h.INPUT:return y(r,{placeholder:c,maxLength:!1!==e.useConstraints?50:9999,...n});case h.TEXTAREA:return y(T,{placeholder:c,maxLength:!1!==e.useConstraints?500:9999,showCount:!0,rows:3,...n});case h.INPUT_NUMBER:case h.NUMBER:case h.INTEGER:return y(p,{placeholder:c,style:{width:"100%"},...n});case h.SELECT:return y(u,{placeholder:c,showSearch:!0,allowClear:!0,optionFilterProp:"children",...n,children:(e.items||[]).map(e=>{const{value:r,label:t,disabled:n}=_(e,s);return y(u.Option,{value:r,disabled:n,children:t},r)})});case h.RADIO:return y(i.Group,{...n,children:(e.items||[]).map(e=>{const{value:r,label:t,disabled:n}=_(e,s);return y(i,{value:r,disabled:n,children:t},r)})});case h.CHECKBOX:return y(d.Group,{...n,children:e.checkboxCol?y(a,{children:(e.items||[]).map(r=>{const{value:t,label:n,disabled:a}=_(r,s);return y(l,{span:e.checkboxCol,children:y(d,{value:t,disabled:a,children:n})},t)})}):(e.items||[]).map(e=>{const{value:r,label:t,disabled:n}=_(e,s);return y(d,{value:r,disabled:n,children:t},r)})});case h.DATE:return y(t,{placeholder:c,format:"YYYY-MM-DD",style:{width:"100%"},...n});case h.DATE_MONTH:return y(t,{picker:"month",placeholder:c,format:"YYYY-MM",style:{width:"100%"},...n});case h.DATE_YEAR:return y(t,{picker:"year",placeholder:c,format:"YYYY",style:{width:"100%"},...n});case h.DATE_WEEK:return y(t,{picker:"week",placeholder:c,format:"YYYY-wo",style:{width:"100%"},...n});case h.DATE_RANGE:return y(f,{placeholder:[`请选择开始${e.label}`,`请选择结束${e.label}`],format:"YYYY-MM-DD",style:{width:"100%"},...n});case h.DATETIME:return y(t,{showTime:!0,placeholder:c,format:"YYYY-MM-DD HH:mm:ss",style:{width:"100%"},...n});case h.DATETIME_RANGE:return y(f,{showTime:!0,placeholder:[`请选择开始${e.label}`,`请选择结束${e.label}`],format:"YYYY-MM-DD HH:mm:ss",style:{width:"100%"},...n});case h.DIVIDER:return null;default:return o}},V=r=>r.tip?b(E,{children:[r.label,y(c,{title:r.tip,children:y(e,{style:{marginLeft:4,fontSize:12}})})]}):r.label,F=({option:e,style:r,col:t,index:s})=>{const a=U(e);return delete a.dependencies,delete a.shouldUpdate,("function"==typeof(o=e.hidden)?o(w()):o)?null:y(l,{span:t.span,style:r,children:y(n.Item,{name:e.name,label:V(e),rules:x(e),labelCol:t.labelCol,wrapperCol:t.wrapperCol,preserve:!1,...a,children:k(e)})},g(e)||s);var o},$=({option:e,style:r,col:t,index:a})=>{const o=P(e);return e.customizeRender?y(l,{span:t.span,style:r,children:e.render},g(e)||a):e.onlyForLabel?y(n.Item,{name:e.name,noStyle:!0,preserve:!1,children:y("input",{type:"hidden"})},g(e)||a):e.render===h.DIVIDER?y(l,{span:t.span,style:r,children:y(s,{orientation:"left",...o,children:e.label})},g(e)||a):null};return y(E,{children:I.map((e,r)=>{const t=B(e),s=(e=>Y&&e>=3?{display:"none"}:void 0)(r),d=U(e);return $({option:e,style:s,col:t,index:r})||(e.render===h.FORM_LIST?((e,r,t,s)=>{const d=(e=>{const r={showAddButton:!0,showRemoveButton:!0,addButtonText:"添加",removeButtonText:"删除",options:[],addDefaultValue:{},addInsertIndex:void 0};return"function"==typeof e.formListUniqueProps?{...r,...e.formListUniqueProps(w())}:{...r,...e.formListUniqueProps||{}}})(e),i=P(e);return y(l,{span:t.span,style:s,children:y(n.List,{name:e.name,...i,children:(e,{add:r,remove:t,move:i})=>y(E,{children:e.map((e,u)=>{const p=((e,r,t,n,l,s)=>"function"==typeof e?e(r,t,{field:r,fieldIndex:t,add:n,remove:l,move:s}):e??[])(d.options,e,u,r,t,i);return y(a,{gutter:A,children:p.map((a,i)=>{const c=B(a),m=U(a);delete m.dependencies,delete m.shouldUpdate;const h={option:a,style:s,col:c,index:`${u}_${i}`};return $(h)||(i===p.length-1?y(l,{span:c.span,style:s,children:y(n.Item,{label:V(a),labelCol:c.labelCol,wrapperCol:c.wrapperCol,preserve:!1,required:M(a.required),...m,children:b("div",{style:{display:"flex",gap:10,alignItems:"center",justifyContent:"space-between"},children:[y("div",{style:{flex:1},children:y(n.Item,{noStyle:!0,rules:x(a),name:a.name,children:k(a)})}),u>=1?d.showRemoveButton&&y(o,{type:"primary",danger:!0,onClick:()=>t(e.name),children:d.removeButtonText}):d.showAddButton&&y(o,{type:"primary",onClick:()=>r(d.addDefaultValue,d.addInsertIndex),children:d.addButtonText})]})})},g(a)||i):F(h))})},e.key)})})})},g(e)||r)})(e,r,t,s):(e.shouldUpdate??e.dependencies)||(d.shouldUpdate??d.dependencies)?((e,r,t,l)=>{const s=U(e);return y(n.Item,{noStyle:!0,preserve:!1,shouldUpdate:e.shouldUpdate??s.shouldUpdate,dependencies:e.dependencies??s.dependencies,children:()=>F({option:e,style:t,col:l,index:r})},g(e)||r)})(e,r,s,t):F({option:e,style:s,col:t,index:r}))})})};I.displayName="FormItemsRenderer";export{I as default};
+import{InfoCircleOutlined as e}from"@ant-design/icons";import{Input as r,DatePicker as n,Form as t,Col as l,Divider as s,Row as a,Button as o,Checkbox as d,Radio as i,Select as u,InputNumber as p,Tooltip as c}from"antd";import m from"dayjs";import{FORM_ITEM_RENDER_ENUM as h}from"../../enum/formItemRender/index.js";import{jsx as y,Fragment as E,jsxs as f}from"react/jsx-runtime";const{TextArea:T}=r,{RangePicker:b}=n,I=({options:I,labelCol:v,gutter:A=24,span:R=12,collapse:Y=!1,useAutoGenerateRequired:D=!0,initialValues:C})=>{const N=t.useFormInstance(),w=()=>{const e=N.getFieldsValue();return 0===Object.keys(e).length&&C?C:e},M=e=>"function"==typeof e.componentProps?e.componentProps(w()):e.componentProps||{},P=e=>{const r="function"==typeof e.formItemProps?e.formItemProps(w()):e.formItemProps||{};return[h.DATE,h.DATE_MONTH,h.DATE_YEAR,h.DATETIME].includes(e.render)&&(r.getValueFromEvent=(e,r)=>r,r.getValueProps=e=>({value:e?m(e):void 0})),[h.DATE_WEEK].includes(e.render)&&(r.getValueFromEvent=(e,r)=>r,r.getValueProps=e=>({value:e?m(e,"YYYY-wo"):void 0})),[h.DATE_RANGE,h.DATETIME_RANGE].includes(e.render)&&(r.getValueFromEvent=(e,r)=>r,r.getValueProps=e=>({value:Array.isArray(e)?e.map(e=>e?m(e):void 0):void 0})),r},U=e=>"function"==typeof e?e(w()):e??!0,x=e=>{if(e.render===h.DIVIDER)return[];const r=[];switch(e.render||h.INPUT){case h.INPUT:!1!==e.useConstraints&&r.push({max:50,message:"最多输入50字符"});break;case h.TEXTAREA:!1!==e.useConstraints&&r.push({max:500,message:"最多输入500字符"});break;case h.INPUT_NUMBER:case h.NUMBER:!1!==e.useConstraints&&r.push({pattern:/^(\d+)(\.\d{1,2})?$/,message:"请输入正确的数字，最多保留两位小数"}),!1!==e.useConstraints&&r.push({validator:(e,r)=>r&&Math.abs(Number.parseFloat(r))>999999999?Promise.reject("输入数值超出安全范围"):Promise.resolve()});break;case h.INTEGER:!1!==e.useConstraints&&r.push({pattern:/^(\d+)$/,message:"请输入正确的整数"}),!1!==e.useConstraints&&r.push({validator:(e,r)=>r&&Math.abs(Number.parseFloat(r))>999999999?Promise.reject("输入数值超出安全范围"):Promise.resolve()})}if(!D)return e.rules?Array.isArray(e.rules)?[...e.rules,...r]:[e.rules,...r]:r;if(U(e.required)){const n=!e.render||[h.INPUT,h.TEXTAREA,h.INPUT_NUMBER,h.NUMBER,h.INTEGER].includes(e.render);return r.push({required:!0,message:`${n?"请输入":"请选择"}${e.label}`}),e.rules&&(Array.isArray(e.rules)?r.push(...e.rules):r.push(e.rules)),r}return e.rules?Array.isArray(e.rules)?[...e.rules,...r]:[e.rules,...r]:r},g=e=>e.key||e.name,_=e=>{const r=e.render===h.DIVIDER?24:e.span??R,n=e.labelCol??(24===r?{span:v.span/2}:v);return{span:r,labelCol:n,wrapperCol:e.wrapperCol??{span:24-n.span}}},B=e=>"function"==typeof e?e(w()):e??!1,F=(e,r)=>({value:e[r.valueKey],label:"function"==typeof r.labelKey?r.labelKey(e):e[r.labelKey],disabled:e.disabled}),k=e=>{const t=M(e),s=(e=>({valueKey:e?.itemsField?.valueKey||"bianma",labelKey:e?.itemsField?.labelKey||"name"}))(e),o=e.render??h.INPUT,c=e.placeholder??`请${[h.INPUT,h.TEXTAREA,h.INPUT_NUMBER,h.NUMBER,h.INTEGER].includes(o)?"输入":"选择"}${e.label}`;switch(o){case h.INPUT:return y(r,{placeholder:c,maxLength:!1!==e.useConstraints?50:9999,...t});case h.TEXTAREA:return y(T,{placeholder:c,maxLength:!1!==e.useConstraints?500:9999,showCount:!0,rows:3,...t});case h.INPUT_NUMBER:case h.NUMBER:case h.INTEGER:return y(p,{placeholder:c,style:{width:"100%"},...t});case h.SELECT:return y(u,{placeholder:c,showSearch:!0,allowClear:!0,optionFilterProp:"children",...t,children:(e.items||[]).map(e=>{const{value:r,label:n,disabled:t}=F(e,s);return y(u.Option,{value:r,disabled:t,children:n},r)})});case h.RADIO:return y(i.Group,{...t,children:(e.items||[]).map(e=>{const{value:r,label:n,disabled:t}=F(e,s);return y(i,{value:r,disabled:t,children:n},r)})});case h.CHECKBOX:return y(d.Group,{...t,children:e.checkboxCol?y(a,{children:(e.items||[]).map(r=>{const{value:n,label:t,disabled:a}=F(r,s);return y(l,{span:e.checkboxCol,children:y(d,{value:n,disabled:a,children:t})},n)})}):(e.items||[]).map(e=>{const{value:r,label:n,disabled:t}=F(e,s);return y(d,{value:r,disabled:t,children:n},r)})});case h.DATE:return y(n,{placeholder:c,format:"YYYY-MM-DD",style:{width:"100%"},...t});case h.DATE_MONTH:return y(n,{picker:"month",placeholder:c,format:"YYYY-MM",style:{width:"100%"},...t});case h.DATE_YEAR:return y(n,{picker:"year",placeholder:c,format:"YYYY",style:{width:"100%"},...t});case h.DATE_WEEK:return y(n,{picker:"week",placeholder:c,format:"YYYY-wo",style:{width:"100%"},...t});case h.DATE_RANGE:return y(b,{placeholder:[`请选择开始${e.label}`,`请选择结束${e.label}`],format:"YYYY-MM-DD",style:{width:"100%"},...t});case h.DATETIME:return y(n,{showTime:!0,placeholder:c,format:"YYYY-MM-DD HH:mm:ss",style:{width:"100%"},...t});case h.DATETIME_RANGE:return y(b,{showTime:!0,placeholder:[`请选择开始${e.label}`,`请选择结束${e.label}`],format:"YYYY-MM-DD HH:mm:ss",style:{width:"100%"},...t});case h.DIVIDER:return null;default:return o}},L=r=>r.tip?f(E,{children:[r.label,y(c,{title:r.tip,children:y(e,{style:{marginLeft:4,fontSize:12}})})]}):r.label,V=({option:e,style:r,col:n,index:s})=>{const a=P(e);return delete a.dependencies,delete a.shouldUpdate,B(e.hidden)?null:y(l,{span:n.span,style:r,children:y(t.Item,{name:e.name,label:L(e),rules:x(e),labelCol:n.labelCol,wrapperCol:n.wrapperCol,preserve:!1,required:" "!==L(e)&&U(e.required),colon:" "!==L(e),...a,children:k(e)})},g(e)||s)},$=({option:e,style:r,col:n,index:a})=>{const o=M(e);return e.customizeRender?y(l,{span:n.span,style:r,children:e.render},g(e)||a):e.onlyForLabel?y(t.Item,{name:e.name,noStyle:!0,preserve:!1,children:y("input",{type:"hidden"})},g(e)||a):e.render===h.DIVIDER?y(l,{span:n.span,style:r,children:y(s,{orientation:"left",...o,children:e.label})},g(e)||a):null},G=({option:e,index:r,col:n,style:s})=>{const d=(e=>{const r={showAddButton:!0,showRemoveButton:!0,addButtonText:"添加",removeButtonText:"删除",options:[],addDefaultValue:{},addInsertIndex:void 0};return"function"==typeof e.formListUniqueProps?{...r,...e.formListUniqueProps(w())}:{...r,...e.formListUniqueProps||{}}})(e),i=M(e);return y(l,{span:n.span,style:s,children:y(t.List,{name:e.name,...i,children:(e,{add:r,remove:n,move:i})=>y(E,{children:e.map((e,u)=>{const p=((e,r,n,t,l,s)=>"function"==typeof e?e(r,n,{field:r,fieldIndex:n,add:t,remove:l,move:s}):e??[])(d.options,e,u,r,n,i);return y(a,{gutter:A,children:p.map((a,i)=>{if(B(a.hidden))return null;const c=_(a),m=P(a),E={option:a,style:s,col:c,index:`${u}_${i}`},T=$(E);if(T)return T;if(a.render===h.FORM_LIST)return G(E);const b=e=>!B(e.hidden)&&!e.onlyForLabel,I=p[i+1],v=I&&I.render===h.FORM_LIST,A=I&&!b(I);return i===(()=>{for(let e=p.length-1;e>=0;e--){const r=p[e];if(r.render===h.FORM_LIST)return e;if(b(r))return e}return-1})()||v||A?(delete m.dependencies,delete m.shouldUpdate,y(l,{span:c.span,style:s,children:y(t.Item,{label:L(a),labelCol:c.labelCol,wrapperCol:c.wrapperCol,preserve:!1,required:" "!==L(a)&&U(a.required),colon:" "!==L(a),...m,children:f("div",{style:{display:"flex",gap:10,alignItems:"center",justifyContent:"space-between"},children:[y("div",{style:{flex:1},children:y(t.Item,{noStyle:!0,rules:x(a),name:a.name,children:k(a)})}),u>=1?d.showRemoveButton&&y(o,{type:"primary",danger:!0,onClick:()=>n(e.name),children:d.removeButtonText}):d.showAddButton&&y(o,{type:"primary",onClick:()=>r(d.addDefaultValue,d.addInsertIndex),children:d.addButtonText})]})})},g(a)||i)):V(E)})},e.key)})})})},g(e)||r)};return y(E,{children:I.map((e,r)=>{const n=_(e),l=(e=>Y&&e>=3?{display:"none"}:void 0)(r),s=P(e),a={option:e,style:l,col:n,index:r};return $(a)||(e.render===h.FORM_LIST?G(a):(e.shouldUpdate??e.dependencies)||(s.shouldUpdate??s.dependencies)?(({option:e,index:r,style:n,col:l})=>{const s=P(e);return y(t.Item,{noStyle:!0,preserve:!1,shouldUpdate:e.shouldUpdate??s.shouldUpdate,dependencies:e.dependencies??s.dependencies,children:()=>V({option:e,style:n,col:l,index:r})},g(e)||r)})(a):V(a))})})};I.displayName="FormItemsRenderer";export{I as default};

package/components/FormBuilder/index.d.ts

@@ -1,3 +1,6 @@
+import type { FormOption } from "./FormItemsRenderer";
 import FormBuilder from "./FormBuilder";
 
+export type { FormOption };
+
 export default FormBuilder;

package/components/LeftTree/Area/index.d.ts

@@ -1,11 +1,21 @@
 import type { FC } from "react";
 import type { BasicLeftTreeProps } from "../Basic";
 
+interface Data {
+  value: string;
+  label: string;
+  children: Data[];
+  [key: string]: any;
+}
+
 /**
  * 组件属性
  */
-export interface AreaLeftTreeProps extends Omit<BasicLeftTreeProps, "treeData" | "nameKey" | "idKey" | "childrenKey"> {
-
+export interface AreaLeftTreeProps extends Omit<BasicLeftTreeProps, "treeData" | "nameKey" | "idKey" | "childrenKey" | "onGetNodePaths" | "onGetData"> {
+  /** 获取父级节点 */
+  onGetNodePaths?: (nodes: Data[]) => void;
+  /** 获取数据 */
+  onGetData?: (data: Data[], processedData: Data[]) => void;
 }
 
 /**

package/components/LeftTree/Department/Gwj/index.d.ts

@@ -2,14 +2,25 @@ import type { FC } from "react";
 import type { DepartmentSelectTreeProps } from "../../../SelectTree/Department/Gwj";
 import type { BasicLeftTreeProps } from "../../Basic";
 
+interface Data {
+  id: string;
+  name: string;
+  childrenList: Data[];
+  [key: string]: any;
+}
+
 /**
  * 组件属性
  */
-export interface DepartmentLeftTreeProps extends Omit<BasicLeftTreeProps, "treeData" | "nameKey" | "idKey" | "childrenKey"> {
+export interface DepartmentLeftTreeProps extends Omit<BasicLeftTreeProps, "treeData" | "nameKey" | "idKey" | "childrenKey" | "onGetNodePaths" | "onGetData"> {
   /** 请求参数 */
   params?: DepartmentSelectTreeProps["params"];
   /** 查询的企业类型 */
   searchType?: DepartmentSelectTreeProps["searchType"];
+  /** 获取父级节点 */
+  onGetNodePaths?: (nodes: Data[]) => void;
+  /** 获取数据 */
+  onGetData?: (data: Data[], processedData: Data[]) => void;
 }
 
 /**

package/components/LeftTree/Dictionary/index.d.ts

@@ -1,10 +1,17 @@
 import type { FC } from "react";
 import type { BasicLeftTreeProps } from "../Basic";
 
+interface Data {
+  dictValue: string;
+  dictLabel: string;
+  children: Data[];
+  [key: string]: any;
+}
+
 /**
  * 组件属性
  */
-export interface DictionaryLeftTreeProps extends Omit<BasicLeftTreeProps, "treeData" | "nameKey" | "idKey" | "childrenKey"> {
+export interface DictionaryLeftTreeProps extends Omit<BasicLeftTreeProps, "treeData" | "nameKey" | "idKey" | "childrenKey" | "onGetNodePaths" | "onGetData"> {
   /** appKey，默认 DICTIONARY_APP_KEY_ENUM.DEFAULT（0bb989ecada5470c87635018ece9f327） */
   appKey?: string;
   /** 要获取的字典 */
@@ -13,6 +20,10 @@ export interface DictionaryLeftTreeProps extends Omit<BasicLeftTreeProps, "treeD
   nameKey?: string;
   /** 树形数据 value 字段，默认 dictValue */
   idKey?: string;
+  /** 获取父级节点 */
+  onGetNodePaths?: (nodes: Data[]) => void;
+  /** 获取数据 */
+  onGetData?: (data: Data[], processedData: Data[]) => void;
 }
 
 /**

package/components/Page/index.d.ts

@@ -25,7 +25,7 @@ export interface PageProps {
   /** 额外底部操作按钮组 */
   extraActionButtons?: ReactNode;
   /** 内容区域 */
-  children?: ReactNode | (() => ReactNode);
+  children: ReactNode | (() => ReactNode);
 }
 
 /** 页面布局组件 */

package/components/Search/index.d.ts

@@ -1,22 +1,24 @@
 import type { FormInstance, FormProps } from "antd/es/form";
-import type { Store } from "rc-field-form/lib/interface";
-import type { FC, ReactNode } from "react";
-import type { FormOption } from "../FormBuilder/FormItemsRenderer";
+import type { ReactElement, ReactNode } from "react";
+import type { FormOption } from "../FormBuilder";
+import type { DeepPartial } from "../FormBuilder/FormBuilder";
+
+export type { FormOption };
 
 /**
  * Search 组件属性
  */
-export interface SearchProps extends Omit<FormProps, "form" | "onFinish"> {
+export interface SearchProps<Values = any> extends Omit<FormProps, "form" | "onFinish" | "onReset"> {
   /** 表单配置项数组 */
-  options: FormOption[];
+  options: FormOption<Values>[];
   /** 表单值 */
-  values?: Store;
+  values?: DeepPartial<Values>;
   /** 搜索和重置都会触发的回调 */
-  onFinish?: (values: Store, type: "submit" | "reset") => void;
+  onFinish?: (values: Values, type: "submit" | "reset") => void;
   /** 搜索回调 */
-  onSubmit?: (values: Store) => void;
+  onSubmit?: (values: Values) => void;
   /** 重置回调 */
-  onReset?: (values: Store) => void;
+  onReset?: (values: Values) => void;
   /** 搜索按钮文本，默认"搜索" */
   searchText?: string;
   /** 重置按钮文本，默认"重置" */
@@ -28,16 +30,20 @@ export interface SearchProps extends Omit<FormProps, "form" | "onFinish"> {
   /** 额外的底部按钮组 */
   extraButtons?: ReactNode;
   /** 表单实例（通过 Form.useForm() 创建） */
-  form: FormInstance;
+  form: FormInstance<Values>;
 }
 
 /**
  * 搜索表单组件
  * 支持自动展开/收起功能，当表单项超过4个时显示展开/收起按钮
  */
-declare const Search: FC<SearchProps> & {
+type SearchComponent = {
   useForm: typeof import("antd").Form.useForm;
   useWatch: typeof import("antd").Form.useWatch;
+} & {
+  <Values = any>(props: SearchProps<Values>): ReactElement;
 };
 
+declare const Search: SearchComponent;
+
 export default Search;

package/components/Select/Dictionary/index.d.ts

@@ -1,10 +1,16 @@
 import type { FC } from "react";
 import type { BasicSelectProps } from "../Basic";
 
+interface Data {
+  dictValue: string;
+  dictLabel: string;
+  [key: string]: any;
+}
+
 /**
  * 组件属性
  */
-export interface DictionarySelectProps extends Omit<BasicSelectProps, "data" | "nameKey" | "idKey"> {
+export interface DictionarySelectProps extends Omit<BasicSelectProps, "data" | "nameKey" | "idKey" | "onGetOption" | "onGetData"> {
   /** appKey，默认 DICTIONARY_APP_KEY_ENUM.DEFAULT（0bb989ecada5470c87635018ece9f327） */
   appKey?: string;
   /** 要获取的字典 */
@@ -13,6 +19,10 @@ export interface DictionarySelectProps extends Omit<BasicSelectProps, "data" | "
   nameKey?: string;
   /** 树形数据 value 字段，默认 dictValue */
   idKey?: string;
+  /** 获取选中的项 */
+  onGetOption?: (option: Data | Data[]) => void;
+  /** 获取数据 */
+  onGetData?: (data: Data[]) => void;
 }
 
 /**

package/components/Select/Personnel/Gwj/index.d.ts

@@ -1,6 +1,20 @@
 import type { FC } from "react";
 import type { BasicSelectProps } from "../../Basic";
 
+interface Data {
+  id: string;
+  name: string;
+  corpinfoId: string;
+  corpinfoName: string;
+  departmentId: string;
+  departmentName: string;
+  postId: string;
+  postName: string;
+  userId: string;
+  username: string;
+  [key: string]: any;
+}
+
 /**
  * 请求参数
  */
@@ -31,7 +45,7 @@ export interface ExtraParams {
 /**
  * 组件属性
  */
-export interface PersonnelSelectProps extends Omit<BasicSelectProps, "data" | "placeholder" | "nameKey" | "idKey"> {
+export interface PersonnelSelectProps extends Omit<BasicSelectProps, "data" | "placeholder" | "nameKey" | "idKey" | "onGetOption" | "onGetData"> {
   /** 请求参数 */
   params?: Params;
   /** 占位符，默认"人员" */
@@ -44,6 +58,10 @@ export interface PersonnelSelectProps extends Omit<BasicSelectProps, "data" | "p
   isNeedDepartmentId?: boolean;
   /** 额外请求参数 */
   extraParams?: ExtraParams;
+  /** 获取选中的项 */
+  onGetOption?: (option: Data | Data[]) => void;
+  /** 获取数据 */
+  onGetData?: (data: Data[]) => void;
 }
 
 /**

package/components/SelectTree/Area/index.d.ts

@@ -1,11 +1,20 @@
 import type { FC } from "react";
 import type { BasicSelectTreeProps } from "../Basic";
 
+interface Data {
+  value: string;
+  label: string;
+  children: Data[];
+}
+
 /**
  * 组件属性
  */
-export interface AreaSelectTreeProps extends Omit<BasicSelectTreeProps, "treeData" | "placeholder" | "nameKey" | "idKey" | "childrenKey"> {
-
+export interface AreaSelectTreeProps extends Omit<BasicSelectTreeProps, "treeData" | "placeholder" | "nameKey" | "idKey" | "childrenKey" | "onGetNodePaths" | "onGetData"> {
+  /** 获取父级节点 */
+  onGetNodePaths?: (nodes: Data[]) => void;
+  /** 获取数据 */
+  onGetData?: (data: Data[], processedData: Data[]) => void;
 }
 
 /**

package/components/SelectTree/Department/Gwj/index.d.ts

@@ -1,6 +1,13 @@
 import type { FC } from "react";
 import type { BasicSelectTreeProps } from "../../Basic";
 
+interface Data {
+  id: string;
+  name: string;
+  childrenList: Data[];
+  [key: string]: any;
+}
+
 /**
  * 企业类型枚举（用于 inType）
  */
@@ -28,7 +35,7 @@ export interface Params {
 /**
  * 组件属性
  */
-export interface DepartmentSelectTreeProps extends Omit<BasicSelectTreeProps, "treeData" | "placeholder" | "nameKey" | "idKey" | "childrenKey"> {
+export interface DepartmentSelectTreeProps extends Omit<BasicSelectTreeProps, "treeData" | "placeholder" | "nameKey" | "idKey" | "childrenKey" | "onGetNodePaths" | "onGetData"> {
   /** 请求参数 */
   params?: Params;
   /** 占位符，默认"部门" */
@@ -39,6 +46,10 @@ export interface DepartmentSelectTreeProps extends Omit<BasicSelectTreeProps, "t
   isNeedParentId?: boolean;
   /** 查询的企业类型，默认current，current 接收 eqCorpinfoId 或者 eqParentId，all 不接受任何参数，inType 接收 inType 或者 enterpriseType */
   searchType?: "current" | "all" | "inType";
+  /** 获取父级节点 */
+  onGetNodePaths?: (nodes: Data[]) => void;
+  /** 获取数据 */
+  onGetData?: (data: Data[], processedData: Data[]) => void;
 }
 
 /**

package/components/SelectTree/Dictionary/index.d.ts

@@ -1,10 +1,17 @@
 import type { FC } from "react";
 import type { BasicSelectTreeProps } from "../Basic";
 
+interface Data {
+  dictValue: string;
+  dictLabel: string;
+  children: Data[];
+  [key: string]: any;
+}
+
 /**
  * 组件属性
  */
-export interface DictionarySelectTreeProps extends Omit<BasicSelectTreeProps, "treeData" | "nameKey" | "idKey" | "childrenKey"> {
+export interface DictionarySelectTreeProps extends Omit<BasicSelectTreeProps, "treeData" | "nameKey" | "idKey" | "childrenKey" | "onGetNodePaths" | "onGetData"> {
   /** appKey，默认 DICTIONARY_APP_KEY_ENUM.DEFAULT（0bb989ecada5470c87635018ece9f327） */
   appKey?: string;
   /** 要获取的字典 */
@@ -13,6 +20,10 @@ export interface DictionarySelectTreeProps extends Omit<BasicSelectTreeProps, "t
   nameKey?: string;
   /** 树形数据 value 字段，默认 dictValue */
   idKey?: string;
+  /** 获取父级节点 */
+  onGetNodePaths?: (nodes: Data[]) => void;
+  /** 获取数据 */
+  onGetData?: (data: Data[], processedData: Data[]) => void;
 }
 
 /**

package/components/SelectTree/HiddenLevel/Gwj/index.d.ts

@@ -1,16 +1,27 @@
 import type { FC } from "react";
 import type { BasicSelectTreeProps } from "../../Basic";
 
+interface Data {
+  dictValue: string;
+  dictLabel: string;
+  children: Data[];
+  [key: string]: any;
+}
+
 /**
  * 组件属性
  */
-export interface HiddenLevelSelectTreeProps extends Omit<BasicSelectTreeProps, "treeData" | "nameKey" | "idKey" | "childrenKey" | "level"> {
+export interface HiddenLevelSelectTreeProps extends Omit<BasicSelectTreeProps, "treeData" | "nameKey" | "idKey" | "childrenKey" | "level" | "onGetNodePaths" | "onGetData"> {
   /** 是否显示忽略隐患，默认 true */
   isShowNeglect?: boolean;
   /** 是否显示较大隐患，默认 true */
   isShowLarger?: boolean;
   /** 是否显示重大隐患，默认 true */
   isShowMajor?: boolean;
+  /** 获取父级节点 */
+  onGetNodePaths?: (nodes: Data[]) => void;
+  /** 获取数据 */
+  onGetData?: (data: Data[], processedData: Data[]) => void;
 }
 
 /**

package/components/SelectTree/HiddenPart/Gwj/index.d.ts

@@ -1,6 +1,13 @@
 import type { FC } from "react";
 import type { BasicSelectTreeProps } from "../../Basic";
 
+interface Data {
+  hiddenregionId: string;
+  hiddenregion: string;
+  children: Data[];
+  [key: string]: any;
+}
+
 /**
  * 请求参数
  */
@@ -12,11 +19,15 @@ export interface Params {
 /**
  * 组件属性
  */
-export interface HiddenPartSelectTreeProps extends Omit<BasicSelectTreeProps, "treeData" | "nameKey" | "idKey" | "childrenKey"> {
+export interface HiddenPartSelectTreeProps extends Omit<BasicSelectTreeProps, "treeData" | "nameKey" | "idKey" | "childrenKey" | "onGetNodePaths" | "onGetData"> {
   /** 请求参数 */
   params?: Params;
   /** 是否需要企业id，默认 false */
   isNeedCorpInfoId?: boolean;
+  /** 获取父级节点 */
+  onGetNodePaths?: (nodes: Data[]) => void;
+  /** 获取数据 */
+  onGetData?: (data: Data[], processedData: Data[]) => void;
 }
 
 /**

package/components/SelectTree/Industry/index.d.ts

@@ -1,11 +1,20 @@
 import type { FC } from "react";
 import type { BasicSelectTreeProps } from "../Basic";
 
+interface Data {
+  dict_value: string;
+  dict_label: string;
+  childrenList: Data[];
+}
+
 /**
  * 组件属性
  */
-export interface IndustrySelectTreeProps extends Omit<BasicSelectTreeProps, "treeData" | "placeholder" | "nameKey" | "idKey" | "childrenKey"> {
-
+export interface IndustrySelectTreeProps extends Omit<BasicSelectTreeProps, "treeData" | "placeholder" | "nameKey" | "idKey" | "childrenKey" | "onGetNodePaths" | "onGetData"> {
+  /** 获取父级节点 */
+  onGetNodePaths?: (nodes: Data[]) => void;
+  /** 获取数据 */
+  onGetData?: (data: Data[], processedData: Data[]) => void;
 }
 
 /**

package/components/Table/index.d.ts

@@ -18,6 +18,8 @@ export type TableProps<DataSource, U, ValueType> = Omit<AntdTableProps, "columns
   align?: "left" | "right" | "center";
   /** 超过宽度是否自动省略，默认 true */
   ellipsis?: boolean;
+  /** 表格高度，默认自适应 */
+  height?: number;
 };
 
 /**

package/components/Table/index.js

@@ -1 +1 @@
-import{ProTable as e}from"@ant-design/pro-components";import t from"dayjs";import{useState as o,useEffect as n,useMemo as r}from"react";import{throttle as s}from"throttle-debounce";import{useAntdResizableHeader as a}from"use-antd-resizable-header";import{getDataType as i,getIndexColumn as l}from"../../utils/index.js";import"use-antd-resizable-header/dist/style.css";import"./index.less";import{jsx as c}from"react/jsx-runtime";const d="tableLocalStorageLastCleanup";function m(e){const t=process.env?.app?.basename,o=decodeURIComponent(window.location.pathname),n="Undefined"===i(e)?"":`#{${e}}`;return{size:`${t}#${o}${n}#size`,resizable:`${t}#${o}${n}#resizable`,columnState:`${t}#${o}${n}#columnState`}}function u(i){const{columns:u=[],showIndexColumn:p=!0,ellipsis:b=!0,align:f="center",indexColumnFixed:g="left",rowKey:h="id",storeIndex:y,disabledResizer:S=!1,...w}=i,z=process.env.app.antd["ant-prefix"],$=`.${z||"ant"}-table`,x=`${$}-wrapper`,v=`${$}-body`,[C,I]=o((R=y,window.localStorage.getItem(m(R).size)||"default"));var R;const[_,E]=o(0),K=m(y),N=!S,{components:T,resizableColumns:W,tableWidth:j,resetColumns:k}=a({columns:u,columnsState:{persistenceKey:K.resizable,persistenceType:"localStorage"}}),q=s(50,()=>{try{const e=document.querySelector(x),t=document.querySelector(v),o=document.querySelector(".page-layout-footer"),n=o?o.offsetHeight:0;if(t&&e){const o=e.getBoundingClientRect(),r=t.getBoundingClientRect(),s=o.bottom-r.bottom;E(innerHeight-r.top-s-(window.__IN_BASE__?38:22)-n)}}catch(e){window.console.error(e)}});n(()=>{let e,o;return N&&(e=new MutationObserver(e=>e.forEach(()=>q())),o=new ResizeObserver(e=>e.forEach(()=>q())),setTimeout(()=>q(),500),o.observe(document.body),e.observe(document.body,{subtree:!0,childList:!0})),function(){const e=t(),o=localStorage.getItem(d),n=o?t(o):null;if(!n||e.diff(n,"day")>=10){const t=[];for(let e=0;e<localStorage.length;e++){const o=localStorage.key(e);o&&(o.endsWith("#columnState")||o.endsWith("#size")||o.endsWith("#resizable"))&&t.push(o)}t.forEach(e=>{localStorage.removeItem(e)}),localStorage.setItem(d,e.toISOString())}}(),()=>{e&&o&&N&&(o.unobserve(document.body),e.disconnect(document.body))}},[]),n(()=>{!function(e,t){window.localStorage.setItem(m(t).size,e)}(C,y)},[C]);const B=r(()=>(()=>{const e=[...W];p&&e.unshift({...l(i.pagination),fixed:g});const t=e=>({align:f,ellipsis:b,...e,...e.children?{children:e.children.map(t)}:{}});return e.map(t)})(),[W,p,f,b,g,i.pagination]);return c("div",{className:"table-layout card-layout",children:c(e,{ghost:!0,search:!1,scroll:{x:j,y:N?_:void 0},options:{reload:!1,fullScreen:!0,setting:{checkedReset:!0,extra:c("a",{className:`${z}-pro-table-column-setting-action-rest-button`,onClick:k,children:"重置列宽"})}},components:T,columnsState:{persistenceKey:K.columnState,persistenceType:"localStorage"},onSizeChange:I,columns:B,bordered:!0,size:"small",rowKey:h,...w})})}u.displayName="Table";export{u as default};
+import{ProTable as e}from"@ant-design/pro-components";import t from"dayjs";import{useState as o,useEffect as n,useMemo as r}from"react";import{throttle as s}from"throttle-debounce";import{useAntdResizableHeader as a}from"use-antd-resizable-header";import{getDataType as i,getIndexColumn as l}from"../../utils/index.js";import"use-antd-resizable-header/dist/style.css";import"./index.less";import{jsx as c}from"react/jsx-runtime";const d="tableLocalStorageLastCleanup";function m(e){const t=process.env?.app?.basename,o=decodeURIComponent(window.location.pathname),n="Undefined"===i(e)?"":`#{${e}}`;return{size:`${t}#${o}${n}#size`,resizable:`${t}#${o}${n}#resizable`,columnState:`${t}#${o}${n}#columnState`}}function u(i){const{columns:u=[],showIndexColumn:p=!0,ellipsis:b=!0,align:g="center",indexColumnFixed:f="left",rowKey:h="id",storeIndex:y,disabledResizer:S=!1,height:w,...z}=i,$=process.env.app.antd["ant-prefix"],x=`.${$||"ant"}-table`,v=`${x}-wrapper`,C=`${x}-body`,[I,R]=o((_=y,window.localStorage.getItem(m(_).size)||"default"));var _;const[E,K]=o(0),N=m(y),T=!S,{components:W,resizableColumns:j,tableWidth:k,resetColumns:q}=a({columns:u,columnsState:{persistenceKey:N.resizable,persistenceType:"localStorage"}}),B=s(50,()=>{try{const e=document.querySelector(v),t=document.querySelector(C),o=document.querySelector(".page-layout-footer"),n=o?o.offsetHeight:0;if(t&&e){const o=e.getBoundingClientRect(),r=t.getBoundingClientRect(),s=o.bottom-r.bottom;K(innerHeight-r.top-s-(window.__IN_BASE__?38:22)-n)}}catch(e){window.console.error(e)}});n(()=>{let e,o;return T&&(e=new MutationObserver(e=>e.forEach(()=>B())),o=new ResizeObserver(e=>e.forEach(()=>B())),setTimeout(()=>B(),500),o.observe(document.body),e.observe(document.body,{subtree:!0,childList:!0})),function(){const e=t(),o=localStorage.getItem(d),n=o?t(o):null;if(!n||e.diff(n,"day")>=10){const t=[];for(let e=0;e<localStorage.length;e++){const o=localStorage.key(e);o&&(o.endsWith("#columnState")||o.endsWith("#size")||o.endsWith("#resizable"))&&t.push(o)}t.forEach(e=>{localStorage.removeItem(e)}),localStorage.setItem(d,e.toISOString())}}(),()=>{e&&o&&T&&(o.unobserve(document.body),e.disconnect(document.body))}},[]),n(()=>{!function(e,t){window.localStorage.setItem(m(t).size,e)}(I,y)},[I]);const L=r(()=>(()=>{const e=[...j];p&&e.unshift({...l(i.pagination),fixed:f});const t=e=>({align:g,ellipsis:b,...e,...e.children?{children:e.children.map(t)}:{}});return e.map(t)})(),[j,p,g,b,f,i.pagination]);return c("div",{className:"table-layout card-layout",children:c(e,{ghost:!0,search:!1,scroll:{x:k,y:w||(T?E:void 0)},options:{reload:!1,fullScreen:!0,setting:{checkedReset:!0,extra:c("a",{className:`${$}-pro-table-column-setting-action-rest-button`,onClick:q,children:"重置列宽"})}},components:W,columnsState:{persistenceKey:N.columnState,persistenceType:"localStorage"},onSizeChange:R,columns:L,bordered:!0,size:"small",rowKey:h,...z})})}u.displayName="Table";export{u as default};

package/hooks/useGetUserInfo/index.d.ts

@@ -1,4 +1,18 @@
-export type getUserInfoFunction = () => Promise<Record<string, any>>;
+interface Data {
+  corpinfoId: string;
+  corpinfoName: string;
+  departmentId: string;
+  departmentName: string;
+  id: string;
+  name: string;
+  postId: string;
+  postName: string;
+  userId: string;
+  username: string;
+  [key: string]: any;
+}
+
+export type getUserInfoFunction = () => Promise<Data>;
 
 /**
  * 获取用户信息

package/package.json

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