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

package/lib/ProEnum/hooks/useEnum.js

@@ -1,14 +1,25 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _ProConfigProvider = require("../../ProConfigProvider");
 var _utils = require("../utils");
-var _ref;
 /* eslint-disable no-redeclare */
-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
@@ -17,24 +28,44 @@ var baseEnumStorage = (_ref = window.localStorage.getItem('zat-design-pro-compon
  * @returns
  */
 function useEnum(codes, value, compose) {
-  var _ref2 = (0, _ProConfigProvider.useProConfig)('globalConfig') || {},
-    _ref2$storage = _ref2.storage,
-    storage = _ref2$storage === void 0 ? 'localStorage' : _ref2$storage;
-  var _ref3 = (0, _ProConfigProvider.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 = (0, _utils.getEnumData)(storage, cacheKey, baseEnumStorage);
+  var _ref = (0, _ProConfigProvider.useProConfig)('globalConfig') || {},
+    _ref$storage = _ref.storage,
+    storage = _ref$storage === void 0 ? 'localStorage' : _ref$storage;
+  var _ref2 = (0, _ProConfigProvider.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 = (0, _utils.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 = (0, _objectSpread2.default)({}, 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;
@@ -44,8 +75,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;
@@ -68,8 +99,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/lib/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/lib/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/lib/ProEnum/utils/index.js

@@ -14,8 +14,15 @@ exports.setEnumData = setEnumData;
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _lodash = require("lodash");
 var _excluded = ["children"];
-function getEnumData(storage, cacheKey, baseEnumStorage) {
-  if (baseEnumStorage) {
+/**
+ * 获取枚举数据
+ * @param storage
+ * @param cacheKey
+ * @param baseEnumStorage
+ * @returns
+ */
+function getEnumData(storage, cacheKey, baseEnumStorage, dataSource) {
+  if (baseEnumStorage && cacheKey === 'zat-design-pro-component-cacheKey') {
     return baseEnumStorage;
   }
   if (storage === 'localStorage') {

package/lib/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/lib/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/lib/ProForm/components/base/Input/index.js

@@ -33,6 +33,19 @@ var Input = function Input(props) {
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   var initialConfig = (0, _ProConfigProvider.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 (0, _jsxRuntime.jsx)(_Container.default, {
+          viewEmpty: viewEmpty,
+          children: (0, _valueType.maskStringRangeWithRegex)(rest.value, desensitization)
+        });
+      }
+    }
     return (0, _jsxRuntime.jsx)(_Container.default, {
       viewEmpty: viewEmpty,
       children: rest.value
@@ -45,11 +58,11 @@ var Input = function Input(props) {
   }, (0, _lodash.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.default.cloneElement(ComInput, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
         allowClear: true,

package/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/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 { 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/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/ProForm/components/render/ChangedWrapper.d.ts

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

package/lib/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/lib/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 { ProColumnType } from './propsType';
-import { DiffConfigType } from '../../propsType';
+import type { ProFormColumnType } from './propsType';
+import type { DiffConfigType } from '../../propsType';
 interface Props<T = any> {
     isView?: boolean;
-    columns: ProColumnType[];
+    columns: ProFormColumnType[];
     disabled?: boolean;
     form: FormInstance<T>;
     expand?: boolean | number;