@zat-design/sisyphus-react 3.11.14 → 3.12.0-beta.1

package/es/ProForm/components/combination/ProModalSelect/propsType.d.ts

@@ -1,49 +1,102 @@
 import { FormInstance, InputProps, SelectProps, ModalProps } from 'antd';
 import { Service, Options } from 'ahooks/lib/useRequest/src/types';
 import React from 'react';
-import { ProColumnProps } from '../../render/propsType';
-import { ProFormOtherProps } from '../../../propsType';
+import type { ProFormColumnType } from '../../render/propsType';
+import type { ProFormOtherType } from '../../../propsType';
+/**
+ * 模态框确认按钮回调函数类型
+ * @param list 选中的数据列表
+ * @returns 返回布尔值或Promise<布尔值>，用于控制模态框是否关闭
+ */
 type OnOkFunction = (list?: Record<string, any>[]) => boolean | void | Promise<boolean | void>;
+/**
+ * 配置选项接口
+ */
 interface ConfigOption {
+    /** ahooks的useRequest参数配置 */
     useRequest?: {
+        /** 请求服务 */
         service?: Service<any, any>;
+        /** useRequest选项配置 */
         options?: Options<any, any> & {
             page?: any;
             defaultParams?: any;
             initParams?: any;
         };
+        /** 初始化参数 */
         initParams?: any;
     };
-    formColumns?: ProColumnProps[];
+    /** 表单列配置项 */
+    formColumns?: ProFormColumnType[];
+    /** 选择模式：单选(radio)或多选(checkbox) */
     type?: 'radio' | 'checkbox';
+    /** 是否开启分页功能 */
     withPagination?: boolean;
+    /** 转换请求参数 */
     transformParams?: (params: any) => any;
+    /** 转换响应数据 */
     transformResponse?: (data: any[]) => any[];
+    /** 模态框属性配置 */
     modalProps?: ModalProps & {
         onOk?: OnOkFunction;
     };
+    /** 表格属性配置 */
     tableProps?: Record<string, any>;
 }
+/**
+ * 模态框选择器属性接口
+ */
 interface ProModalPropsType {
+    /** 配置选项 */
     configOption: ConfigOption;
+    /** 值变更回调 */
     onChange?: (value: number | string | undefined, option?: any) => void;
+    /** 弹框标题 */
     title: ModalProps['title'];
+    /** 组件引用 */
     ref?: React.MutableRefObject<any>;
+    /** 自定义格式化显示值 */
     onFormat?: (value: any) => string;
+    /** 自定义选项渲染函数 */
     optionRender?: (value: any) => string;
+    /** 自定义字段名映射 */
     fieldNames?: any;
+    /** 是否为查看模式 */
     isView?: boolean;
+    /** 自定义组件渲染 */
     customRender?: React.ReactNode;
+    /** 自定义空数据展示组件 */
     viewEmpty?: React.ReactNode;
-    otherProps?: ProFormOtherProps;
+    /** ProForm中传递的其他参数 */
+    otherProps?: ProFormOtherType;
+    /**
+     * 是否将选项的label包装到value中
+     * 会将Select的value类型从string变为{value: string, label: ReactNode}格式
+     */
     labelInValue?: boolean;
+    /** 是否默认选择列表第一项 */
     defaultOne?: boolean;
+    /** 打开弹框前的校验函数 */
     beforeOpen?: any;
+    /** 打开弹框后的回调函数 */
     afterOpen?: any;
-    isTooltip?: any;
+    /** 是否启用tooltip提示 */
+    isTooltip?: boolean;
+    /** 是否以"值-名称"形式展示 */
     showCodeName?: boolean;
+    /** 查询表单实例，用于获取查询表单数据 */
     searchForm?: FormInstance;
+    /** 模糊查询的字段名 */
     searchKey?: string;
 }
+/** 模态框选择器属性类型（结合Select和Input属性） */
 export declare type ProModalSelectPropsType = SelectProps & InputProps & ProModalPropsType;
