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

package/es/ProEditTable/utils/index.js

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

package/es/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/es/ProEditTable/utils/tools.js

@@ -7,32 +7,47 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import React from 'react';
 import { tools, validate } from '@zat-design/utils';
 import { cloneDeep, cloneDeepWith, isString, isObject, isEqual, transform, isFunction, isBoolean, get } from 'lodash';
+/**
+ * 生成随机字符串
+ * @returns 随机字符串
+ */
 export var getRandom = function getRandom() {
   return Math.random().toString(36).slice(-6);
 };
-// 深层次对比两个对象且取出来差异值
+/**
+ * 深层次对比两个对象且取出来差异值
+ * @param object 比较对象
+ * @param base 基准对象
+ * @returns 差异对象
+ */
 export var difference = function difference(object, base) {
   var _changes = function changes(object, base) {
     return transform(object, function (result, value, key) {
-      if (!isEqual(value, base[key])) {
-        result[key] = isObject(value) && isObject(base[key]) ? _changes(value, base[key]) : value;
+      if (!isEqual(value, base === null || base === void 0 ? void 0 : base[key])) {
+        result[key] = isObject(value) && 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
+ */
 export var customValidate = function customValidate(validateKeys, form, rowName) {
   var array = [];
   validateKeys.forEach(function (key) {
-    array.push(rowName.concat(key));
+    array.push([].concat(_toConsumableArray(Array.isArray(rowName) ? rowName : [rowName]), [key]));
   });
   return form.validateFields(array);
 };
 /**
  * 拆解数组names
- * @param names [][]
- * @returns string
+ * @param names 名称数组
+ * @returns 拆解后的字符串
  */
 export var splitNames = function splitNames(names) {
   var result;
@@ -49,14 +64,23 @@ export var splitNames = function splitNames(names) {
   result = resultArray.join('-');
   return result;
 };
-// 获取中间formItem的name
+/**
+ * 获取中间formItem的name
+ * @param name 名称路径
+ * @param virtualKey 虚拟键
+ * @returns 完整名称路径数组
+ */
 export var getNamePath = function getNamePath(name, virtualKey) {
   var nextName = 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 删除参数
+ */
 export var onDelete = function onDelete(_ref) {
   var name = _ref.name,
     form = _ref.form,
@@ -81,16 +105,12 @@ export var 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 是否禁用
  */
 export var getDisabled = function getDisabled(_ref2) {
   var _ref3, _column$disabled;
@@ -103,7 +123,7 @@ export var 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;
@@ -157,7 +177,8 @@ export var 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);
 };
-/** 表格自动滚动到报错位置
+/**
+ * 表格自动滚动到报错位置
  */
 export var handleScrollToError = function handleScrollToError() {
   setTimeout(function () {
@@ -217,6 +238,11 @@ export function cloneDeepFilterNode(value) {
     }
   });
 }
+/**
+ * 判断值是否为空
+ * @param value 需要判断的值
+ * @returns 是否为空
+ */
 var _isNull = function isNull(value) {
   if (Array.isArray(value) && value.length) {
     return value.some(function (item) {

package/es/ProEnum/propsType.d.ts

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

package/es/ProForm/components/FormFooter/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { FooterRenderType } from './propsType';
+import type { FooterRenderType } from './propsType';
 export declare const PRO_FORM_CACHE = "PRO_FORM_CACHE";
 declare const FormFooter: React.FC<FooterRenderType>;
 export default FormFooter;

package/es/ProForm/components/base/Checkbox/index.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { CheckboxGroupProps } from 'antd/es/checkbox';
-import { ProFormOtherType } from '../../../propsType';
+import type { ProFormOtherType } from '../../../propsType';
 export interface Props extends Omit<CheckboxGroupProps, 'options'> {
     dataSource: any[];
     fieldNames?: {

package/es/ProForm/components/base/Input/propsType.d.ts

@@ -1,6 +1,6 @@
-import { InputProps } from 'antd';
-import { FormInstance } from 'antd/es/form/Form';
-import { ProFormOtherType } from '../../../propsType';
+import type { InputProps } from 'antd';
+import type { FormInstance } from 'antd/es/form/Form';
+import type { ProFormOtherType } from '../../../propsType';
 export interface ProFieldType<T = any> {
     from?: FormInstance<T>;
     label?: string;

package/es/ProForm/components/base/InputNumber/index.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { InputNumberProps } from 'antd';
-import { ProFormOtherType } from '../../../propsType';
+import type { ProFormOtherType } from '../../../propsType';
 export interface Props extends Omit<InputNumberProps, 'onBlur'> {
     otherProps?: ProFormOtherType;
     range?: string;

package/es/ProForm/components/base/Radio/index.d.ts

@@ -1,6 +1,6 @@
 import { RadioChangeEvent, RadioProps } from 'antd';
 import React from 'react';
-import { ProFormOtherType } from '../../../propsType';
+import type { ProFormOtherType } from '../../../propsType';
 export interface Props extends Omit<RadioProps, 'options' | 'onChange'> {
     dataSource: any[];
     onChange: (value: any, e: RadioChangeEvent) => void;

package/es/ProForm/components/base/RangePicker/index.d.ts

@@ -1,6 +1,6 @@
 import type { RangePickerProps } from 'antd/es/date-picker';
 import React from 'react';
-import { ProFormOtherType } from '../../../propsType';
+import type { ProFormOtherType } from '../../../propsType';
 import { Props as RangeProps } from './useDateRange';
 export type Props = {
     otherProps?: ProFormOtherType;

package/es/ProForm/components/base/Select/index.d.ts

@@ -1,6 +1,6 @@
 import { SelectProps } from 'antd';
 import React from 'react';
-import { ProFormOtherType } from '../../../propsType';
+import type { ProFormOtherType } from '../../../propsType';
 export interface Props extends SelectProps {
     dataSource?: any[];
     scrollFollowParent?: boolean;

package/es/ProForm/components/base/Switch/index.d.ts

@@ -1,6 +1,6 @@
 import { SwitchProps } from 'antd';
 import React from 'react';
-import { ProFormOtherType } from '../../../propsType';
+import type { ProFormOtherType } from '../../../propsType';
 export interface Props extends Omit<SwitchProps, 'value'> {
     value: any;
     otherProps?: ProFormOtherType;

package/es/ProForm/components/base/SwitchCheckbox/index.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { CheckboxProps } from 'antd';
-import { ProFormOtherType } from '../../../propsType';
+import type { ProFormOtherType } from '../../../propsType';
 export interface Props extends CheckboxProps {
     label?: string;
     otherProps?: ProFormOtherType;

package/es/ProForm/components/base/TextArea/index.d.ts

@@ -1,6 +1,6 @@
 import { TextAreaProps } from 'antd/es/input';
 import React from 'react';
-import { ProFormOtherType } from '../../../propsType';
+import type { ProFormOtherType } from '../../../propsType';
 import './index.less';
 export interface Props extends TextAreaProps {
     otherProps?: ProFormOtherType;

package/es/ProForm/components/base/TimePicker/index.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import type { TimePickerProps } from 'antd/es/time-picker';
-import { ProFormOtherType } from '../../../propsType';
+import type { ProFormOtherType } from '../../../propsType';
 import './style/index.less';
 export interface Props {
     valueType?: string;

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

@@ -1,8 +1,8 @@
 import React from 'react';
-import { RowProps } from 'antd';
-import { ProColumnType, ProFormOtherType, DiffConfigType } from '../../../propsType';
+import type { RowProps } from 'antd';
+import type { ProFormColumnType, ProFormOtherType, DiffConfigType } from '../../../propsType';
 export interface ContainerType {
-    children?: ProColumnType[];
+    children?: ProFormColumnType[];
     otherProps?: ProFormOtherType;
     rowProps?: RowProps;
     className?: string;

package/es/ProForm/components/combination/FormList/components/ActionButton.d.ts

@@ -1,7 +1,7 @@
 import { FormInstance, FormListFieldData, FormListOperation } from 'antd';
 import { InternalNamePath } from 'antd/es/form/interface';
 import React from 'react';
-import { FormListType, ActionType, FormListMode } from '../propsType';
+import type { FormListType, ActionType, FormListMode } from '../propsType';
 export interface Props {
     min?: FormListType['min'];
     max?: FormListType['max'];

package/es/ProForm/components/combination/FormList/components/BlockFields.d.ts

@@ -3,7 +3,7 @@ import React from 'react';
 import { InternalNamePath } from 'antd/es/form/interface';
 import type { levelType } from '../../../../../ProLayout/components/ProCollapse/PropTypes';
 import type { FormListType } from '../propsType';
-import { DiffConfigType } from '../../../../propsType';
+import type { DiffConfigType } from '../../../../propsType';
 interface Props extends Omit<FormListType, 'toolbarProps'> {
     index: number;
     namePath: InternalNamePath;

package/es/ProForm/components/combination/FormList/components/LineFields.d.ts

@@ -1,8 +1,8 @@
 import { ColProps, FormListFieldData } from 'antd';
 import React from 'react';
 import { InternalNamePath } from 'antd/es/form/interface';
-import { FormListType } from '../propsType';
-import { DiffConfigType } from '../../../../propsType';
+import type { FormListType } from '../propsType';
+import type { DiffConfigType } from '../../../../propsType';
 interface Props extends Omit<FormListType, 'toolbarProps'> {
     className?: string;
     index: number;

package/es/ProForm/components/combination/FormList/components/ToolbarButton.d.ts

@@ -1,6 +1,6 @@
 import { InternalNamePath } from 'antd/es/form/interface';
 import React from 'react';
-import { ToolbarActionType } from '../propsType';
+import type { ToolbarActionType } from '../propsType';
 import { Props as ActionButtonProps } from './ActionButton';
 interface Props extends Omit<ActionButtonProps, 'actionProps' | 'field' | 'index' | 'mode' | 'namePath'> {
     toolbarProps: ToolbarActionType[];

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

@@ -3,7 +3,7 @@ import type { FormInstance } from 'antd/es/form/Form';
 import type { ButtonProps, FormListFieldData, FormListOperation, PopconfirmProps } from 'antd';
 import type { InternalNamePath } from 'antd/es/form/interface';
 import type { levelType } from '../../../../ProLayout/components/ProCollapse/PropTypes';
-import type { ProColumnType, ProFormOtherType } from '../../../propsType';
+import type { ProFormColumnType, ProFormOtherType } from '../../../propsType';
 export type TitleRender = (record: Record<string, any>, index: number, form: FormInstance) => any;
 export type TitleType = string | React.ReactNode | TitleRender;
 type Callback = (record: any, option: Pick<Option, 'namePath' | 'index' | 'operation' | 'form'>) => any | void;
@@ -32,7 +32,7 @@ export interface ToolbarActionType extends Omit<ActionType, 'actionType' | 'onHa
 }
 export type FormListMode = 'block' | 'line' | 'less';
 export interface FormListType {
-    columns: ProColumnType[];
+    columns: ProFormColumnType[];
     otherProps?: ProFormOtherType;
     form?: FormInstance;
     min?: number;

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { GroupType } from './propsType';
+import type { GroupType } from './propsType';
 /**
  * 1. 外层过滤FormItem相关属性, 但是子元素上的 required [disabled] [show] rules [fieldProps] [component] 需要取到并
  * 2.

package/es/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 { ColumnTypeMap, FunctionArgs, ProFormValueType, ReactiveFunction, ViewType } from '../../../propsType';
+import type { ColumnTypeMap, FunctionArgs, ProFormValueType, ReactiveFunction, ViewType } from '../../render/propsType';
 export interface SpaceType extends SpaceProps {
     /**
      * 是否紧凑合并

package/es/ProForm/components/combination/Group/utils.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="react" />
 import { InternalNamePath, NamePath } from 'antd/lib/form/interface';
 import { FormInstance } from 'antd';
-import { GroupColumnType, GroupType, SpaceType } from './propsType';
-import { ProFormColumnProps, ReactiveFunction } from '../../render/propsType';
+import type { GroupColumnType, GroupType, SpaceType } from './propsType';
+import type { ProFormColumnType, ReactiveFunction } from '../../render/propsType';
 export type EventArgs = any[];
 /**
  * 插入间隔符
@@ -41,7 +41,7 @@ export declare const getReactiveProps: (params: Params) => {
     fieldProps: boolean;
     desensitization: [number, number];
 };
-type ValueTypeGetterParams = Pick<ProFormColumnProps, 'valueType' | 'switchValue' | 'toISOString' | 'toCSTString' | 'disabled' | 'desensitization'> & {
+type ValueTypeGetterParams = Pick<ProFormColumnType, 'valueType' | 'switchValue' | 'toISOString' | 'toCSTString' | 'disabled' | 'desensitization'> & {
     type?: any;
     mode?: string;
     desensitizationKey?: string;

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

@@ -1,4 +1,4 @@
 /// <reference types="react" />
-import { ProCascaderType } from './propsType';
+import type { ProCascaderType } from './propsType';
 declare const _default: import("react").MemoExoticComponent<(props: ProCascaderType) => import("react/jsx-runtime").JSX.Element>;
 export default _default;

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

@@ -1,5 +1,5 @@
 import { FC } from 'react';
-import { ProCombinationType, ChildPropsItemType } from './propsType';
+import type { ProCombinationType, ChildPropsItemType } from './propsType';
 import './style/index.less';
 export declare const ProCombination: FC<ProCombinationType>;
 export declare const childPropsItemProps: FC<ChildPropsItemType>;

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

@@ -2,7 +2,7 @@ import { FieldNames } from 'rc-select/lib/Select';
 import { FormInstance } from 'antd';
 import React from 'react';
 import * as componentMap from '../../index';
-import { ProFormOtherType } from '../../../propsType';
+import type { ProFormOtherType } from '../../../propsType';
 export interface ChildPropsItemType {
     /**
      * @description       要显示什么组件，支持Input/Select

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

@@ -1,4 +1,4 @@
 import React from 'react';
-import { ProModalSelectType } from './propsType';
+import type { ProModalSelectType } from './propsType';
 declare const _default: React.ForwardRefExoticComponent<Omit<ProModalSelectType, "ref"> & React.RefAttributes<unknown>>;
 export default _default;

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

@@ -1,8 +1,8 @@
 import { FormInstance, InputProps, SelectProps, ModalProps } from 'antd';
 import { Service, Options } from 'ahooks/lib/useRequest/src/types';
 import React from 'react';
-import { ProColumnType } from '../../render/propsType';
-import { ProFormOtherType } from '../../../propsType';
+import type { ProFormColumnType } from '../../render/propsType';
+import type { ProFormOtherType } from '../../../propsType';
 /**
  * 模态框确认按钮回调函数类型
  * @param list 选中的数据列表
@@ -27,7 +27,7 @@ interface ConfigOption {
         initParams?: any;
     };
     /** 表单列配置项 */
-    formColumns?: ProColumnType[];
+    formColumns?: ProFormColumnType[];
     /** 选择模式：单选(radio)或多选(checkbox) */
     type?: 'radio' | 'checkbox';
     /** 是否开启分页功能 */
@@ -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/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,5 +1,5 @@
 import React from 'react';
-import { ProFormOtherType } from '../../../propsType';
+import type { ProFormOtherType } from '../../../propsType';
 export interface ProNumberRangeType {
     /**
      * @description       组件的值,[最小值，最大值]

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

@@ -2,9 +2,9 @@ import { DatePickerProps, TimePickerProps } from 'antd';
 import { PickerPanelDateProps } from 'antd/lib/calendar/generateCalendar';
 import { Moment } from 'moment';
 import React from 'react';
-import { ProFormOtherType } from '../../../propsType';
+import type { ProFormOtherType } from '../../../propsType';
 import { Props as ProRangeLimitType } from '../ProRangeLimit';
-import { DistributiveOmit } from '../../../../ProForm/propsType';
+import type { DistributiveOmit } from '../../../../ProForm/propsType';
 export type DateType = DatePickerProps['value'];
 export type ProTimeLimitType = DistributiveOmit<DatePickerProps, 'value' | 'onChange' | 'mode'> & {
     value?: string;

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;