@zat-design/sisyphus-react 3.11.14-beta.11 → 3.11.14-beta.12

package/lib/ProEditTable/propsType.d.ts

@@ -6,8 +6,7 @@ import type { TooltipProps } from 'antd/es/tooltip';
 import type { NamePath } from 'antd/es/form/interface';
 import type { ColumnType, TableProps } from 'antd/es/table';
 import type { FormInstance, FormItemProps } from 'antd/es/form';
-import type { FunctionArgs, ProRule } from '../ProForm/propsType';
-import type { ProFormValueType, ColumnTypeMap } from '../ProForm/components/render/propsType';
+import type { ProFormValueType, FunctionArgs, ProRule } from '../ProForm/components/render/propsType';
 import type { DiffOriginalParams } from '../ProForm/utils/diffOriginal';
 /**
  * 操作类型定义
@@ -17,14 +16,14 @@ export type ActionType = 'edit' | 'delete' | 'save' | 'cancel' | 'add' | 'mulDel
  * 操作按钮展示控制函数类型
  * @template T 记录类型
  */
-export type ShowFunction<T> = (record?: T, options?: {
+export type ShowFunction<T = any> = (record?: T, options?: {
     index: number;
     form: FormInstance;
     name: NamePath;
     namePath: NamePath;
     tableLength: number;
     selectedRows: T[];
-}) => Promise<any> | boolean | void;
+}) => Promise<boolean> | boolean | void;
 /**
  * 选项属性接口
  */
@@ -61,10 +60,6 @@ export interface SummaryColumnProps {
     /** 前缀 */
     prefix?: ReactNode | string;
 }
-/**
- * 汇总列属性类型（基于接口）
- */
-export type SummaryColumnType = SummaryColumnProps;
 /**
  * 基础操作按钮属性
  * @template T 记录类型
@@ -110,36 +105,31 @@ export interface BaseActionProps<T = any> {
     /**
      * 按钮前置校验事件
      */
-    onClick?: (record?: any, index?: number) => any;
+    onClick?: (record?: T, index?: number) => any;
     /**
      * 按钮前置校验事件
      */
-    onHandle?: (record?: any, index?: number) => any;
+    onHandle?: (record?: T, index?: number) => any;
     /**
      * 支持antd的Button属性
      */
     buttonProps?: Omit<ButtonProps, 'type' | 'onClick'>;
 }
-/**
- * 基础操作按钮类型（基于接口）
- * @template T 记录类型
- */
-export type BaseActionType<T = any> = BaseActionProps<T>;
 /**
  * 规则函数类型
  * @template T 记录类型
  */
-export type RulesFn<T> = (text?: any, record?: T, options?: OptionsProps) => ProRule[] | void;
+export type RulesFn<T = any> = (text?: any, record?: T, options?: OptionsProps) => ProRule[] | void;
 /**
  * 必填函数类型
  * @template T 记录类型
  */
-export type RequiredFn<T> = (text?: any, record?: T, options?: OptionsProps) => boolean | void;
+export type RequiredFn<T = any> = (text?: any, record?: T, options?: OptionsProps) => boolean | void;
 /**
  * 视图渲染函数类型
  * @template T 记录类型
  */
-export type viewRenderFn<T> = (text?: any, record?: T, options?: OptionsProps) => string | number | ReactNode | void;
+export type viewRenderFn<T = any> = (text?: any, record?: T, options?: OptionsProps) => string | number | ReactNode | void;
 /**
  * 表格列属性接口
  * @template Values 值类型
@@ -157,7 +147,7 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
     /** 是否可编辑 */
     isEditable?: boolean | RequiredFn<T>;
     /** 值类型 */