+/** 配置选项类型 */
+export type ProModalSelectConfigType = ConfigOption;
+/** 模态框属性类型 */
+export type ProModalType = Omit<ProModalPropsType, 'configOption'> & {
+    configOption: ProModalSelectConfigType;
+};
+/** 模态框选择器类型（结合Select和Input属性） */
+export type ProModalSelectType = SelectProps & InputProps & ProModalType;
 export {};

package/es/ProForm/components/combination/ProNumberRange/index.d.ts

@@ -1,3 +1,3 @@
-import { ProNumberRangeProps } from './propsType';
-declare const ProNumberRange: (props: ProNumberRangeProps) => any;
+import type { ProNumberRangeType } from './propsType';
+declare const ProNumberRange: (props: ProNumberRangeType) => any;
 export default ProNumberRange;

package/es/ProForm/components/combination/ProNumberRange/propsType.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
-import { ProFormOtherProps } from '../../../propsType';
-export interface ProNumberRangeProps {
+import type { ProFormOtherType } from '../../../propsType';
+export interface ProNumberRangeType {
     /**
      * @description       组件的值,[最小值，最大值]
      * @default           []
@@ -75,6 +75,10 @@ export interface ProNumberRangeProps {
      */
     separator?: React.ReactNode | string;
     childProps?: any[];
-    otherProps?: ProFormOtherProps;
+    otherProps?: ProFormOtherType;
     id?: string;
 }
+/**
+ * 兼容旧命名导出
+ */
+export type ProNumberRangeProps = ProNumberRangeType;

package/es/ProForm/components/combination/ProTimeLimit/index.d.ts

@@ -2,20 +2,20 @@ import { DatePickerProps, TimePickerProps } from 'antd';
 import { PickerPanelDateProps } from 'antd/lib/calendar/generateCalendar';
 import { Moment } from 'moment';
 import React from 'react';
-import { ProFormOtherProps } from '../../../propsType';
-import { Props as ProRangeLimitProps } from '../ProRangeLimit';
-import { DistributiveOmit } from '../../../../ProForm/propsType';
+import type { ProFormOtherType } from '../../../propsType';
+import { Props as ProRangeLimitType } from '../ProRangeLimit';
+import type { DistributiveOmit } from '../../../../ProForm/propsType';
 export type DateType = DatePickerProps['value'];
-export type ProTimeLimitProps = DistributiveOmit<DatePickerProps, 'value' | 'onChange' | 'mode'> & {
+export type ProTimeLimitType = DistributiveOmit<DatePickerProps, 'value' | 'onChange' | 'mode'> & {
     value?: string;
-    onChange?: (value: ProTimeLimitProps['value'] | null, valueData: Moment) => void;
+    onChange?: (value: ProTimeLimitType['value'] | null, valueData: Moment) => void;
     disabled?: boolean;
     foreverDate?: string;
     foreverText?: string;
     viewEmpty?: React.ReactNode;
     format?: string;
     valueType?: 'moment' | 'format' | 'ISO' | 'dateTime' | 'dateStartEndTime';
-    otherProps?: ProFormOtherProps;
+    otherProps?: ProFormOtherType;
     mode?: 'DatePicker';
     isView?: boolean;
     /**
@@ -26,9 +26,15 @@ export type ProTimeLimitProps = DistributiveOmit<DatePickerProps, 'value' | 'onC
     showTime?: PickerPanelDateProps<Moment>['showTime'];
     showNow?: boolean;
 };
-export declare const ProTimeLimit: React.FC<ProTimeLimitProps>;
-export type ProLimitProps = ProTimeLimitProps | (ProRangeLimitProps & {
+export declare const ProTimeLimit: React.FC<ProTimeLimitType>;
+export type ProLimitType = ProTimeLimitType | (ProRangeLimitType & {
     mode: 'RangePicker';
 });
-declare const LimitPick: React.FC<ProLimitProps>;
+declare const LimitPick: React.FC<ProLimitType>;
 export default LimitPick;
+/**
+ * 兼容旧命名导出
+ */
+export type ProTimeLimitProps = ProTimeLimitType;
+export type ProLimitProps = ProLimitType;
+export type Props = ProRangeLimitType;

package/es/ProForm/components/old/EnumSelect/index.d.ts

@@ -1,4 +1,4 @@
 import { FC } from 'react';
-import { IProps } from './interface';
+import type { IProps } from './interface';
 declare const EnumSelect: FC<IProps>;
 export default EnumSelect;

package/es/ProForm/components/old/EnumSelect/interface.d.ts

@@ -1,6 +1,6 @@
 import { InputProps, ModalProps } from 'antd';
 import React from 'react';
-import { ProColumnProps } from '../../render/propsType';
+import type { ProFormColumnType } from '../../render/propsType';
 type RequestFunction<P = Record<string, any> | void, R = any> = (params: P, ...args: any[]) => Promise<R>;
 type OnOkFunction = (list: Record<string, any>[]) => boolean;
 interface IConfigOption {
@@ -8,7 +8,7 @@ interface IConfigOption {
     fetchOptions: RequestFunction;
     useRequestOptions: object;
     conditionKey: string;
-    conditionColumns: ProColumnProps[];
+    conditionColumns: ProFormColumnType[];
     defaultParams: Record<string, any>;
     withPagination: boolean;
     paginationPosition: 'tableBottom' | 'modalBottom';

package/es/ProForm/components/old/InputWithSuffix/index.d.ts

@@ -1,3 +1,3 @@
-import { comPropsType } from './propsTypes';
+import type { comPropsType } from './propsTypes';
 declare const InputWithSuffix: (props: comPropsType) => import("react/jsx-runtime").JSX.Element;
 export default InputWithSuffix;

package/es/ProForm/components/old/ProAddress/index.d.ts

@@ -1,4 +1,4 @@
-import { ProAddressPropsType } from './propsTypes';
+import type { ProAddressPropsType } from './propsTypes';
 export declare const transferAddressInfoToRegion: () => {
     normalize: (value: any) => {
         province: any;

package/es/ProForm/components/old/ProCertNo/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { IProps } from './propsType';
+import type { IProps } from './propsType';
 /**
  * 证件号码 + 证件类型
  * @date 2022-01-06

package/es/ProForm/components/old/ProCertValidity/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { ProCertValidityPropsType } from './propsType';
+import type { ProCertValidityPropsType } from './propsType';
 /**
  * 继承了antd原本DatePicker 与 RangePicker接口，
  * 可以在这里使用所有原有antd DatePicker的属性和事件，

package/es/ProForm/components/old/ProRangeBox/index.d.ts

@@ -1,2 +1,2 @@
-import { ProRangeBoxPropsType } from './propsType';
+import type { ProRangeBoxPropsType } from './propsType';
 export default function ProRangeBox({ configOption }: ProRangeBoxPropsType): import("react/jsx-runtime").JSX.Element;

package/es/ProForm/components/render/ChangedWrapper.d.ts

@@ -2,12 +2,12 @@ import { FormInstance } from 'antd';
 import { NamePath } from 'antd/lib/form/interface';
 import React from 'react';
 import { DiffOriginalParams } from '../../utils/diffOriginal';
-import { DiffConfigProps } from '../../propsType';
+import type { DiffConfigType } from '../../propsType';
 interface Props {
     name?: NamePath;
     names?: NamePath[];
     namesStr?: string;
-    diffConfig?: DiffConfigProps;
+    diffConfig?: DiffConfigType;
     form: FormInstance;
     onDiff?: DiffOriginalParams['onDiff'];
     valuePropName?: string;

package/es/ProForm/components/render/ConfirmWrapper.d.ts

@@ -1,9 +1,9 @@
 import React from 'react';
-import { ProFormColumnProps } from '../../propsType';
+import type { ProFormColumnType } from '../../propsType';
 interface Props<T = any> {
     value?: T;
     onChange?: (value: T, ...rest: any[]) => void;
-    confirm: ProFormColumnProps['confirm'];
+    confirm: ProFormColumnType['confirm'];
     [K: string]: any;
 }
 declare const ConfirmWrapper: React.FC<Props>;

package/es/ProForm/components/render/Render.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
-import type { RenderProps } from './propsType';
-declare const Render: React.FC<RenderProps>;
+import type { RenderType } from './propsType';
+declare const Render: React.FC<RenderType>;
 export default Render;

package/es/ProForm/components/render/RenderFields.d.ts

@@ -1,11 +1,11 @@
 import { ColProps } from 'antd';
 import { FormInstance } from 'antd/es/form/Form';
 import React from 'react';
-import { ProColumnProps } from './propsType';
-import { DiffConfigProps } from '../../propsType';
+import type { ProFormColumnType } from './propsType';
+import type { DiffConfigType } from '../../propsType';
 interface Props<T = any> {
     isView?: boolean;
-    columns: ProColumnProps[];
+    columns: ProFormColumnType[];
     disabled?: boolean;
     form: FormInstance<T>;
     expand?: boolean | number;
@@ -15,7 +15,7 @@ interface Props<T = any> {
     viewEmpty?: React.ReactNode;
     openState?: boolean;
     labelWidth?: string | number;
-    diffConfig?: DiffConfigProps;
+    diffConfig?: DiffConfigType;
     clearNotShow?: boolean;
     requiredOnView?: boolean;
     required?: boolean | boolean[] | (() => boolean | boolean[]);

package/es/ProForm/components/render/propsType.d.ts

@@ -1,45 +1,42 @@
-import { ColProps, FormInstance, FormItemProps, ModalFuncProps } from 'antd';
-import { NamePath } from 'antd/es/form/interface';
+import type { ColProps, FormInstance, FormItemProps, ModalFuncProps } from 'antd';
+import type { NamePath } from 'antd/es/form/interface';
 import React from 'react';
 import { validate, regExp } from '@zat-design/utils';
-import { RuleObject } from 'antd/es/form';
-import * as componentMap from '../index';
-import { IProps as InputProps } from '../base/Input/propsType';
-import { Props as InputNumberProps } from '../base/InputNumber';
-import { Props as RadioProps } from '../base/Radio';
-import { Props as CheckboxProps } from '../base/Checkbox';
-import { Props as DatePickerProps } from '../base/DatePicker';
-import { Props as RangePickerProps } from '../base/RangePicker';
-import { PropsWithRef as FormListProps } from '../combination/FormList/propsType';
-import { Props as SelectProps } from '../base/Select';
-import { Props as TimePickerProps } from '../base/TimePicker';
-import { Props as SwitchProps } from '../base/Switch';
-import { Props as SwitchCheckboxProps } from '../base/SwitchCheckbox';
-import { Props as TextAreaProps } from '../base/TextArea';
-import { ProCascaderProps } from '../combination/ProCascader/propsType';
-import { ProCombinationProps } from '../combination/ProCombination/propsType';
-import { ProModalSelectPropsType as ProModalSelectProps } from '../combination/ProModalSelect/propsType';
-import { ProNumberRangeProps } from '../combination/ProNumberRange/propsType';
-import { ProLimitProps } from '../combination/ProTimeLimit';
-import { Props as ProRangeLimitProps } from '../combination/ProRangeLimit';
-import { CheckboxPropsMap, ProEnum, PropProSelectsMap, PropRadioPropsMap } from '../../../ProEnum/propsType';
-import { PropSelectProps as ProSelectProps } from '../../../ProSelect/propsType';
-import { ProEditTableProps } from '../../../ProEditTable/propsType';
-import { ProTreeModalProps } from '../../../ProTreeModal/propsType';
-import { ProUploadProps } from '../../../ProUpload/propsType';
-import { ProTreeProps } from '../../../ProTree/propsType';
-import { GroupProps as GroupCopyProps } from '../combination/Group/propsType';
-import { ProCollapseProps } from '../../../ProLayout/components/ProCollapse/PropTypes';
-import { DistributiveOmit, DiffConfigProps } from '../../propsType';
-import { DiffOriginalParams } from '../../utils/diffOriginal';
-export type ComponentMap = keyof typeof componentMap;
+import type { RuleObject } from 'antd/es/form';
+import type { Props as InputProps } from '../base/Input/propsType';
+import type { Props as InputNumberProps } from '../base/InputNumber';
+import type { Props as RadioProps } from '../base/Radio';
+import type { Props as CheckboxProps } from '../base/Checkbox';
+import type { Props as DatePickerProps } from '../base/DatePicker';
+import type { Props as RangePickerProps } from '../base/RangePicker';
+import type { TypeWithRef as FormListType } from '../combination/FormList/propsType';
+import type { Props as SelectProps } from '../base/Select';
+import type { Props as TimePickerProps } from '../base/TimePicker';
+import type { Props as SwitchProps } from '../base/Switch';
+import type { Props as SwitchCheckboxProps } from '../base/SwitchCheckbox';
+import type { Props as TextAreaProps } from '../base/TextArea';
+import type { ProCascaderType } from '../combination/ProCascader/propsType';
+import type { ProCombinationType } from '../combination/ProCombination/propsType';
+import type { ProModalSelectType } from '../combination/ProModalSelect/propsType';
+import type { ProNumberRangeType } from '../combination/ProNumberRange/propsType';
+import type { ProLimitProps } from '../combination/ProTimeLimit';
+import type { Props as ProRangeLimitProps } from '../combination/ProRangeLimit';
+import type { CheckboxPropsMap, ProEnum, PropProSelectsMap, PropRadioPropsMap } from '../../../ProEnum/propsType';
+import type { PropSelectProps as ProSelectProps } from '../../../ProSelect/propsType';
+import type { ProEditTableType } from '../../../ProEditTable/propsType';
+import type { ProTreeModalType } from '../../../ProTreeModal/propsType';
+import type { ProUploadType } from '../../../ProUpload/propsType';
+import type { ProTreeProps } from '../../../ProTree/propsType';
+import type { GroupType as GroupCopyProps } from '../combination/Group/propsType';
+import type { ProCollapseProps } from '../../../ProLayout/components/ProCollapse/PropTypes';
+import type { DistributiveOmit, DiffConfigType } from '../../propsType';
+import type { DiffOriginalParams } from '../../utils/diffOriginal';
 type ValidateKey = keyof typeof validate;
 type RegExpKey = keyof typeof regExp;
-interface ExtendType extends Omit<RuleObject, 'type'> {
+export interface ProRule extends Omit<RuleObject, 'type'> {
     type?: ValidateKey | RegExpKey;
     message?: string;
 }
-export type ProRule = ExtendType;
 /**
  * percent 百分比 permillage 千分比 amount 金额
  */
@@ -66,9 +63,9 @@ type TransformToFormField<T extends ControlProps, Values> = DistributiveOmit<T,
     /** ProForm disable时，是否完全受控 */
     disabledStrictly?: boolean;
 };
-type ProEnumFormProps<Values> = TransformToFormField<ProEnum, Values> | TransformToFormField<ProEnum & PropProSelectsMap, Values> | TransformToFormField<ProEnum & PropRadioPropsMap, Values> | TransformToFormField<ProEnum & CheckboxPropsMap, Values>;
-type ProEnumTableProps<Values> = TransformToTableField<ProEnum, Values> | TransformToTableField<ProEnum & PropProSelectsMap, Values> | TransformToTableField<ProEnum & PropRadioPropsMap, Values> | TransformToTableField<ProEnum & CheckboxPropsMap, Values>;
-type ProEnumFieldProps<Values, TT> = TT extends 'ProForm' ? ProEnumFormProps<Values> | ReactiveFunction<Values, ProEnumFormProps<Values>> : ProEnumTableProps<Values> | ((text: any, values: Values, index: number) => ProEnumTableProps<Values>);
+type ProEnumFormType<Values> = TransformToFormField<ProEnum, Values> | TransformToFormField<ProEnum & PropProSelectsMap, Values> | TransformToFormField<ProEnum & PropRadioPropsMap, Values> | TransformToFormField<ProEnum & CheckboxPropsMap, Values>;
+type ProEnumTableType<Values> = TransformToTableField<ProEnum, Values> | TransformToTableField<ProEnum & PropProSelectsMap, Values> | TransformToTableField<ProEnum & PropRadioPropsMap, Values> | TransformToTableField<ProEnum & CheckboxPropsMap, Values>;
+type ProEnumFieldType<Values, TT> = TT extends 'ProForm' ? ProEnumFormType<Values> | ReactiveFunction<Values, ProEnumFormType<Values>> : ProEnumTableType<Values> | ((text: any, values: Values, index: number) => ProEnumTableType<Values>);
 type TransformToTableField<T extends ControlProps, Values> = Omit<T, 'onChange' | 'value' | 'onBlur'> & {
     value?: T['value'];
     onChange?: (value: Parameters<T['onChange']>[0], options: Parameters<T['onChange']>[1], record: any, index: number, form: FormInstance<Values>) => void;
@@ -81,83 +78,83 @@ export type ReactiveFunction<Values, R> = (values: Values, { form, index, namePa
     namePath?: NamePath;
     [key: string]: any;
 }) => R;
-type FieldProps<T extends ControlProps, Values, TT> = TT extends 'ProForm' ? TransformToFormField<T, Values> | ReactiveFunction<Values, TransformToFormField<T, Values>> : TransformToTableField<T, Values> | ((text: any, values: Values, index: number) => TransformToTableField<T, Values>);
+type FieldType<T extends ControlProps, Values, TT> = TT extends 'ProForm' ? TransformToFormField<T, Values> | ReactiveFunction<Values, TransformToFormField<T, Values>> : TransformToTableField<T, Values> | ((text: any, values: Values, index: number) => TransformToTableField<T, Values>);
 /**
  * 值转换
  */
 export type ProFormValueType = 'percentage' | 'permillage' | 'thousandth' | 'datePicker' | 'enumName' | 'enumCodeName' | 'address' | 'thousandthCNY' | 'date' | 'dateTime' | 'dateStartTime' | 'dateEndTime' | 'dateStartEndTime' | 'switch' | 'desensitization';
-export type ColumnPropsMap<Values = any, T = 'ProForm'> = {
+export type ColumnTypeMap<Values = any, T = 'ProForm'> = {
     type?: 'Input';
-    fieldProps?: FieldProps<InputProps, Values, T>;
+    fieldProps?: FieldType<InputProps, Values, T>;
 } | {
     type?: 'InputNumber';
-    fieldProps?: FieldProps<InputNumberProps, Values, T>;
+    fieldProps?: FieldType<InputNumberProps, Values, T>;
 } | {
     type?: 'Radio';
-    fieldProps?: FieldProps<RadioProps, Values, T>;
+    fieldProps?: FieldType<RadioProps, Values, T>;
 } | {
     type?: 'Checkbox';
-    fieldProps?: FieldProps<CheckboxProps, Values, T>;
+    fieldProps?: FieldType<CheckboxProps, Values, T>;
 } | {
     type?: 'DatePicker';
-    fieldProps?: FieldProps<DatePickerProps, Values, T>;
+    fieldProps?: FieldType<DatePickerProps, Values, T>;
 } | {
     type?: 'RangePicker';
-    fieldProps?: FieldProps<RangePickerProps, Values, T>;
+    fieldProps?: FieldType<RangePickerProps, Values, T>;
 } | {
     type?: 'FormList';
-    fieldProps?: FieldProps<Omit<FormListProps, 'fields' | 'operation' | 'meta'>, Values, T>;
+    fieldProps?: FieldType<Omit<FormListType, 'fields' | 'operation' | 'meta'>, Values, T>;
 } | {
     type?: 'Select';
-    fieldProps?: FieldProps<SelectProps, Values, T>;
+    fieldProps?: FieldType<SelectProps, Values, T>;
 } | {
     type?: 'TimePicker';
-    fieldProps?: FieldProps<TimePickerProps, Values, T>;
+    fieldProps?: FieldType<TimePickerProps, Values, T>;
 } | {
     type?: 'Switch';
-    fieldProps?: FieldProps<SwitchProps, Values, T>;
+    fieldProps?: FieldType<SwitchProps, Values, T>;
 } | {
     type?: 'SwitchCheckbox';
-    fieldProps?: FieldProps<SwitchCheckboxProps, Values, T>;
+    fieldProps?: FieldType<SwitchCheckboxProps, Values, T>;
 } | {
     type?: 'TextArea';
-    fieldProps?: FieldProps<TextAreaProps, Values, T>;
+    fieldProps?: FieldType<TextAreaProps, Values, T>;
 } | {
     type?: 'ProCascader';
-    fieldProps?: FieldProps<ProCascaderProps, Values, T>;
+    fieldProps?: FieldType<ProCascaderType, Values, T>;
 } | {
     type?: 'ProCombination';
-    fieldProps?: FieldProps<ProCombinationProps, Values, T>;
+    fieldProps?: FieldType<ProCombinationType, Values, T>;
 } | {
     type?: 'ProModalSelect';
-    fieldProps?: FieldProps<ProModalSelectProps, Values, T>;
+    fieldProps?: FieldType<ProModalSelectType, Values, T>;
 } | {
     type?: 'ProNumberRange';
-    fieldProps?: FieldProps<ProNumberRangeProps, Values, T>;
+    fieldProps?: FieldType<ProNumberRangeType, Values, T>;
 } | {
     type?: 'ProRangeLimit';
-    fieldProps?: FieldProps<ProRangeLimitProps, Values, T>;
+    fieldProps?: FieldType<ProRangeLimitProps, Values, T>;
 } | {
     type?: 'ProTimeLimit';
-    fieldProps?: FieldProps<ProLimitProps, Values, T>;
+    fieldProps?: FieldType<ProLimitProps, Values, T>;
 } | {
     type?: 'ProEnum';
-    fieldProps?: ProEnumFieldProps<Values, T>;
+    fieldProps?: ProEnumFieldType<Values, T>;
 } | {
     type?: 'ProSelect';
-    fieldProps?: FieldProps<ProSelectProps, Values, T>;
+    fieldProps?: FieldType<ProSelectProps, Values, T>;
 } | {
     type?: 'ProEditTable';
-    fieldProps?: FieldProps<ProEditTableProps, Values, T>;
+    fieldProps?: FieldType<ProEditTableType, Values, T>;
 } | {
     type?: 'ProTreeModal';
-    fieldProps?: FieldProps<ProTreeModalProps, Values, T>;
+    fieldProps?: FieldType<ProTreeModalType, Values, T>;
 } | {
     type?: 'ProUpload';
-    fieldProps?: FieldProps<ProUploadProps, Values, T>;
+    fieldProps?: FieldType<ProUploadType, Values, T>;
 } | {
     type?: 'ProTree';
-    fieldProps?: FieldProps<ProTreeProps, Values, T>;
+    fieldProps?: FieldType<ProTreeProps, Values, T>;
 } | {
     type?: 'Group';
     fieldProps?: GroupCopyProps | ReactiveFunction<Values, GroupCopyProps>;
@@ -168,7 +165,7 @@ export type ColumnPropsMap<Values = any, T = 'ProForm'> = {
     type?: 'Container';
     fieldProps?: any;
 };
-export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Values>, 'rules' | 'required'> {
+export interface ProFormColumn<Values = any> extends Omit<FormItemProps<Values>, 'rules' | 'required'> {
     component?: React.ReactNode | ReactiveFunction<Values, React.ReactNode>;
     names?: NamePath[];
     show?: boolean | ReactiveFunction<Values, boolean>;
@@ -233,11 +230,11 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     /** 脱敏数据位置下标 */
     desensitization?: [number, number] | ReactiveFunction<Values, [number, number]>;
 }
-export type ProColumnProps<T = any> = ProFormColumnProps<T> & ColumnPropsMap<T, 'ProForm'>;
+export type ProFormColumnType<T = any> = ProFormColumn<T> & ColumnTypeMap<T, 'ProForm'>;
 /**
  * 表单渲染类型
  */
-export interface RenderProps<Values = any> {
+export interface RenderType<Values = any> {
     formDisabled?: boolean;
     component: any;
     formItemProps: FormItemProps<Values> & {
@@ -278,10 +275,20 @@ export interface RenderProps<Values = any> {
     form: FormInstance<Values>;
     fieldProps?: ReactiveFunction<Values, React.ReactNode>;
     isSelect: boolean;
-    diffConfig: DiffConfigProps;
+    diffConfig: DiffConfigType;
     requiredOnView?: boolean;
-    confirm?: ProFormColumnProps['confirm'];
+    confirm?: ProFormColumnType['confirm'];
     globalControl?: boolean;
     [name: string]: any;
 }
+/**
+ * 兼容旧命名导出
+ */
+export type ProEnumFormProps<Values> = ProEnumFormType<Values>;
+export type ProEnumTableProps<Values> = ProEnumTableType<Values>;
+export type ProEnumFieldProps<Values, TT> = ProEnumFieldType<Values, TT>;
+export type FieldProps<T extends ControlProps, Values, TT> = FieldType<T, Values, TT>;
+export type ColumnPropsMap<Values = any, T = 'ProForm'> = ColumnTypeMap<Values, T>;
+export type ProColumnProps<Values = any> = ProFormColumnType<Values>;
+export type RenderProps<Values = any> = RenderType<Values>;
 export {};

package/es/ProForm/index.d.ts

@@ -1,10 +1,10 @@
 import { FormInstance } from 'antd';
 import React, { ForwardRefRenderFunction } from 'react';
 import { FormProviderProps } from 'antd/es/form/context';
-import { ProFormProps } from './propsType';
+import type { ProFormType } from './propsType';
 import { useForm } from './utils/useForm';
 import useWatch from './utils/useWatch';
-interface IProForm<T = any> extends ForwardRefRenderFunction<FormInstance<T>, ProFormProps<T>> {
+interface IProForm<T = any> extends ForwardRefRenderFunction<FormInstance<T>, ProFormType<T>> {
     useForm: typeof useForm;
     useWatch: typeof useWatch;
     [key: string]: any;

package/es/ProForm/index.js

@@ -73,10 +73,12 @@ var ProForm = function ProForm(props, ref) {
     desensitizationKey = _props$desensitizatio === void 0 ? 'zat-design-pro-component-desensitization' : _props$desensitizatio,
     otherProps = _objectWithoutProperties(props, _excluded);
   var config = useProConfig('ProForm');
+  // source: 用于区分是哪个组件调用，用于错误提示
   var _useForm = useForm(originForm, {
       scrollToError: scrollToError,
       optimize: optimize,
-      formKey: formKey
+      formKey: formKey,
+      source: 'ProForm'
     }),
     _useForm2 = _slicedToArray(_useForm, 1),
     form = _useForm2[0];