@zat-design/sisyphus-react 3.14.0-beta.2 → 4.0.0-beta.10

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

@@ -1,3 +1,4 @@
+import * as componentMap from './index';
 export { default as Select } from './base/Select';
 export { default as DatePicker } from './base/DatePicker';
 export { default as RangePicker } from './base/RangePicker';
@@ -12,8 +13,6 @@ export { default as TimePicker } from './base/TimePicker';
 export { default as FormList } from './combination/FormList';
 export { default as ProEditTable } from '../../ProEditTable';
 export { default as ProCascader } from './combination/ProCascader';
-export { default as ProAddressBar } from './combination/ProCascader';
-export { default as ProCombination } from './combination/ProCombination';
 export { default as ProNumberRange } from './combination/ProNumberRange';
 export { default as ProModalSelect } from './combination/ProModalSelect';
 export { default as ProTimeLimit } from './combination/ProTimeLimit';
@@ -27,10 +26,4 @@ export { default as ProUpload } from '../../ProUpload';
 export { default as ProTreeModal } from '../../ProTreeModal';
 export { default as ProTree } from '../../ProTree';
 export { default as FormFooter } from './FormFooter';
-export { default as ProAddress, transferAddressInfoToRegion } from './old/ProAddress';
-export { default as EnumSelect } from './old/EnumSelect';
-export { default as InputRange } from './old/InputRange';
-export { default as ProRangeBox } from './old/ProRangeBox';
-export { default as ProCertValidity } from './old/ProCertValidity';
-export { default as ProCertNo } from './old/ProCertNo';
-export type ProFormComponentType = 'Select' | 'DatePicker' | 'RangePicker' | 'TextArea' | 'Switch' | 'Radio' | 'Checkbox' | 'Input' | 'InputNumber' | 'SwitchCheckbox' | 'TimePicker' | 'FormList' | 'ProEditTable' | 'ProCascader' | 'ProAddressBar' | 'ProCombination' | 'ProNumberRange' | 'ProModalSelect' | 'ProTimeLimit' | 'ProRangeLimit' | 'Group' | 'ProCollapse' | 'Container' | 'ProEnum' | 'ProSelect' | 'ProUpload' | 'ProTreeModal' | 'ProTree' | 'FormFooter' | 'ProAddress' | 'EnumSelect' | 'InputRange' | 'ProRangeBox' | 'ProCertValidity' | 'ProCertNo';
+export type ProFormComponentType = keyof typeof componentMap;

package/es/ProForm/components/index.js

@@ -15,8 +15,6 @@ export { default as ProEditTable } from "../../ProEditTable";
 
 // combination 组合组件
 export { default as ProCascader } from "./combination/ProCascader";
-export { default as ProAddressBar } from "./combination/ProCascader";
-export { default as ProCombination } from "./combination/ProCombination";
 export { default as ProNumberRange } from "./combination/ProNumberRange";
 export { default as ProModalSelect } from "./combination/ProModalSelect";
 export { default as ProTimeLimit } from "./combination/ProTimeLimit";
@@ -33,12 +31,4 @@ export { default as ProTree } from "../../ProTree";
 // footer组件
 export { default as FormFooter } from "./FormFooter";
 
-// old 组件待移除
-export { default as ProAddress, transferAddressInfoToRegion } from "./old/ProAddress";
-export { default as EnumSelect } from "./old/EnumSelect";
-export { default as InputRange } from "./old/InputRange";
-export { default as ProRangeBox } from "./old/ProRangeBox";
-export { default as ProCertValidity } from "./old/ProCertValidity";
-export { default as ProCertNo } from "./old/ProCertNo";
-
-// 类型导出 - 基于导出的组件名称定义
+// 类型定义

package/es/ProForm/components/render/ChangedWrapper.js

@@ -1,10 +1,7 @@
-import "antd/es/tooltip/style";
-import _Tooltip from "antd/es/tooltip";
-import "antd/es/space/style";
-import _Space from "antd/es/space";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["name", "names", "namesStr", "form", "onDiff", "children", "type", "diffConfig", "valuePropName", "normalize", "getValueProps", "viewRender"];
+import { Space, Tooltip } from 'antd';
 import classNames from 'classnames';
 import { get } from 'lodash';
 import React, { useMemo } from 'react';