-    valueType?: ProFormValueType | ((text?: any, record?: any, options?: OptionsProps) => ProFormValueType);
+    valueType?: ProFormValueType | ((text?: any, record?: T, options?: OptionsProps) => ProFormValueType);
     /** 提示信息 */
     tooltip?: string | ({
         icon?: string | ReactNode;
@@ -188,20 +178,15 @@ export type ProColumnsType<Values = any, T = any> = ProColumnsProps<Values, T>;
  * 可编辑表格列属性
  * @template K 键类型
  */
-export type ProEditTableColumnsProps<K = any> = ProColumnsProps & ColumnTypeMap<K, 'ProEditTable'>;
-/**
- * 可编辑表格列属性类型（基于类型）
- * @template K 键类型
- */
-export type ProEditTableColumnsType<K = any> = ProEditTableColumnsProps<K>;
+export type ProEditTableColumnsProps<K = any> = ProColumnsProps<K, 'ProEditTable'>;
 /**
  * 状态接口
  */
-export interface State {
+export interface StateProps {
     /** 单元格名称路径 */
     cellNamePath: NamePath[];
     /** 表格内部强制刷新开关 */
-    forceUpdate: {};
+    forceUpdate: Record<string, any>;
     /** 正在编辑行的row-key集合 */
     editingKeys: string[];
     /** 当前选中行的row-key集合 */
@@ -219,13 +204,15 @@ export interface State {
 /**
  * 状态类型（基于接口）
  */
-export type StateType = State;
+export type StateType = StateProps;
 /**
  * 可编辑表格引用属性
  */
 export interface ProEditTableRefProps {
     /** 获取内部状态 */
-    getInternalState: () => StateType;
+    getInternalState: () => StateProps;
+    /** 设置内部状态 */
+    setInternalState: (state: Partial<StateProps>) => void;
 }
 /**
  * 可编辑表格引用属性类型（基于接口）
@@ -249,12 +236,11 @@ export type ActionDirectionType = ActionDirection;
  * 汇总信息配置
  * @template T 记录类型
  */
-export type SummaryConfig<T> = {
-    columns: SummaryColumnType[];
+export type SummaryProps<T = any> = {
+    columns: ProEditTableSummaryColumnType[];
     total?: boolean;
     fixed?: boolean | 'top' | 'bottom';
 } | TableProps<T>['summary'];
-export type SummaryConfigType<T = any> = SummaryConfig<T>;
 /**
  * 可编辑表格属性接口
  * @template T 记录类型
@@ -267,18 +253,18 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
     /**
      * 原始数据源，设置后可以对比更新后的数值
      */
-    originalValues?: any;
+    originalValues?: Record<string, any>;
     /**
      * 可编辑表格的模式
      * @default multiple
      */
-    mode?: ProEditTableModeType;
+    mode?: ProEditTableMode;
     /**
      * 可编辑表格的类型，单行编辑或者多行编辑
      * @deprecated 将于下个版本 4.0.0 被弃用
      * @default multiple
      */
-    type?: ProEditTableModeType;
+    type?: ProEditTableMode;
     /**
      * 必填对齐方式, 默认右对齐
      * @default right
@@ -297,7 +283,7 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
      * 表格列的配置描述，扩展了FormItemProps属性
      * @default []
      */
-    columns: ProEditTableColumnsProps[];
+    columns: ProEditTableColumnType<T>[];
     /**
      * 是否禁止编辑
      * @default false
@@ -352,7 +338,7 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
     /**
      * 自定义编辑模式的操作栏 单行编辑默认为编辑、删除、保存、取消；多行编辑为删除
      */
-    actionProps?: BaseActionType<T>[] | boolean;
+    actionProps?: BaseActionProps<T>[] | boolean;
     /**
      * 自定义 table footer 左侧渲染, 配置后toolbarProps会失效
      */
@@ -360,7 +346,7 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
     /**
      * 自定义底部操作栏 默认为添加、删除（批量）
      */
-    toolbarProps?: BaseActionType<T>[] | boolean;
+    toolbarProps?: BaseActionProps<T>[] | boolean;
     /**
      * 自定义底部操作栏跟随页面滚动
      */
@@ -372,11 +358,11 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
     /**
      * formItem的props
      */
-    otherProps?: any;
+    otherProps?: Record<string, any>;
     /**
      * 底部合计配置
      */
-    summary?: SummaryConfigType<T>;
+    summary?: ProEditTableSummaryConfigType<T>;
     /**
      * 自定义头部渲染
      */
@@ -400,7 +386,7 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
     /**
      * 操作按钮方向
      */
-    actionDirection?: ActionDirectionType;
+    actionDirection?: ActionDirection;
     /**
      * 校验触发方式
      */
@@ -413,6 +399,18 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
         scrollFollowParent?: boolean;
     };
 }
+/**
+ * 基础操作按钮类型（基于接口）
+ * @template T 记录类型
+ */
+export type ProEditTableActionType<T = any> = BaseActionProps<T>;
+export type ProEditTableSummaryConfigType<T = any> = SummaryProps<T>;
+export type ProEditTableSummaryColumnType = SummaryColumnProps;
+/**
+ * 可编辑表格列属性类型（基于类型）
+ * @template K 键类型
+ */
+export type ProEditTableColumnType<K = any> = ProEditTableColumnsProps<K>;
 /**
  * 可编辑表格属性类型（基于接口）
  * @template T 记录类型

package/lib/ProEditTable/utils/index.d.ts

@@ -6,4 +6,4 @@
  * @param columns 表格配置数据
  * @param config
  */
-export declare const transformColumns: (columns: any[], config: any) => any;
+export declare const transformColumns: (columns: any[], config: any) => any[];

package/lib/ProEditTable/utils/index.js

@@ -262,11 +262,12 @@ var transformColumns = exports.transformColumns = function transformColumns() {
     var required = (0, _lodash.isBoolean)(item.required) ? item.required : false;
     if (typeof item.required === 'function') {
       var namePath = (0, _tools.getNamePath)(name, virtualKey);
-      var rowData = form.getFieldValue([].concat((0, _toConsumableArray2.default)(namePath), [index])) || {};
+      var namePathArray = Array.isArray(namePath) ? namePath : [namePath];
+      var rowData = form.getFieldValue([].concat((0, _toConsumableArray2.default)(namePathArray), [index])) || {};
       required = item.required(rowData[columnName], rowData, {
         form: form,
         index: index,
-        namePath: [].concat((0, _toConsumableArray2.default)(namePath), [index])
+        namePath: [].concat((0, _toConsumableArray2.default)(namePathArray), [index])
       });
     }
     // 样式处理
@@ -286,17 +287,18 @@ var transformColumns = exports.transformColumns = function transformColumns() {
       if (virtualKey && editingKeys.includes(record.rowKey)) {
         namePath = (0, _tools.getNamePath)(name, virtualKey);
       }
+      var namePathArray = Array.isArray(namePath) ? namePath : [namePath];
       var columnNamePath = (0, _lodash.isArray)(columnName) ? columnName : [columnName];
       index = _utils.tools.calc(firstIndex, '+', index);
       // 设置单元格formItem的namePath
-      var cellName = columnName ? [].concat((0, _toConsumableArray2.default)(namePath), [index], (0, _toConsumableArray2.default)(columnNamePath)) : [].concat((0, _toConsumableArray2.default)(namePath), [index]);
+      var cellName = columnName ? [].concat((0, _toConsumableArray2.default)(namePathArray), [index], (0, _toConsumableArray2.default)(columnNamePath)) : [].concat((0, _toConsumableArray2.default)(namePathArray), [index]);
       var _text = text;
       // 当传入组合组件时，name需要重新组合一下，以防names中key与dataIndex重叠
       if (names === null || names === void 0 ? void 0 : names.length) {
         var nextDataIndex = (0, _tools.splitNames)(names);
         item.dataIndex = nextDataIndex;
         item.key = nextDataIndex;
-        cellName = [].concat((0, _toConsumableArray2.default)(namePath), [index, nextDataIndex]);
+        cellName = [].concat((0, _toConsumableArray2.default)(namePathArray), [index, nextDataIndex]);
         // 给names返回数组值
         _text = names.map(function (item) {
           return record === null || record === void 0 ? void 0 : record[item];

package/lib/ProEditTable/utils/tools.d.ts

@@ -1,32 +1,67 @@
+import { Key } from 'react';
+import { FormInstance } from 'antd/es/form';
+import { NamePath } from 'antd/es/form/interface';
+/**
+ * 生成随机字符串
+ * @returns 随机字符串
+ */
 export declare const getRandom: () => string;
-export declare const difference: (object: any, base: any) => unknown;
-export declare const customValidate: (validateKeys: any, form: any, rowName: any) => any;
+/**
+ * 深层次对比两个对象且取出来差异值
+ * @param object 比较对象
+ * @param base 基准对象
+ * @returns 差异对象
+ */
+export declare const difference: <T extends Record<string, any>, U extends Record<string, any>>(object: T, base: U) => Record<string, any>;
+/**
+ * 数组字段循环校验，解决validateFields无法批量校验的问题
+ * @param validateKeys 校验键数组
+ * @param form 表单实例
+ * @param rowName 行名称路径
+ * @returns 校验结果Promise
+ */
+export declare const customValidate: (validateKeys: string[], form: FormInstance, rowName: NamePath) => Promise<any>;
 /**
  * 拆解数组names
- * @param names [][]
- * @returns string
+ * @param names 名称数组
+ * @returns 拆解后的字符串
  */
-export declare const splitNames: (names: any[]) => any;
-export declare const getNamePath: (name: any, virtualKey: any) => any[];
-export declare const onDelete: ({ name, form, virtualKey, selectedRowKeys }: {
-    name: any;
-    form: any;
-    virtualKey: any;
-    selectedRowKeys: any;
+export declare const splitNames: (names: any[]) => string;
+/**
+ * 获取中间formItem的name
+ * @param name 名称路径
+ * @param virtualKey 虚拟键
+ * @returns 完整名称路径数组
+ */
+export declare const getNamePath: (name: NamePath, virtualKey?: string) => (string | number)[];
+/**
+ * 删除操作
+ * @param params 删除参数
+ */
+export declare const onDelete: ({ name, form, virtualKey, selectedRowKeys, }: {
+    name: NamePath;
+    form: FormInstance;
+    virtualKey?: string;
+    selectedRowKeys: Key[];
 }) => void;
-/** 获取最终的disabled, 两张模式【子级优先，全局优先】
+/**
+ * 获取最终的disabled, 两张模式【子级优先，全局优先
  * 全局优先：globalControl为true时，全局控制
  * 子级优先：globalControl为false时，子级控制
- * @param globalControl 全局控制
- * @param formDisabled 表单的disabled
- * @param column 当前列
- * @param tabledDisabled 表格的disabled
- * @param columnFieldProps 当前列的fieldProps
- * @param params 当前列的参数
- * @param rowDisabled 行禁用参数
+ * @param params 禁用参数
+ * @returns 是否禁用
  */
-export declare const getDisabled: ({ globalControl, formDisabled, column, tabledDisabled, columnFieldProps, params, rowDisabled, }: any) => any;
-/** 表格自动滚动到报错位置
+export declare const getDisabled: ({ globalControl, formDisabled, column, tabledDisabled, columnFieldProps, params, rowDisabled, }: {
+    globalControl: boolean;
+    formDisabled?: boolean | ((record: any) => boolean);
+    column: any;
+    tabledDisabled?: boolean;
+    columnFieldProps?: any;
+    params: any[];
+    rowDisabled?: any;
+}) => boolean;
+/**
+ * 表格自动滚动到报错位置
  */
 export declare const handleScrollToError: () => void;
 /**
@@ -34,7 +69,7 @@ export declare const handleScrollToError: () => void;
  * @param value 需要深拷贝的对象
  * @returns 深拷贝后的对象，其中的React节点会被保留
  */
-export declare function cloneDeepFilterNode(value: any): any;
+export declare function cloneDeepFilterNode<T>(value: T): T;
 /**
  * 分页校验
  */

package/lib/ProEditTable/utils/tools.js

@@ -16,32 +16,47 @@ var _lodash = require("lodash");
 /* eslint-disable no-await-in-loop */
 /* eslint-disable no-restricted-syntax */
 
+/**
+ * 生成随机字符串
+ * @returns 随机字符串
+ */
 var getRandom = exports.getRandom = function getRandom() {
   return Math.random().toString(36).slice(-6);
 };
-// 深层次对比两个对象且取出来差异值
+/**
+ * 深层次对比两个对象且取出来差异值
+ * @param object 比较对象
+ * @param base 基准对象
+ * @returns 差异对象
+ */
 var difference = exports.difference = function difference(object, base) {
   var _changes = function changes(object, base) {
     return (0, _lodash.transform)(object, function (result, value, key) {
-      if (!(0, _lodash.isEqual)(value, base[key])) {
-        result[key] = (0, _lodash.isObject)(value) && (0, _lodash.isObject)(base[key]) ? _changes(value, base[key]) : value;
+      if (!(0, _lodash.isEqual)(value, base === null || base === void 0 ? void 0 : base[key])) {
+        result[key] = (0, _lodash.isObject)(value) && (0, _lodash.isObject)(base === null || base === void 0 ? void 0 : base[key]) ? _changes(value, base === null || base === void 0 ? void 0 : base[key]) : value;
       }
     });
   };
   return _changes(object, base);
 };
-// 数组字段循环校验，解决validateFields无法批量校验的问题
+/**
+ * 数组字段循环校验，解决validateFields无法批量校验的问题
+ * @param validateKeys 校验键数组
+ * @param form 表单实例
+ * @param rowName 行名称路径
+ * @returns 校验结果Promise
+ */
 var customValidate = exports.customValidate = function customValidate(validateKeys, form, rowName) {
   var array = [];
   validateKeys.forEach(function (key) {
-    array.push(rowName.concat(key));
+    array.push([].concat((0, _toConsumableArray2.default)(Array.isArray(rowName) ? rowName : [rowName]), [key]));
   });
   return form.validateFields(array);
 };
 /**
  * 拆解数组names
- * @param names [][]
- * @returns string
+ * @param names 名称数组
+ * @returns 拆解后的字符串
  */
 var splitNames = exports.splitNames = function splitNames(names) {
   var result;
@@ -58,14 +73,23 @@ var splitNames = exports.splitNames = function splitNames(names) {
   result = resultArray.join('-');
   return result;
 };
-// 获取中间formItem的name
+/**
+ * 获取中间formItem的name
+ * @param name 名称路径
+ * @param virtualKey 虚拟键
+ * @returns 完整名称路径数组
+ */
 var getNamePath = exports.getNamePath = function getNamePath(name, virtualKey) {
   var nextName = (0, _lodash.cloneDeep)(Array.isArray(name) ? name : [name]);
-  var lastValue = nextName[nextName.length - 1];
-  nextName[nextName.length - 1] = "".concat(lastValue).concat(virtualKey ? "-".concat(virtualKey) : '');
+  var lastIndex = nextName.length - 1;
+  // 确保最后一个元素是字符串类型
+  nextName[lastIndex] = "".concat(nextName[lastIndex]).concat(virtualKey ? "-".concat(virtualKey) : '');
   return nextName;
 };
-// 删除操作
+/**
+ * 删除操作
+ * @param params 删除参数
+ */
 var onDelete = exports.onDelete = function onDelete(_ref) {
   var name = _ref.name,
     form = _ref.form,
@@ -90,16 +114,12 @@ var onDelete = exports.onDelete = function onDelete(_ref) {
     }
   }
 };
-/** 获取最终的disabled, 两张模式【子级优先，全局优先】
+/**
+ * 获取最终的disabled, 两张模式【子级优先，全局优先
  * 全局优先：globalControl为true时，全局控制
  * 子级优先：globalControl为false时，子级控制
- * @param globalControl 全局控制
- * @param formDisabled 表单的disabled
- * @param column 当前列
- * @param tabledDisabled 表格的disabled
- * @param columnFieldProps 当前列的fieldProps
- * @param params 当前列的参数
- * @param rowDisabled 行禁用参数
+ * @param params 禁用参数
+ * @returns 是否禁用
  */
 var getDisabled = exports.getDisabled = function getDisabled(_ref2) {
   var _ref3, _column$disabled;
@@ -112,7 +132,7 @@ var getDisabled = exports.getDisabled = function getDisabled(_ref2) {
     rowDisabled = _ref2.rowDisabled;
   var convertToBoolean = function convertToBoolean(value) {
     if (Array.isArray(value)) {
-      return value;
+      return Boolean(value.length);
     }
     if (value === null || value === undefined || value === '') {
       return false;
@@ -166,7 +186,8 @@ var getDisabled = exports.getDisabled = function getDisabled(_ref2) {
   }
   return convertToBoolean((_ref3 = (_column$disabled = column === null || column === void 0 ? void 0 : column.disabled) !== null && _column$disabled !== void 0 ? _column$disabled : columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled) !== null && _ref3 !== void 0 ? _ref3 : tabledDisabled);
 };
-/** 表格自动滚动到报错位置
+/**
+ * 表格自动滚动到报错位置
  */
 var handleScrollToError = exports.handleScrollToError = function handleScrollToError() {
   setTimeout(function () {
@@ -226,6 +247,11 @@ function cloneDeepFilterNode(value) {
     }
   });
 }
+/**
+ * 判断值是否为空
+ * @param value 需要判断的值
+ * @returns 是否为空
+ */
 var _isNull = function isNull(value) {
   if (Array.isArray(value) && value.length) {
     return value.some(function (item) {

package/lib/ProEnum/propsType.d.ts

@@ -1,7 +1,7 @@
 import React, { ReactNode } from 'react';
 import { RadioProps, CheckboxProps } from 'antd';
 import { Service, Options } from 'ahooks/lib/useRequest/src/types';
-import type { ProFormOtherType } from '../index';
+import type { ProFormOtherType } from '../ProForm/propsType';
 import type { PropSelectProps } from '../ProSelect/propsType';
 /**
  * @description 数据选项类型

package/lib/ProForm/components/combination/Group/propsType.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import { FormItemProps, ModalFuncProps, SpaceProps } from 'antd';
 import { FormInstance } from 'antd/es/form/Form';
 import { NamePath } from 'antd/lib/form/interface';
-import type { ColumnTypeMap, FunctionArgs, ProFormValueType, ReactiveFunction, ViewType } from '../../../propsType';
+import type { ColumnTypeMap, FunctionArgs, ProFormValueType, ReactiveFunction, ViewType } from '../../render/propsType';
 export interface SpaceType extends SpaceProps {
     /**
      * 是否紧凑合并

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

@@ -92,10 +92,10 @@ interface ProModalPropsType {
 /** 模态框选择器属性类型（结合Select和Input属性） */
 export declare type ProModalSelectPropsType = SelectProps & InputProps & ProModalPropsType;
 /** 配置选项类型 */
-export type ConfigOptionType = ConfigOption;
+export type ProModalSelectConfigType = ConfigOption;
 /** 模态框属性类型 */
 export type ProModalType = Omit<ProModalPropsType, 'configOption'> & {
-    configOption: ConfigOptionType;
+    configOption: ProModalSelectConfigType;
 };
 /** 模态框选择器类型（结合Select和Input属性） */
 export type ProModalSelectType = SelectProps & InputProps & ProModalType;

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

@@ -1,9 +1,8 @@
-import { ColProps, FormInstance, FormItemProps, ModalFuncProps } from 'antd';
+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 type { RuleObject } from 'antd/es/form';
-import * as componentMap from '../index';
 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';
@@ -32,14 +31,12 @@ 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';
-export type ComponentMap = keyof typeof componentMap;
 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 金额
  */
@@ -292,6 +289,6 @@ 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 ProFormColumnProps<Values = any> = ProFormColumnType<Values>;
+export type ProColumnProps<Values = any> = ProFormColumnType<Values>;
 export type RenderProps<Values = any> = RenderType<Values>;
 export {};

package/lib/ProForm/propsType.d.ts

@@ -4,8 +4,8 @@ import { NamePath } from 'antd/es/form/interface';
 import { StoreValue, Store } from 'rc-field-form/es/interface.d';
 import { ShouldUpdate } from 'rc-field-form/es/Field.d';
 import React, { ReactNode } from 'react';
-import type { ComponentMap, ProFormColumnType, ViewType } from './components/render/propsType';
-export * from './components/render/propsType';
+import type { ProFormColumnType, ViewType } from './components/render/propsType';
+import type { ProFormComponentType } from './components/index.d';
 export interface ButtonType extends ButtonProps {
     children?: any;
 }
@@ -33,7 +33,7 @@ export interface ProFormOtherType {
     name?: NamePath;
     names?: NamePath[];
     form?: FormInstance;
-    type?: ComponentMap;
+    type?: ProFormComponentType;
     hiddenNames?: string[] | any[];
     colProps: ColProps;
     disabled: boolean;
@@ -111,3 +111,5 @@ export type FooterButtonProps = FooterButtonType;
 export type ProFormOtherProps = ProFormOtherType;
 export type DiffConfigProps = DiffConfigType;
 export type Transform = TransformType;
+export type { ProFormColumnType } from './components/render/propsType';
+export type { ProColumnProps } from './components/render/propsType';

package/lib/ProForm/propsType.js

@@ -3,20 +3,5 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-var _exportNames = {
-  otherKeys: true
-};
 exports.otherKeys = void 0;
-var _propsType = require("./components/render/propsType");
-Object.keys(_propsType).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _propsType[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _propsType[key];
-    }
-  });
-});
 var otherKeys = exports.otherKeys = ['isView', 'viewEmpty', 'label', 'valueType', 'viewType', 'name', 'names', 'form', 'type', 'hiddenNames'];

package/lib/ProForm/utils/useForm.d.ts

@@ -13,4 +13,4 @@ export interface FormInstanceOption {
     optimize?: boolean;
     formKey?: string;
 }
-export declare const useForm: <T>(originForm?: FormInstanceOption | ModifiedFormInstance<T>, options?: FormInstanceOption) => [ModifiedFormInstance<T>];
+export declare const useForm: <T>(originForm?: ModifiedFormInstance<T> | FormInstanceOption, options?: FormInstanceOption) => [ModifiedFormInstance<T>];

package/lib/ProForm/utils/useRules.d.ts

@@ -1,5 +1,5 @@
 import type { InternalNamePath } from 'antd/lib/form/interface';
-import type { ProRule } from '../propsType';
+import type { ProRule } from '../components/render/propsType';
 interface Props {
     rules?: ProRule[];
     required?: boolean;

package/lib/ProIcon/propsTypes.d.ts

@@ -172,9 +172,5 @@ export interface ProIconType {
      */
     buttonIcon?: boolean;
 }
-export type ModeType = ProIconModeType;
 export type ProIconProps = ProIconType;
-export type iconMap = ProIconMapType;
-export type themeMap = ProIconThemeMapType;
-export type actionMap = ProIconActionMapType;
 export {};

package/lib/ProStep/components/Anchor/index.d.ts

@@ -1,2 +1,3 @@
-export declare const MenuItem: (props: any) => import("react/jsx-runtime").JSX.Element;
+import { MenuItemProps } from '../../propsType';
+export declare const MenuItem: (props: MenuItemProps) => JSX.Element;
 export default MenuItem;

package/lib/ProStep/components/Item/index.d.ts

@@ -1,3 +1,3 @@
 import { ProStepItemType } from '../../propsType';
-declare const ProStepItem: ({ id, title, collapse: collapseItem, children, lazyLoad: stepLazyLoad, ...restProps }: ProStepItemType) => import("react/jsx-runtime").JSX.Element;
+declare const ProStepItem: ({ id, title, collapse: collapseItem, children, lazyLoad: stepLazyLoad, order, ...restProps }: ProStepItemType) => JSX.Element;
 export default ProStepItem;