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

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/hooks/useEnum.d.ts

@@ -4,7 +4,7 @@ import { DataOption } from '../propsType';
  * @param code
  * const [options,fn] = useEnum("code")
  */
-declare function useEnum(code: string): [DataOption[], (val: string, showCodeName?: boolean) => string];
+declare function useEnum(code?: string): [DataOption[], (val: string, showCodeName?: boolean) => string];
 /**
  * input codes output { code1:DataOption[],code2:DataOption[] }
  * @param codes
@@ -17,5 +17,5 @@ declare function useEnum(codes: string[]): Record<string, DataOption[]>;
  * @param value
  * @param compose 展示 value-label
  */
-declare function useEnum(code: string, value?: string, compose?: boolean): [string, DataOption];
+declare function useEnum(code?: string, value?: string, compose?: boolean): [string, DataOption];
 export default useEnum;

package/es/ProEnum/hooks/useEnum.js

@@ -1,8 +1,17 @@
-var _ref;
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 /* eslint-disable no-redeclare */
 import { useProConfig } from '../../ProConfigProvider';
 import { getEnumData } from '../utils';
-var baseEnumStorage = (_ref = window.localStorage.getItem('zat-design-pro-component-cacheKey') && JSON.parse(window.localStorage.getItem('zat-design-pro-component-cacheKey'))) !== null && _ref !== void 0 ? _ref : null;
+var baseEnumStorage = null;
+try {
+  var storedData = window.localStorage.getItem('zat-design-pro-component-cacheKey');
+  if (storedData) {
+    baseEnumStorage = JSON.parse(storedData);
+  }
+} catch (error) {
+  console.error('解析枚举缓存数据失败', error);
+  baseEnumStorage = null;
+}
 /**
  * 根据 code 从枚举缓存取出对应的 options 、以及回显
  * @param codes
@@ -11,24 +20,44 @@ var baseEnumStorage = (_ref = window.localStorage.getItem('zat-design-pro-compon
  * @returns
  */
 function useEnum(codes, value, compose) {
-  var _ref2 = useProConfig('globalConfig') || {},
-    _ref2$storage = _ref2.storage,
-    storage = _ref2$storage === void 0 ? 'localStorage' : _ref2$storage;
-  var _ref3 = useProConfig('ProEnum') || {},
-    _ref3$cacheKey = _ref3.cacheKey,
-    cacheKey = _ref3$cacheKey === void 0 ? 'zat-design-pro-component-cacheKey' : _ref3$cacheKey,
-    _ref3$fieldNames = _ref3.fieldNames,
-    fieldNames = _ref3$fieldNames === void 0 ? {} : _ref3$fieldNames,
-    _ref3$clear = _ref3.clear,
-    clear = _ref3$clear === void 0 ? true : _ref3$clear;
-  var catchData = getEnumData(storage, cacheKey, baseEnumStorage);
+  var _ref = useProConfig('globalConfig') || {},
+    _ref$storage = _ref.storage,
+    storage = _ref$storage === void 0 ? 'localStorage' : _ref$storage;
+  var _ref2 = useProConfig('ProEnum') || {},
+    _ref2$cacheKey = _ref2.cacheKey,
+    cacheKey = _ref2$cacheKey === void 0 ? 'zat-design-pro-component-cacheKey' : _ref2$cacheKey,
+    _ref2$fieldNames = _ref2.fieldNames,
+    fieldNames = _ref2$fieldNames === void 0 ? {} : _ref2$fieldNames,
+    _ref2$clear = _ref2.clear,
+    clear = _ref2$clear === void 0 ? true : _ref2$clear,
+    _ref2$dataSource = _ref2.dataSource,
+    dataSource = _ref2$dataSource === void 0 ? {} : _ref2$dataSource;
+  var catchData = getEnumData(storage, cacheKey, baseEnumStorage, dataSource);
   // 默认枚举缓存数据
   baseEnumStorage = catchData;
   if (!codes) {
+    if (!Object.keys(catchData).length) {
+      return [];
+    }
     return catchData;
   }
   var fieldLabel = '';
   var fieldValue = '';
+  // 获取枚举数据源
+  var enumDataSource = (catchData === null || catchData === void 0 ? void 0 : catchData.data) || {};
+  // 当dataSource有值时，检查是否需要合并
+  if (dataSource && Object.keys(dataSource).length > 0) {
+    // 创建合并后的数据源
+    var mergedDataSource = _objectSpread({}, enumDataSource);
+    // 遍历dataSource中的每个键
+    Object.keys(dataSource).forEach(function (key) {
+      // 如果enumDataSource中不存在该键或者该键对应的值为空数组，则合并
+      if (!enumDataSource[key] || enumDataSource[key].length === 0) {
+        mergedDataSource[key] = dataSource[key];
+      }
+    });
+    enumDataSource = mergedDataSource;
+  }
   if (fieldNames && Object.keys(fieldNames).length) {
     fieldLabel = fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.label;
     fieldValue = fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value;
@@ -38,8 +67,8 @@ function useEnum(codes, value, compose) {
     fieldValue = 'value';
   }
   if (typeof codes === 'string') {
-    var _catchData$data;
-    var options = (catchData === null || catchData === void 0 ? void 0 : (_catchData$data = catchData.data) === null || _catchData$data === void 0 ? void 0 : _catchData$data[codes]) || [];
+    var _enumDataSource;
+    var options = ((_enumDataSource = enumDataSource) === null || _enumDataSource === void 0 ? void 0 : _enumDataSource[codes]) || [];
     var getEnumLabel = function getEnumLabel(v, composezTow) {
       var option = options.find(function (item) {
         return item[fieldValue] === v;
@@ -62,8 +91,8 @@ function useEnum(codes, value, compose) {
   if (Array.isArray(codes)) {
     var _options = {};
     codes.forEach(function (code) {
-      var _catchData$data2;
-      var values = catchData === null || catchData === void 0 ? void 0 : (_catchData$data2 = catchData.data) === null || _catchData$data2 === void 0 ? void 0 : _catchData$data2[code];
+      var _enumDataSource2;
+      var values = (_enumDataSource2 = enumDataSource) === null || _enumDataSource2 === void 0 ? void 0 : _enumDataSource2[code];
       if (Array.isArray(values) && values.length) {
         _options[code] = values;
       }

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/ProEnum/utils/index.d.ts

@@ -4,7 +4,14 @@ interface EnumRes {
     data: Record<string, DataOption[]>;
     [key: string]: any;
 }
-export declare function getEnumData(storage: StorageType, cacheKey: string, baseEnumStorage?: any): EnumRes;
+/**
+ * 获取枚举数据
+ * @param storage
+ * @param cacheKey
+ * @param baseEnumStorage
+ * @returns
+ */
+export declare function getEnumData(storage: StorageType, cacheKey: string, baseEnumStorage?: any, dataSource?: any[]): EnumRes;
 export declare function setEnumData(storage: StorageType, cacheKey: string, data: any): boolean;
 export declare function hasEnumList(storage: StorageType, cacheKey: any, code: string): import("../propsType").DataOptionType[];
 export declare function isObject(obj: any): boolean;

package/es/ProEnum/utils/index.js

@@ -1,8 +1,15 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["children"];
 import { isNull, isUndefined } from 'lodash';
-export function getEnumData(storage, cacheKey, baseEnumStorage) {
-  if (baseEnumStorage) {
+/**
+ * 获取枚举数据
+ * @param storage
+ * @param cacheKey
+ * @param baseEnumStorage
+ * @returns
+ */
+export function getEnumData(storage, cacheKey, baseEnumStorage, dataSource) {
+  if (baseEnumStorage && cacheKey === 'zat-design-pro-component-cacheKey') {
     return baseEnumStorage;
   }
   if (storage === 'localStorage') {

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/index.js

@@ -27,6 +27,19 @@ var Input = function Input(props) {
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   var initialConfig = useProConfig('Input');
   if (isView) {
+    if ((desensitization === null || desensitization === void 0 ? void 0 : desensitization.length) && (props === null || props === void 0 ? void 0 : props.disabled)) {
+      var isDesensit = sessionStorage.getItem(otherProps === null || otherProps === void 0 ? void 0 : otherProps.desensitizationKey);
+      if (isDesensit === 'ON') {
+        if (typeof rest.value === 'number') {
+          var _rest$value, _rest$value$toString;
+          rest.value = rest === null || rest === void 0 ? void 0 : (_rest$value = rest.value) === null || _rest$value === void 0 ? void 0 : (_rest$value$toString = _rest$value.toString) === null || _rest$value$toString === void 0 ? void 0 : _rest$value$toString.call(_rest$value);
+        }
+        return _jsx(Container, {
+          viewEmpty: viewEmpty,
+          children: maskStringRangeWithRegex(rest.value, desensitization)
+        });
+      }
+    }
     return _jsx(Container, {
       viewEmpty: viewEmpty,
       children: rest.value
@@ -39,11 +52,11 @@ var Input = function Input(props) {
   }, omit(initialConfig, ['trim'])), rest));
   // 仅查看模式下进行数据脱敏
   if ((desensitization === null || desensitization === void 0 ? void 0 : desensitization.length) && (props === null || props === void 0 ? void 0 : props.disabled)) {
-    var isDesensit = sessionStorage.getItem(otherProps === null || otherProps === void 0 ? void 0 : otherProps.desensitizationKey);
-    if (isDesensit === 'ON') {
+    var _isDesensit = sessionStorage.getItem(otherProps === null || otherProps === void 0 ? void 0 : otherProps.desensitizationKey);
+    if (_isDesensit === 'ON') {
       if (typeof rest.value === 'number') {
-        var _rest$value, _rest$value$toString;
-        rest.value = rest === null || rest === void 0 ? void 0 : (_rest$value = rest.value) === null || _rest$value === void 0 ? void 0 : (_rest$value$toString = _rest$value.toString) === null || _rest$value$toString === void 0 ? void 0 : _rest$value$toString.call(_rest$value);
+        var _rest$value2, _rest$value2$toString;
+        rest.value = rest === null || rest === void 0 ? void 0 : (_rest$value2 = rest.value) === null || _rest$value2 === void 0 ? void 0 : (_rest$value2$toString = _rest$value2.toString) === null || _rest$value2$toString === void 0 ? void 0 : _rest$value2$toString.call(_rest$value2);
       }
       return /*#__PURE__*/React.cloneElement(ComInput, _objectSpread(_objectSpread(_objectSpread({
         allowClear: true,

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       组件的值,[最小值，最大值]