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

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 { FooterRenderProps } from './propsType';
+import type { FooterRenderType } from './propsType';
 export declare const PRO_FORM_CACHE = "PRO_FORM_CACHE";
-declare const FormFooter: React.FC<FooterRenderProps>;
+declare const FormFooter: React.FC<FooterRenderType>;
 export default FormFooter;

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

@@ -2,18 +2,23 @@ import { ButtonProps, ColProps, FormInstance } from 'antd';
 export interface ButtonItem extends ButtonProps {
     children?: any;
 }
-export interface FooterButtonProps {
+export interface FooterButtonType {
     okButtonProps?: ButtonItem;
     cancelButtonProps?: ButtonItem;
 }
-export interface FooterRenderProps {
+export interface FooterRenderType {
     okText?: string;
     cancelText?: string;
     onOk?: () => void;
     onCancel?: () => void;
     footerColProps?: ColProps;
-    footer?: FooterButtonProps;
+    footer?: FooterButtonType;
     confirmLoading?: boolean;
     formId?: string;
     form: FormInstance;
 }
+/**
+ * 兼容旧命名导出
+ */
+export type FooterButtonProps = FooterButtonType;
+export type FooterRenderProps = FooterRenderType;

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

@@ -1,13 +1,13 @@
 import React from 'react';
 import { CheckboxGroupProps } from 'antd/es/checkbox';
-import { ProFormOtherProps } from '../../../propsType';
+import type { ProFormOtherType } from '../../../propsType';
 export interface Props extends Omit<CheckboxGroupProps, 'options'> {
     dataSource: any[];
     fieldNames?: {
         label: string;
         value: string;
     };
-    otherProps?: ProFormOtherProps;
+    otherProps?: ProFormOtherType;
     isView?: boolean;
 }
 declare const Checkbox: React.FC<Props>;

package/lib/ProForm/components/base/Input/index.d.ts

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

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,7 +1,7 @@
-import { InputProps } from 'antd';
-import { FormInstance } from 'antd/es/form/Form';
-import { ProFormOtherProps } from '../../../propsType';
-export interface ProFieldProps<T = any> {
+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;
     name?: string;
@@ -9,9 +9,13 @@ export interface ProFieldProps<T = any> {
     fieldName?: string;
     placeholder?: string;
 }
-export interface IProps extends InputProps, ProFieldProps {
-    otherProps?: ProFormOtherProps;
+export interface Props extends InputProps, ProFieldType {
+    otherProps?: ProFormOtherType;
     isView?: boolean;
     /** 脱敏数据位置下标 */
     desensitization?: [number, number];
 }
+/**
+ * 兼容旧命名导出
+ */
+export type ProFieldProps<T = any> = ProFieldType<T>;

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

@@ -1,8 +1,8 @@
 import React from 'react';
 import { InputNumberProps } from 'antd';
-import { ProFormOtherProps } from '../../../propsType';
+import type { ProFormOtherType } from '../../../propsType';
 export interface Props extends Omit<InputNumberProps, 'onBlur'> {
-    otherProps?: ProFormOtherProps;
+    otherProps?: ProFormOtherType;
     range?: string;
     onBlur?: (value?: number, record?: any, object?: any) => void;
     isView?: boolean;

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

@@ -1,6 +1,6 @@
 import { RadioChangeEvent, RadioProps } from 'antd';
 import React from 'react';
-import { ProFormOtherProps } from '../../../propsType';
+import type { ProFormOtherType } from '../../../propsType';
 export interface Props extends Omit<RadioProps, 'options' | 'onChange'> {
     dataSource: any[];
     onChange: (value: any, e: RadioChangeEvent) => void;
@@ -8,7 +8,7 @@ export interface Props extends Omit<RadioProps, 'options' | 'onChange'> {
         label: string;
         value: string;
     };
-    otherProps?: ProFormOtherProps;
+    otherProps?: ProFormOtherType;
     isView?: boolean;
 }
 declare const Radio: React.FC<Props>;

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

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

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

@@ -1,10 +1,10 @@
 import { SelectProps } from 'antd';
 import React from 'react';
-import { ProFormOtherProps } from '../../../propsType';
+import type { ProFormOtherType } from '../../../propsType';
 export interface Props extends SelectProps {
     dataSource?: any[];
     scrollFollowParent?: boolean;
-    otherProps?: ProFormOtherProps;
+    otherProps?: ProFormOtherType;
     isView?: boolean;
 }
 declare const Select: React.FC<Props>;

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

@@ -1,9 +1,9 @@
 import { SwitchProps } from 'antd';
 import React from 'react';
-import { ProFormOtherProps } from '../../../propsType';
+import type { ProFormOtherType } from '../../../propsType';
 export interface Props extends Omit<SwitchProps, 'value'> {
     value: any;
-    otherProps?: ProFormOtherProps;
+    otherProps?: ProFormOtherType;
     isView?: boolean;
 }
 declare const Switch: React.FC<Props>;

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

@@ -1,9 +1,9 @@
 import * as React from 'react';
 import { CheckboxProps } from 'antd';
-import { ProFormOtherProps } from '../../../propsType';
+import type { ProFormOtherType } from '../../../propsType';
 export interface Props extends CheckboxProps {
     label?: string;
-    otherProps?: ProFormOtherProps;
+    otherProps?: ProFormOtherType;
     isView?: boolean;
 }
 declare const SwitchCheckbox: React.FC<Props>;

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

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

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

@@ -1,13 +1,13 @@
 import React from 'react';
 import type { TimePickerProps } from 'antd/es/time-picker';
-import { ProFormOtherProps } from '../../../propsType';
+import type { ProFormOtherType } from '../../../propsType';
 import './style/index.less';
 export interface Props {
     valueType?: string;
     format?: string;
     onChange?: (value: string) => void;
     value?: string;
-    otherProps?: ProFormOtherProps;
+    otherProps?: ProFormOtherType;
     isView?: boolean;
 }
 declare const TimePicker: React.FC<Props & TimePickerProps>;

package/lib/ProForm/components/combination/Container/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
-import { ContainerProps } from './propsType';
-declare const Container: React.FC<ContainerProps>;
+import { ContainerType } from './propsType';
+declare const Container: React.FC<ContainerType>;
 export default Container;

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

@@ -1,13 +1,17 @@
 import React from 'react';
-import { RowProps } from 'antd';
-import { ProColumnProps, ProFormOtherProps, DiffConfigProps } from '../../../propsType';
-export interface ContainerProps {
-    children?: ProColumnProps[];
-    otherProps?: ProFormOtherProps;
+import type { RowProps } from 'antd';
+import type { ProFormColumnType, ProFormOtherType, DiffConfigType } from '../../../propsType';
+export interface ContainerType {
+    children?: ProFormColumnType[];
+    otherProps?: ProFormOtherType;
     rowProps?: RowProps;
     className?: string;
     container?: string | React.ReactNode;
     show?: boolean | (() => boolean);
-    diffConfig?: DiffConfigProps;
+    diffConfig?: DiffConfigType;
     clearNotShow?: boolean;
 }
+/**
+ * 兼容旧命名导出
+ */
+export type ContainerProps = ContainerType;

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

@@ -1,11 +1,11 @@
 import { FormInstance, FormListFieldData, FormListOperation } from 'antd';
 import { InternalNamePath } from 'antd/es/form/interface';
 import React from 'react';
-import { FormListProps, ActionProps, FormListMode } from '../propsType';
+import type { FormListType, ActionType, FormListMode } from '../propsType';
 export interface Props {
-    min?: FormListProps['min'];
-    max?: FormListProps['max'];
-    actionProps: ActionProps[];
+    min?: FormListType['min'];
+    max?: FormListType['max'];
+    actionProps: ActionType[];
     namePath: InternalNamePath;
     form: FormInstance;
     field: Omit<FormListFieldData, 'key'> & {

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

@@ -2,9 +2,9 @@ import { ColProps, FormListFieldData } from 'antd';
 import React from 'react';
 import { InternalNamePath } from 'antd/es/form/interface';
 import type { levelType } from '../../../../../ProLayout/components/ProCollapse/PropTypes';
-import type { FormListProps } from '../propsType';
-import { DiffConfigProps } from '../../../../propsType';
-interface Props extends Omit<FormListProps, 'toolbarProps'> {
+import type { FormListType } from '../propsType';
+import type { DiffConfigType } from '../../../../propsType';
+interface Props extends Omit<FormListType, 'toolbarProps'> {
     index: number;
     namePath: InternalNamePath;
     disabled?: boolean;
@@ -15,7 +15,7 @@ interface Props extends Omit<FormListProps, 'toolbarProps'> {
     };
     level?: levelType;
     towCollapse?: boolean;
-    diffConfig?: DiffConfigProps;
+    diffConfig?: DiffConfigType;
 }
 declare const BlockFields: React.FC<Props>;
 export default BlockFields;

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

@@ -1,9 +1,9 @@
 import { ColProps, FormListFieldData } from 'antd';
 import React from 'react';
 import { InternalNamePath } from 'antd/es/form/interface';
-import { FormListProps } from '../propsType';
-import { DiffConfigProps } from '../../../../propsType';
-interface Props extends Omit<FormListProps, 'toolbarProps'> {
+import type { FormListType } from '../propsType';
+import type { DiffConfigType } from '../../../../propsType';
+interface Props extends Omit<FormListType, 'toolbarProps'> {
     className?: string;
     index: number;
     namePath: InternalNamePath;
@@ -13,7 +13,7 @@ interface Props extends Omit<FormListProps, 'toolbarProps'> {
     field: Omit<FormListFieldData, 'key'> & {
         key: string;
     };
-    diffConfig?: DiffConfigProps;
+    diffConfig?: DiffConfigType;
 }
 declare const LineFields: React.FC<Props>;
 export default LineFields;

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

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

package/lib/ProForm/components/combination/FormList/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
-import type { FormListRef, FormListProps } from './propsType';
-declare const _default: React.ForwardRefExoticComponent<FormListProps & React.RefAttributes<FormListRef>>;
+import type { FormListRefType, FormListType } from './propsType';
+declare const _default: React.ForwardRefExoticComponent<FormListType & React.RefAttributes<FormListRefType>>;
 export default _default;

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 { ProColumnProps, ProFormOtherProps } 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;
@@ -14,7 +14,7 @@ export interface Option {
     form: FormInstance;
     operation: FormListOperation;
 }
-export interface ActionProps extends Omit<ButtonProps, 'onClick' | 'type'> {
+export interface ActionType extends Omit<ButtonProps, 'onClick' | 'type'> {
     type?: 'add' | 'delete' | 'copy' | 'moveUp' | 'moveDown';
     onHandle?: Callback;
     onClick?: Callback;
@@ -24,21 +24,21 @@ export interface ActionProps extends Omit<ButtonProps, 'onClick' | 'type'> {
     title?: string;
     show?: boolean | ((record: any, option: Pick<Option, 'index' | 'form' | 'namePath'>) => boolean);
 }
-export interface ToolbarActionProps extends Omit<ActionProps, 'actionType' | 'onHandle' | 'onClick' | 'show' | 'type'> {
+export interface ToolbarActionType extends Omit<ActionType, 'actionType' | 'onHandle' | 'onClick' | 'show' | 'type'> {
     type?: 'add';
     onHandle?: ToolbarCallback;
     onClick?: ToolbarCallback;
     show?: boolean | ((record: any, option: Pick<Option, 'form' | 'namePath'>) => boolean);
 }
 export type FormListMode = 'block' | 'line' | 'less';
-export interface FormListProps {
-    columns: ProColumnProps[];
-    otherProps?: ProFormOtherProps;
+export interface FormListType {
+    columns: ProFormColumnType[];
+    otherProps?: ProFormOtherType;
     form?: FormInstance;
     min?: number;
     max?: number;
-    actionProps?: ActionProps[] | false;
-    toolbarProps?: ToolbarActionProps[] | false;
+    actionProps?: ActionType[] | false;
+    toolbarProps?: ToolbarActionType[] | false;
     value?: any[];
     onChange?: (record: any[], option: Pick<Option, 'namePath' | 'form'>) => void;
     fields: FormListFieldData[];
@@ -56,8 +56,16 @@ export interface FormListProps {
     draggable?: boolean;
     id?: string;
 }
-export type PropsWithRef = FormListProps & React.RefAttributes<FormListRef>;
-export interface FormListRef {
+export type TypeWithRef = FormListType & React.RefAttributes<FormListRefType>;
+export interface FormListRefType {
     operation: FormListOperation;
 }
+/**
+ * 兼容旧命名导出
+ */
+export type ActionProps = ActionType;
+export type ToolbarActionProps = ToolbarActionType;
+export type FormListProps = FormListType;
+export type PropsWithRef = TypeWithRef;
+export type FormListRef = FormListRefType;
 export {};

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

@@ -1,10 +1,10 @@
 import React from 'react';
-import { GroupProps } from './propsType';
+import type { GroupType } from './propsType';
 /**
  * 1. 外层过滤FormItem相关属性, 但是子元素上的 required [disabled] [show] rules [fieldProps] [component] 需要取到并
  * 2.
  *
  * render内部能力 show, component, value, onChange, disabled, clearNotShow, fieldProps
  */
-declare const Group: React.FC<GroupProps>;
+declare const Group: React.FC<GroupType>;
 export default Group;

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 { ColumnPropsMap, FunctionArgs, ProFormValueType, ReactiveFunction, ViewType } from '../../../propsType';
+import type { ColumnTypeMap, FunctionArgs, ProFormValueType, ReactiveFunction, ViewType } from '../../render/propsType';
 export interface SpaceType extends SpaceProps {
     /**
      * 是否紧凑合并
@@ -17,8 +17,8 @@ export interface SpaceType extends SpaceProps {
     /** 间隔距离 */
     size?: number;
 }
-export interface GroupProps {
-    children?: GroupColumnProps[];
+export interface GroupType {
+    children?: GroupColumnType[];
     space?: SpaceType;
     className?: string;
     id?: string;
@@ -28,7 +28,7 @@ export interface GroupProps {
     onChange?: (value: any[] | null, options?: any[]) => void;
     otherProps?: any;
 }
-export type GroupColumnProps<Values = any> = {
+export type GroupColumnType<Values = any> = {
     component?: React.ReactNode | ReactiveFunction<Values, React.ReactNode>;
     names?: NamePath[];
     show?: boolean | ReactiveFunction<Values, boolean>;
@@ -51,4 +51,9 @@ export type GroupColumnProps<Values = any> = {
     valuePropName?: string;
     getValueProps?: (value: any) => Record<string, unknown>;
     desensitization?: [number, number] | ReactiveFunction<Values, [number, number]>;
-} & ColumnPropsMap & FormItemProps;
+} & ColumnTypeMap & FormItemProps;
+/**
+ * 兼容旧命名导出
+ */
+export type GroupProps = GroupType;
+export type GroupColumnProps<Values = any> = GroupColumnType<Values>;

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

@@ -1,15 +1,15 @@
 /// <reference types="react" />
 import { InternalNamePath, NamePath } from 'antd/lib/form/interface';
 import { FormInstance } from 'antd';
-import { GroupColumnProps, GroupProps, 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[];
 /**
  * 插入间隔符
  * @param columns 表单配置数组
  * @returns
  */
-export declare const insertSeparator: (columns: GroupColumnProps[], space?: SpaceType) => any[];
+export declare const insertSeparator: (columns: GroupColumnType[], space?: SpaceType) => any[];
 /** 带出event的组件默认取值方法 */
 export declare function defaultGetValueFromEvent(valuePropName: string, ...args: EventArgs): any;
 /** 转换names */
@@ -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;
@@ -51,7 +51,7 @@ export declare const getValueTypeTrans: (params: ValueTypeGetterParams) => any;
 /** 执行所有中间件 返回处理后的值 */
 export declare const getValueMiddleware: (value: any, callbacks?: any[]) => any;
 interface ColumnsTransformerParams {
-    columns: GroupColumnProps[];
+    columns: GroupColumnType[];
     name?: NamePath;
     names?: NamePath[];
     value?: any[];
@@ -61,7 +61,7 @@ interface ColumnsTransformerParams {
     index?: number;
     formDisabled?: boolean;
     desensitizationKey?: string;
-    groupProps: GroupProps;
+    groupProps: GroupType;
 }
 /** 转换columns */
 export declare const useTransformColumns: (params: ColumnsTransformerParams) => any[];

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

@@ -1,4 +1,4 @@
 /// <reference types="react" />
-import { ProCascaderProps } from './propsType';
-declare const _default: import("react").MemoExoticComponent<(props: ProCascaderProps) => import("react/jsx-runtime").JSX.Element>;
+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/ProCascader/propsType.d.ts

@@ -1,13 +1,13 @@
 import { ReactNode } from 'react';
 import { DefaultOptionType } from 'rc-select/lib/Select';
 import { Service } from 'ahooks/lib/useRequest/src/types';
-export interface fieldNamesProps {
+export interface FieldNamesType {
     label: string;
     value: string;
     children?: string;
     [key: string]: string;
 }
-export interface ProCascaderProps {
+export interface ProCascaderType {
     className?: string;
     mode?: 'address' | 'default';
     isView?: boolean;
@@ -16,7 +16,7 @@ export interface ProCascaderProps {
     hasDetail?: boolean;
     tooltip?: boolean | ReactNode;
     detailMaxLength?: number;
-    fieldNames?: fieldNamesProps;
+    fieldNames?: FieldNamesType;
     dataSource?: DefaultOptionType[];
     useRequest?: {
         loadData?: boolean;
@@ -38,3 +38,8 @@ export interface ProCascaderProps {
     scrollFollowParent?: boolean;
     desensitization?: [number, number];
 }
+/**
+ * 兼容旧命名导出
+ */
+export type fieldNamesProps = FieldNamesType;
+export type ProCascaderProps = ProCascaderType;

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

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

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

@@ -2,8 +2,8 @@ import { FieldNames } from 'rc-select/lib/Select';
 import { FormInstance } from 'antd';
 import React from 'react';
 import * as componentMap from '../../index';
-import { ProFormOtherProps } from '../../../propsType';
-export interface ChildPropsItemProps {
+import type { ProFormOtherType } from '../../../propsType';
+export interface ChildPropsItemType {
     /**
      * @description       要显示什么组件，支持Input/Select
      * @default           Input
@@ -22,7 +22,7 @@ export interface ChildPropsItemProps {
     onChange?: (value: any, option: any, form: FormInstance) => void;
     [name: string]: any;
 }
-export interface ProCombinationProps {
+export interface ProCombinationType {
     /**
      * @description       组件的值,[第一个组件的值,第二个组件的值,]
      * @default           []
@@ -42,7 +42,7 @@ export interface ProCombinationProps {
      * @description       子组件内部组件可配置属性,按照数组顺序注入到内部组件中
      * @default           [{},{}]
      */
-    childProps?: Array<ChildPropsItemProps>;
+    childProps?: Array<ChildPropsItemType>;
     /**
      * @description       是否视图模式
      * @default           false
@@ -58,6 +58,11 @@ export interface ProCombinationProps {
      * @default           '-'
      */
     separator?: string;
-    otherProps?: ProFormOtherProps;
+    otherProps?: ProFormOtherType;
     id?: string;
 }
+/**
+ * 兼容旧命名导出
+ */
+export type ChildPropsItemProps = ChildPropsItemType;
+export type ProCombinationProps = ProCombinationType;