@@ -108,20 +105,22 @@ var ChangedWrapper = props => {
   var scrollFollowParentConfig = componentsWithFloatWindow.includes(type) ? {
     scrollFollowParent
   } : {};
-  return /*#__PURE__*/_jsx(_Tooltip, {
+  return /*#__PURE__*/_jsx(Tooltip, {
     open: open,
     getPopupContainer: trigger => scrollFollowParent ? trigger.parentElement : document.body,
-    overlayClassName: "original-value-tooltip",
+    classNames: {
+      root: 'original-value-tooltip'
+    },
     placement: "topLeft",
     autoAdjustOverflow: false,
-    title: /*#__PURE__*/_jsxs(_Space, {
+    title: /*#__PURE__*/_jsxs(Space, {
       direction: "vertical",
       className: "changed-tooltip",
-      children: [/*#__PURE__*/_jsxs(_Space, {
+      children: [/*#__PURE__*/_jsxs(Space, {
         align: "start",
         className: "original-value-container",
         children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
-      }), _showEllipse && /*#__PURE__*/_jsxs(_Space, {
+      }), _showEllipse && /*#__PURE__*/_jsxs(Space, {
         className: "current-value-container",
         children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, children.props), rest), scrollFollowParentConfig), {}, {
           isView: true

package/es/ProForm/components/render/ConfirmWrapper.js

@@ -1,12 +1,11 @@
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/modal/style";
-import _Modal from "antd/es/modal";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["onChange", "children", "confirm"];
+var _excluded = ["onChange", "children", "confirm", "otherProps"];
 import { isFunction, isObject } from 'lodash';
 import React from 'react';
+import { Modal } from 'antd';
 import ProForm from "../../index";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -18,9 +17,10 @@ var ConfirmWrapper = props => {
   var onChange = props.onChange,
     children = props.children,
     confirm = props.confirm,
+    otherProps = props.otherProps,
     rest = _objectWithoutProperties(props, _excluded);
-  var otherProps = ProForm.useFieldProps() || props.otherProps;
-  var form = otherProps.form;
+  var _ProForm$useFieldProp = ProForm.useFieldProps(),
+    form = _ProForm$useFieldProp.form;
   var handleChange = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(value) {
       var _len,
@@ -62,12 +62,12 @@ var ConfirmWrapper = props => {
               onChange === null || onChange === void 0 || onChange(_value, ...other);
             }
             if (confirmProps === true) {
-              _Modal.confirm(_objectSpread(_objectSpread({}, defaultConfirmProps), {}, {
+              Modal.confirm(_objectSpread(_objectSpread({}, defaultConfirmProps), {}, {
                 onOk: () => onChange === null || onChange === void 0 ? void 0 : onChange(_value, ...other)
               }));
             }
             if (isObject(confirmProps)) {
-              _Modal.confirm(_objectSpread(_objectSpread(_objectSpread({}, 'title' in confirmProps || 'content' in confirmProps ? {} : defaultConfirmProps), confirmProps), {}, {
+              Modal.confirm(_objectSpread(_objectSpread(_objectSpread({}, 'title' in confirmProps || 'content' in confirmProps ? {} : defaultConfirmProps), confirmProps), {}, {
                 onOk: function () {
                   var _onOk = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
                     var _confirmProps$onOk;

package/es/ProForm/components/render/Render.js

@@ -1,17 +1,10 @@
-import "antd/es/col/style";
-import _Col from "antd/es/col";
-import "antd/es/space/style";
-import _Space from "antd/es/space";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import "antd/es/form/style";
-import _Form from "antd/es/form";
-import "antd/es/input/style";
-import _Input from "antd/es/input";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip", "validateFirst"];
 /* eslint-disable prefer-destructuring */
+import { Col, Form, Input, Space } from 'antd';
 import React, { useMemo } from 'react';
 import classNames from 'classnames';
 import { ReactSVG } from 'react-svg';
@@ -52,7 +45,8 @@ var Render = props => {
     globalControl = props.globalControl,
     diffConfig = props.diffConfig,
     viewRender = props.viewRender,
-    desensitization = props.desensitization;
+    desensitization = props.desensitization,
+    shouldUpdateDebounce = props.shouldUpdateDebounce;
   var colProps = props.colProps;
 
   // 剔除一些不是FormItem的属性, 防止控制台报warning
@@ -81,7 +75,8 @@ var Render = props => {
       component,
       originComponent,
       type,
-      desensitization
+      desensitization,
+      shouldUpdateDebounce
     }),
     shouldUpdate = _useShouldUpdate.shouldUpdate,
     _show = _useShouldUpdate.show,
@@ -192,7 +187,7 @@ var Render = props => {
   });
   if (formItemProps.hidden === true || _show === false) {
     // 为了监听shouldUpdate  必须存在一个FormItem, 空Input解决 【[antd: Form.Item] `name` is only used for validate React element】
-    return /*#__PURE__*/_jsx(_Form.Item, {
+    return /*#__PURE__*/_jsx(Form.Item, {
       name: _otherFormItemProps.name || 'proFormItemHidden',
       shouldUpdate: _otherFormItemProps.shouldUpdate,
       className: _className,
@@ -201,7 +196,7 @@ var Render = props => {
       rules: [{
         required: false
       }],
-      children: /*#__PURE__*/_jsx(_Input, {})
+      children: /*#__PURE__*/_jsx(Input, {})
     });
   }
 
@@ -368,7 +363,7 @@ var Render = props => {
     var internalItemRender = {
       mark: 'pro_table_render',
       render: (inputProps, doms) => /*#__PURE__*/_jsxs(_Fragment, {
-        children: [/*#__PURE__*/_jsx(_Space, {
+        children: [/*#__PURE__*/_jsx(Space, {
           size: 0,
           style: {
             marginTop: 8
@@ -390,13 +385,19 @@ var Render = props => {
             },
             children: formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.after
           }) : null]
-        }), /*#__PURE__*/_jsx(_Space, {
+        }), /*#__PURE__*/_jsx(Space, {
           size: 0,
           style: {
             marginTop: 8
           },
           children: formItemProps.extra
-        }), doms.errorList]
+        }), doms.errorList ? /*#__PURE__*/_jsx("div", {
+          className: "ant-form-item-additional",
+          style: {
+            minHeight: '16px'
+          },
+          children: doms.errorList
+        }) : null]
       })
     };
     // 自定义组件移除otherProps参数
@@ -444,11 +445,11 @@ var Render = props => {
       colProps = _objectSpread(_objectSpread({}, colProps), {}, {
         span: lessMode ? colProps.span : 24 // 默认占一行
       });
-      return /*#__PURE__*/_jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
+      return /*#__PURE__*/_jsx(Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
         // @ts-ignore
         _internalItemRender: internalItemRender,
         className: _className,
-        children: /*#__PURE__*/_jsx(_Form.List, _objectSpread(_objectSpread({
+        children: /*#__PURE__*/_jsx(Form.List, _objectSpread(_objectSpread({
           name: _otherFormItemProps.name
         }, omit(_otherFormItemProps, ['rules'])), {}, {
           children: (fields, operation, meta) => {
@@ -471,16 +472,16 @@ var Render = props => {
     }
     if (diffConfig !== null && diffConfig !== void 0 && diffConfig.originalValues) {
       var _otherProps$namePath, _otherProps$names2;
-      var _names = otherProps.names;
+      var nextNames = otherProps.names;
       // FormList中的names字段需要去除前缀
       if (otherProps !== null && otherProps !== void 0 && (_otherProps$namePath = otherProps.namePath) !== null && _otherProps$namePath !== void 0 && _otherProps$namePath.length && (_otherProps$names2 = otherProps.names) !== null && _otherProps$names2 !== void 0 && _otherProps$names2.length) {
         var _otherProps$namePath2;
         var prefixLength = (otherProps === null || otherProps === void 0 || (_otherProps$namePath2 = otherProps.namePath) === null || _otherProps$namePath2 === void 0 ? void 0 : _otherProps$namePath2.length) - 1;
-        _names = otherProps.names.map(name => name.slice(prefixLength));
+        nextNames = otherProps.names.map(name => name.slice(prefixLength));
       }
       child = /*#__PURE__*/_jsx(ChangedWrapper, {
         name: formItemProps.name,
-        names: _names,
+        names: nextNames,
         namesStr: namesStr,
         diffConfig: diffConfig,
         form: form,
@@ -495,7 +496,7 @@ var Render = props => {
         children: child
       });
     }
-    return /*#__PURE__*/_jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
+    return /*#__PURE__*/_jsx(Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
       // @ts-ignore
       _internalItemRender: internalItemRender,
       className: _className,
@@ -506,24 +507,22 @@ var Render = props => {
     children: [_otherFormItemProps.shouldUpdate ?
     /*#__PURE__*/
     // 空标签防止气泡不显示
-    _jsx(_Fragment, {
-      children: /*#__PURE__*/_jsx(_Form.Item, {
-        shouldUpdate: _otherFormItemProps.shouldUpdate,
-        noStyle: true,
-        children: () => renderItem()
-      })
+    _jsx(Form.Item, {
+      shouldUpdate: _otherFormItemProps.shouldUpdate,
+      noStyle: true,
+      children: () => renderItem()
     }) : renderItem(), otherProps !== null && otherProps !== void 0 && (_otherProps$names3 = otherProps.names) !== null && _otherProps$names3 !== void 0 && _otherProps$names3.length ? otherProps.names.map(name => {
-      return /*#__PURE__*/_jsx(_Form.Item, {
+      return /*#__PURE__*/_jsx(Form.Item, {
         hidden: true,
         name: name,
-        children: /*#__PURE__*/_jsx(_Input, {})
+        children: /*#__PURE__*/_jsx(Input, {})
       }, name);
     }) : null]
   });
   if (formItemProps !== null && formItemProps !== void 0 && formItemProps.parentNames) {
     return FormItem;
   }
-  return /*#__PURE__*/_jsx(_Col, _objectSpread(_objectSpread({}, colProps), {}, {
+  return /*#__PURE__*/_jsx(Col, _objectSpread(_objectSpread({}, colProps), {}, {
     children: FormItem
   }));
 };

package/es/ProForm/components/render/RenderFields.d.ts

@@ -20,6 +20,7 @@ interface Props<T = any> {
     requiredOnView?: boolean;
     required?: boolean | boolean[] | (() => boolean | boolean[]);
     globalControl?: boolean;
+    shouldUpdateDebounce?: number;
 }
 declare const RenderFields: React.FC<Props>;
 export default RenderFields;

package/es/ProForm/components/render/RenderFields.js

@@ -28,7 +28,8 @@ var RenderFields = props => {
     requiredOnView = props.requiredOnView,
     required = props.required,
     diffConfig = props.diffConfig,
-    globalControl = props.globalControl;
+    globalControl = props.globalControl,
+    shouldUpdateDebounce = props.shouldUpdateDebounce;
 
   // 是否包含隐藏字段
   var hiddenData = columns.filter(item => {
@@ -208,7 +209,8 @@ var RenderFields = props => {
       listName: column.listName,
       globalControl,
       formDisabled,
-      diffConfig
+      diffConfig,
+      shouldUpdateDebounce
     };
     return /*#__PURE__*/_jsx(FieldProvider, {
       value: otherProps,
@@ -238,7 +240,8 @@ var RenderFields = props => {
         requiredOnView: requiredOnView,
         globalControl: globalControl,
         viewRender: viewRender,
-        desensitization: desensitization
+        desensitization: desensitization,
+        shouldUpdateDebounce: shouldUpdateDebounce
       })
     }, `${_formItemProps.name || _formItemProps.label}${index}`);
   });

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

@@ -16,11 +16,10 @@ import type { Props as SwitchProps } from '../base/Switch';
 import type { Props as SwitchCheckboxProps } from '../base/SwitchCheckbox';
 import type { Props as TextAreaProps } from '../base/TextArea';
 import type { ProCascaderType } from '../combination/ProCascader/propsType';
-import type { ProCombinationType } from '../combination/ProCombination/propsType';
 import type { ProModalSelectType } from '../combination/ProModalSelect/propsType';
 import type { ProNumberRangeType } from '../combination/ProNumberRange/propsType';
 import type { ProLimitProps } from '../combination/ProTimeLimit';
-import type { Props as ProRangeLimitProps } from '../combination/ProRangeLimit';
+import type { ProRangeLimitType } from '../combination/ProRangeLimit/propsType';
 import type { CheckboxPropsMap, ProEnum, PropProSelectsMap, PropRadioPropsMap } from '../../../ProEnum/propsType';
 import type { PropSelectProps as ProSelectProps } from '../../../ProSelect/propsType';
 import type { ProEditTableType } from '../../../ProEditTable/propsType';
@@ -123,9 +122,6 @@ export type ColumnTypeMap<Values = any, T = 'ProForm'> = {
 } | {
     type?: 'ProCascader';
     fieldProps?: FieldType<ProCascaderType, Values, T>;
-} | {
-    type?: 'ProCombination';
-    fieldProps?: FieldType<ProCombinationType, Values, T>;
 } | {
     type?: 'ProModalSelect';
     fieldProps?: FieldType<ProModalSelectType, Values, T>;
@@ -134,7 +130,7 @@ export type ColumnTypeMap<Values = any, T = 'ProForm'> = {
     fieldProps?: FieldType<ProNumberRangeType, Values, T>;
 } | {
     type?: 'ProRangeLimit';
-    fieldProps?: FieldType<ProRangeLimitProps, Values, T>;
+    fieldProps?: FieldType<ProRangeLimitType, Values, T>;
 } | {
     type?: 'ProTimeLimit';
     fieldProps?: FieldType<ProLimitProps, Values, T>;
@@ -284,6 +280,7 @@ export interface RenderType<Values = any> {
     requiredOnView?: boolean;
     confirm?: ProFormColumnType['confirm'];
     globalControl?: boolean;
+    shouldUpdateDebounce?: number;
     [name: string]: any;
 }
 /**

package/es/ProForm/index.d.ts

@@ -1,11 +1,11 @@
 import { FormInstance } from 'antd';
-import React, { ForwardRefRenderFunction } from 'react';
+import React from 'react';
 import { FormProviderProps } from 'antd/es/form/context';
 import type { ProFormType } from './propsType';
 import { useForm } from './utils/useForm';
 import useWatch from './utils/useWatch';
 import { useForms } from '../FormsProvider';
-interface IProForm<T = any> extends ForwardRefRenderFunction<FormInstance<T>, ProFormType<T>> {
+interface IProForm<T = any> extends React.ForwardRefExoticComponent<ProFormType<T> & React.RefAttributes<FormInstance<T>>> {
     useForm: typeof useForm;
     useWatch: typeof useWatch;
     useFormInstances: typeof useForms;

package/es/ProForm/index.js

@@ -1,20 +1,13 @@
-import "antd/es/form/style";
-import _Form from "antd/es/form";
-import "antd/es/row/style";
-import _Row from "antd/es/row";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/col/style";
-import _Col from "antd/es/col";
-import "antd/es/space/style";
-import _Space from "antd/es/space";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "diffConfig", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "formKey", "globalControl", "scrollToError", "optimize", "stopOnFirstError"];
+var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "diffConfig", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "formKey", "globalControl", "scrollToError", "optimize", "stopOnFirstError", "shouldUpdateDebounce"];
 import { DoubleLeftOutlined } from '@ant-design/icons';
+import { Col, Form, Row, Space } from 'antd';
 import classnames from 'classnames';
 import React, { forwardRef, useImperativeHandle, useMemo, useEffect } from 'react';
 import { isObject, merge, omit } from 'lodash';
-import { FormFooter, InputRange, ProAddress, ProCascader, ProCertNo, ProCertValidity, ProCombination, ProModalSelect, ProNumberRange, ProRangeBox, ProTimeLimit, transferAddressInfoToRegion, ProUpload, ProTreeModal, ProTree, EnumSelect } from "./components";
+import { FormFooter } from "./components";
 import RenderFields from "./components/render/RenderFields";
 import { useProConfig } from "../ProConfigProvider";
 import { useProDrawerFormContext } from "../ProDrawerForm";
@@ -72,6 +65,8 @@ var ProForm = (props, ref) => {
     optimize = _props$optimize === void 0 ? false : _props$optimize,
     _props$stopOnFirstErr = props.stopOnFirstError,
     stopOnFirstError = _props$stopOnFirstErr === void 0 ? false : _props$stopOnFirstErr,
+    _props$shouldUpdateDe = props.shouldUpdateDebounce,
+    shouldUpdateDebounce = _props$shouldUpdateDe === void 0 ? 200 : _props$shouldUpdateDe,
     otherProps = _objectWithoutProperties(props, _excluded);
   var config = useProConfig('ProForm');
   // source: 用于区分是哪个组件调用，用于错误提示
@@ -131,12 +126,12 @@ var ProForm = (props, ref) => {
     return !!expand && columns.length > Number(expand) && /*#__PURE__*/_jsx("div", {
       className: "expand-button",
       onClick: expandHandle,
-      children: !openState ? /*#__PURE__*/_jsxs(_Space, {
+      children: !openState ? /*#__PURE__*/_jsxs(Space, {
         align: "center",
         children: [locale.ProForm.unfold, /*#__PURE__*/_jsx(DoubleLeftOutlined, {
           className: "rotate-to-bottom"
         })]
-      }) : /*#__PURE__*/_jsxs(_Space, {
+      }) : /*#__PURE__*/_jsxs(Space, {
         align: "center",
         children: [locale.ProForm.packUp, /*#__PURE__*/_jsx(DoubleLeftOutlined, {
           className: "rotate-to-top"
@@ -209,9 +204,9 @@ var ProForm = (props, ref) => {
     // 展开折叠按钮
     var expandEle = expandRender();
     var hasElement = footerEle || expandEle;
-    return hasElement ? /*#__PURE__*/_jsx(_Col, _objectSpread(_objectSpread({}, colProps), {}, {
+    return hasElement ? /*#__PURE__*/_jsx(Col, _objectSpread(_objectSpread({}, colProps), {}, {
       className: footerCls,
-      children: /*#__PURE__*/_jsxs(_Space, {
+      children: /*#__PURE__*/_jsxs(Space, {
         align: "center",
         children: [footerEle, expandEle]
       })
@@ -228,7 +223,7 @@ var ProForm = (props, ref) => {
       otherProps.layout = otherProps.layout || 'vertical';
     }
   }
-  return /*#__PURE__*/_jsxs(_Form, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
+  return /*#__PURE__*/_jsxs(Form, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
     onKeyPress: event => {
       if (!submitOnEnter) return;
       if (event.key === 'Enter') {
@@ -242,11 +237,7 @@ var ProForm = (props, ref) => {
     onValuesChange: handleValuesChange,
     onFinish: handleFinish,
     initialValues: _initialValues,
-    scrollToFirstError: {
-      block: 'center',
-      behavior: 'smooth'
-    },
-    children: [/*#__PURE__*/_jsxs(_Row, _objectSpread(_objectSpread({
+    children: [/*#__PURE__*/_jsxs(Row, _objectSpread(_objectSpread({
       gutter: 24
     }, rowProps), {}, {
       children: [/*#__PURE__*/_jsx(RenderFields, {
@@ -265,7 +256,8 @@ var ProForm = (props, ref) => {
         clearNotShow: clearNotShow,
         requiredOnView: requiredOnView,
         required: required,
-        globalControl: globalControl
+        globalControl: globalControl,
+        shouldUpdateDebounce: shouldUpdateDebounce
       }), footerRender()]
     })), children]
   }));
@@ -307,7 +299,7 @@ export var ProFormProvider = props => {
     // @ts-ignore
     onFormChange(formName, info);
   };
-  return /*#__PURE__*/_jsx(_Form.Provider, {
+  return /*#__PURE__*/_jsx(Form.Provider, {
     onFormChange: onFormChange ? handleFormChange : undefined,
     onFormFinish: onFormFinish,
     children: children
@@ -318,26 +310,6 @@ ProFormForward.useFieldProps = useFieldProps; // 获取每个字段的其他参
 // 表单实例共享
 ProFormForward.FormsProvider = FormsProvider; // 表单实例共享Provider
 ProFormForward.useForms = useForms; // 获取上下文中的共享的表单实例map
-ProFormForward.useFormInstances = useForms; // 获取上下文中的共享的表单实例map
 ProFormForward.useContextForms = useContextForms; // 获取上下文中的共享的表单实例map
 
-// 内置组合
-ProFormForward.ProCascader = ProCascader;
-ProFormForward.ProCombination = ProCombination;
-ProFormForward.ProNumberRange = ProNumberRange;
-ProFormForward.ProModalSelect = ProModalSelect;
-ProFormForward.ProTimeLimit = ProTimeLimit;
-ProFormForward.ProUpload = ProUpload;
-// ProFormForward.ProTreeSelect = ProTreeSelect;
-ProFormForward.ProTreeModal = ProTreeModal;
-ProFormForward.ProTree = ProTree;
-
-// 待废弃
-ProFormForward.EnumSelect = EnumSelect;
-ProFormForward.ProAddress = ProAddress;
-ProFormForward.InputRange = InputRange;
-ProFormForward.ProRangeBox = ProRangeBox;
-ProFormForward.ProCertValidity = ProCertValidity;
-ProFormForward.ProCertNo = ProCertNo;
-ProFormForward.transferAddressInfoToRegion = transferAddressInfoToRegion;
 export default ProFormForward;

package/es/ProForm/propsType.d.ts

@@ -46,6 +46,7 @@ export interface ProFormOtherType {
     formDisabled?: boolean;
     isDiffChange?: boolean;
     diffConfig?: DiffConfigType;
+    shouldUpdateDebounce?: number;
 }
 export interface DiffConfigType<Values = any> {
     /** 比对原始数据源 */
@@ -100,6 +101,8 @@ export interface ProFormType<Values = any> extends FormProps<Values> {
     optimize?: boolean;
     /** 是否在遇到第一个错误时停止验证 */
     stopOnFirstError?: boolean;
+    /** shouldUpdate防抖延迟时间，默认500ms，设置为0则不防抖 */
+    shouldUpdateDebounce?: number;
 }
 export interface TransformType<T = any> {
     normalize?: (value: StoreValue, prevValue: StoreValue, allValues: Store) => StoreValue;

package/es/ProForm/style/index.less

@@ -1,6 +1,5 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
 @import '../components/base/SwitchCheckbox/style/index.less';
+@import '../components/base/TimePicker/style/index.less';
 @import '../components/base/TextArea/index.less';
 @import '../components/combination/FormList/style/index.less';
 @import '../components/combination/ProTimeLimit/style/index.less';
@@ -9,8 +8,6 @@
 @import '../components/combination/ProModalSelect/style/index.less';
 @import '../components/combination/Group/style/index.less';
 @import '../components/combination/Container/style/index.less';
-@import '../components/old/EnumSelect/style/index.less';
-@import '../components/old/EnumSelect/style/index.less';
 
 .pro-form {
   &.@{ant-prefix}-form-vertical {
@@ -106,7 +103,6 @@
   }
 
   .@{ant-prefix}-form-item {
-    margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1)) !important;
 
     &.pro-form-item-width-auto {
       .@{ant-prefix}-form-item-control-input {
@@ -137,13 +133,6 @@
       display: none;
     }
 
-    .@{ant-prefix}-form-item-explain {
-      height: auto;
-
-      .@{ant-prefix}-form-item-explain-error {
-        font-size: var(--zaui-font-size, 14px);
-      }
-    }
 
     .@{ant-prefix}-input-number {
       width: 100%;
@@ -186,8 +175,8 @@
 
   .@{ant-prefix}-form-item-has-error {
     .group-separator {
-      color: var(--ant-error-color);
-      border-color: var(--ant-error-color);
+      color: #ff4d4f;
+      border-color: #ff4d4f;
     }
 
     .site-input-split {
@@ -318,8 +307,7 @@
     width: 18px;
   }
   .pro-form-list-tool-btn {
-    margin-left: 8px;
-    padding: 0;
+    padding: 0 4px;
     cursor: pointer;
     .anticon {
       color: var(--zaui-text-weak, #a0a0a0);

package/es/ProForm/utils/index.d.ts

@@ -61,7 +61,6 @@ export declare function initialValuesToNames(values: AnyObject, columns: AnyObje
  * @returns ['group-7x19no', 0, 'abc'] =>['group-7x19no', 0]
  */
 export declare function getArrayBeforeNumber(arr: (string | number)[]): (string | number)[];
-export declare const customEqualForFun: (value: any, other: any) => boolean;
 /**
  * 查询数据中是否包含rowKey
  */
@@ -102,4 +101,19 @@ export declare const parseNamePath: (input: string) => any;
  */
 export declare const getFormFieldPaths: (form: FormInstance) => any[];
 export declare function findNamesKeyInArray(arr: string[], key: string): string | null;
+type DataItem = (string | number)[];
+/**
+ * 根据特定规则合并两个数据源 (TypeScript 版本)
+ * @param data1 第一个数据源
+ * @param data2 第二个数据源
+ * @returns 合并后的结果数组
+ */
+export declare const mergeNames: (data1: DataItem[], data2: DataItem[]) => DataItem[];
+/**
+ * 是否 formlist或者pro-edit-table 场景
+ * 使用正则表达式判断一个由逗号分隔的字符串中，是否包含一个纯数字的片段。
+ * @param {string} str - 输入的字符串。
+ * @returns {boolean} - 如果匹配成功，返回 true；否则返回 false。
+ */
+export declare const isListForm: (str: string) => boolean;
 export {};