@ant-design/pro-components 3.0.1-0 → 3.1.0-0

package/es/form/BaseForm/BaseForm.js

@@ -46,6 +46,7 @@ var covertFormName = function covertFormName(name) {
   if (Array.isArray(name)) return name;
   return [name];
 };
+var defaultExtraUrlParams = {};
 function BaseFormComponents(props) {
   var _ConfigProvider$useCo;
   var children = props.children,
@@ -61,7 +62,7 @@ function BaseFormComponents(props) {
     loading = props.loading,
     formComponentType = props.formComponentType,
     _props$extraUrlParams = props.extraUrlParams,
-    extraUrlParams = _props$extraUrlParams === void 0 ? {} : _props$extraUrlParams,
+    extraUrlParams = _props$extraUrlParams === void 0 ? defaultExtraUrlParams : _props$extraUrlParams,
     syncToUrl = props.syncToUrl,
     onUrlSearchChange = props.onUrlSearchChange,
     _onReset = props.onReset,
@@ -397,7 +398,7 @@ function BaseFormComponents(props) {
 var requestFormCacheId = 0;
 export function BaseForm(props) {
   var _props$extraUrlParams2 = props.extraUrlParams,
-    extraUrlParams = _props$extraUrlParams2 === void 0 ? {} : _props$extraUrlParams2,
+    extraUrlParams = _props$extraUrlParams2 === void 0 ? defaultExtraUrlParams : _props$extraUrlParams2,
     syncToUrl = props.syncToUrl,
     isKeyPressSubmit = props.isKeyPressSubmit,
     _props$syncToUrlAsImp = props.syncToUrlAsImportant,
@@ -685,6 +686,12 @@ export function BaseForm(props) {
             ref: function ref(instance) {
               if (!formRef.current) return;
               formRef.current.nativeElement = instance === null || instance === void 0 ? void 0 : instance.nativeElement;
+              formRef.current.focus = function () {
+                var _instance$nativeEleme;
+                // 聚焦到表单的第一个输入框
+                var firstInput = instance === null || instance === void 0 || (_instance$nativeEleme = instance.nativeElement) === null || _instance$nativeEleme === void 0 ? void 0 : _instance$nativeEleme.querySelector('input, textarea, select');
+                firstInput === null || firstInput === void 0 || firstInput.focus();
+              };
             }
             // 组合 urlSearch 和 initialValues
             ,

package/es/form/BaseForm/LightWrapper/style.d.ts

@@ -4,6 +4,6 @@ export interface ProToken extends ProAliasToken {
     componentCls: string;
 }
 export declare function useStyle(prefixCls: string): {
-    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;
 };

package/es/form/components/Captcha/index.d.ts

@@ -19,8 +19,14 @@ export type ProFormCaptchaProps = ProFormFieldItemProps<InputProps> & {
     onChange?: any;
 };
 export type CaptFieldRef = {
-    startTiming: () => never;
-    endTiming: () => never;
+    /** 原生 DOM 元素引用 */
+    nativeElement: HTMLDivElement;
+    /** 聚焦方法 */
+    focus: () => void;
+    /** 开始计时 */
+    startTiming: () => void;
+    /** 结束计时 */
+    endTiming: () => void;
 };
 declare const ProFormCaptcha: React.FC<ProFormCaptchaProps>;
 export default ProFormCaptcha;

package/es/form/components/Captcha/index.js

@@ -23,6 +23,8 @@ var BaseProFormCaptcha = /*#__PURE__*/React.forwardRef(function (props, ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     loading = _useState6[0],
     setLoading = _useState6[1];
+  var containerRef = React.useRef(null);
+  var inputRef = React.useRef(null);
   // 这么写是为了防止restProps中 带入 onChange, defaultValue, rules props tabUtil
   var rules = props.rules,
     name = props.name,
@@ -71,6 +73,11 @@ var BaseProFormCaptcha = /*#__PURE__*/React.forwardRef(function (props, ref) {
    */
   useImperativeHandle(ref, function () {
     return {
+      nativeElement: containerRef.current,
+      focus: function focus() {
+        var _inputRef$current;
+        return (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.focus();
+      },
       startTiming: function startTiming() {
         return setTiming(true);
       },
@@ -106,12 +113,13 @@ var BaseProFormCaptcha = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }
   }, [count, onTiming]);
   return /*#__PURE__*/_jsxs("div", {
+    ref: containerRef,
     style: _objectSpread(_objectSpread({}, fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.style), {}, {
       display: 'flex',
       alignItems: 'center'
     }),
-    ref: ref,
     children: [/*#__PURE__*/_jsx(Input, _objectSpread(_objectSpread({}, fieldProps), {}, {
+      ref: inputRef,
       style: _objectSpread({
         flex: 1,
         transition: 'width .3s',

package/es/form/components/DatePicker/BaseDatePicker.js

@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["proFieldProps", "fieldProps", "valueType"];
-import React, { useContext } from 'react';
+import React, { useCallback, useContext, useMemo } from 'react';
 import { FieldDatePicker } from "../../../field";
 import { ProConfigProvider } from "../../../provider";
 import FieldContext from "../../FieldContext";
@@ -20,24 +20,32 @@ export var BaseDatePicker = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     valueType = _ref.valueType,
     rest = _objectWithoutProperties(_ref, _excluded);
   var context = useContext(FieldContext);
+  var mergedFieldProps = useMemo(function () {
+    var nextFieldProps = fieldProps ? _objectSpread({}, fieldProps) : {};
+    if (valueType === 'dateTime' && nextFieldProps.showTime === undefined) {
+      nextFieldProps.showTime = true;
+    }
+    return nextFieldProps;
+  }, [fieldProps, valueType]);
+  var renderFieldDatePicker = useCallback(function (text, props) {
+    var _ref2, _fieldPropsFromContex;
+    var fieldPropsFromContext = (_ref2 = props.fieldProps) !== null && _ref2 !== void 0 ? _ref2 : mergedFieldProps;
+    var format = valueType === 'dateTime' ? (_fieldPropsFromContex = fieldPropsFromContext === null || fieldPropsFromContext === void 0 ? void 0 : fieldPropsFromContext.format) !== null && _fieldPropsFromContex !== void 0 ? _fieldPropsFromContex : 'YYYY-MM-DD HH:mm:ss' : fieldPropsFromContext === null || fieldPropsFromContext === void 0 ? void 0 : fieldPropsFromContext.format;
+    return /*#__PURE__*/_jsx(FieldDatePicker, _objectSpread(_objectSpread({}, props), {}, {
+      format: format,
+      text: text
+    }));
+  }, [mergedFieldProps, valueType]);
   return /*#__PURE__*/_jsx(ProConfigProvider, {
     valueTypeMap: _defineProperty({}, valueType, {
-      render: function render(text, props) {
-        return /*#__PURE__*/_jsx(FieldDatePicker, _objectSpread(_objectSpread({}, props), {}, {
-          text: text
-        }));
-      },
-      formItemRender: function formItemRender(text, props) {
-        return /*#__PURE__*/_jsx(FieldDatePicker, _objectSpread(_objectSpread({}, props), {}, {
-          text: text
-        }));
-      }
+      render: renderFieldDatePicker,
+      formItemRender: renderFieldDatePicker
     }),
     children: /*#__PURE__*/_jsx(ProFormField, _objectSpread(_objectSpread({
       valueType: valueType,
       fieldProps: _objectSpread({
         getPopupContainer: context.getPopupContainer
-      }, fieldProps),
+      }, mergedFieldProps),
       proFieldProps: proFieldProps,
       fieldConfig: {
         valueType: valueType,

package/es/form/components/DateRangePicker/BaseDateRanger.js

@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["fieldProps", "proFieldProps", "valueType"];
-import React, { useContext } from 'react';
+import React, { useCallback, useContext, useMemo } from 'react';
 import { FieldRangePicker } from "../../../field";
 import { ProConfigProvider } from "../../../provider";
 import { dateArrayFormatter } from "../../../utils";
@@ -15,30 +15,55 @@ export var BaseDateRanger = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     valueType = _ref.valueType,
     rest = _objectWithoutProperties(_ref, _excluded);
   var context = useContext(FieldContext);
+  var mergedFieldProps = useMemo(function () {
+    var nextFieldProps = fieldProps ? _objectSpread({}, fieldProps) : {};
+    if (valueType === 'dateTimeRange' && nextFieldProps.showTime === undefined) {
+      nextFieldProps.showTime = true;
+    }
+    return nextFieldProps;
+  }, [fieldProps, valueType]);
+  var lightFilterFormat = useMemo(function () {
+    if (mergedFieldProps.format) return mergedFieldProps.format;
+    switch (valueType) {
+      case 'dateTimeRange':
+        return 'YYYY-MM-DD HH:mm:ss';
+      case 'dateWeekRange':
+        return 'YYYY-wo';
+      case 'dateMonthRange':
+        return 'YYYY-MM';
+      case 'dateQuarterRange':
+        return 'YYYY-[Q]Q';
+      case 'dateYearRange':
+        return 'YYYY';
+      default:
+        return 'YYYY-MM-DD';
+    }
+  }, [mergedFieldProps.format, valueType]);
+  var renderFieldRangePicker = useCallback(function (text, props) {
+    var _ref2, _fieldPropsFromContex;
+    var fieldPropsFromContext = (_ref2 = props.fieldProps) !== null && _ref2 !== void 0 ? _ref2 : mergedFieldProps;
+    var format = valueType === 'dateTimeRange' ? (_fieldPropsFromContex = fieldPropsFromContext === null || fieldPropsFromContext === void 0 ? void 0 : fieldPropsFromContext.format) !== null && _fieldPropsFromContex !== void 0 ? _fieldPropsFromContex : 'YYYY-MM-DD HH:mm:ss' : fieldPropsFromContext === null || fieldPropsFromContext === void 0 ? void 0 : fieldPropsFromContext.format;
+    return /*#__PURE__*/_jsx(FieldRangePicker, _objectSpread(_objectSpread({}, props), {}, {
+      format: format,
+      text: text
+    }));
+  }, [mergedFieldProps, valueType]);
   return /*#__PURE__*/_jsx(ProConfigProvider, {
     valueTypeMap: _defineProperty({}, valueType, {
-      render: function render(text, props) {
-        return /*#__PURE__*/_jsx(FieldRangePicker, _objectSpread(_objectSpread({}, props), {}, {
-          text: text
-        }));
-      },
-      formItemRender: function formItemRender(text, props) {
-        return /*#__PURE__*/_jsx(FieldRangePicker, _objectSpread(_objectSpread({}, props), {}, {
-          text: text
-        }));
-      }
+      render: renderFieldRangePicker,
+      formItemRender: renderFieldRangePicker
     }),
     children: /*#__PURE__*/_jsx(ProField, _objectSpread(_objectSpread({
       fieldProps: _objectSpread({
         getPopupContainer: context.getPopupContainer
-      }, fieldProps),
+      }, mergedFieldProps),
       valueType: valueType,
       proFieldProps: proFieldProps,
       fieldConfig: {
         valueType: valueType,
         customLightMode: true,
         lightFilterLabelFormatter: function lightFilterLabelFormatter(value) {
-          return dateArrayFormatter(value, (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.format) || 'YYYY-MM');
+          return dateArrayFormatter(value, lightFilterFormat);
         }
       }
     }, rest), {}, {

package/es/form/components/FormItem/Group/index.js

@@ -69,7 +69,7 @@ var Group = /*#__PURE__*/React.forwardRef(function (props, ref) {
       className: classNames("".concat(className, "-container ").concat(hashId), spaceProps === null || spaceProps === void 0 ? void 0 : spaceProps.className),
       size: size,
       align: align,
-      direction: direction,
+      orientation: direction,
       style: _objectSpread({
         rowGap: 0
       }, spaceProps === null || spaceProps === void 0 ? void 0 : spaceProps.style),

package/es/form/components/FormItem/Group/style.d.ts

@@ -4,6 +4,6 @@ export interface ProToken extends ProAliasToken {
     componentCls: string;
 }
 export declare function useStyle(prefixCls: string): {
-    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;
 };

package/es/form/components/List/index.d.ts

@@ -78,5 +78,5 @@ export type ProFormListProps<T> = Omit<FormListProps, 'children' | 'rules'> & Pr
     className?: string;
     readonly?: boolean;
 } & Pick<ProFormGridConfig, 'colProps' | 'rowProps'>;
-declare function ProFormList<T>(props: ProFormListProps<T>): React.JSX.Element | null;
+declare function ProFormList<T>(props: ProFormListProps<T>): React.ReactElement<any, string | React.JSXElementConstructor<any>> | null;
 export { FormListContext, ProFormList };

package/es/form/components/List/style.d.ts

@@ -4,6 +4,6 @@ export interface ProToken extends ProAliasToken {
     componentCls: string;
 }
 export declare function useStyle(prefixCls: string): {
-    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;
 };

package/es/form/components/SchemaForm/index.js

@@ -140,12 +140,11 @@ function BetaSchemaForm(props) {
     propsOnValuesChange === null || propsOnValuesChange === void 0 || propsOnValuesChange(changedValues, values);
   }, [propsRef, shouldUpdate]);
   var formChildrenDoms = useDeepCompareMemo(function () {
-    if (!formRef.current) return;
     // like StepsForm's columns but not only for StepsForm
     if (columns.length && Array.isArray(columns[0])) return;
     return genItems(columns);
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [columns, restProps === null || restProps === void 0 ? void 0 : restProps.open, action, type, formDomsDeps]);
+  }, [columns, restProps === null || restProps === void 0 ? void 0 : restProps.open, action, type, formDomsDeps, formRef.current]);
 
   /**
    * Append layoutType component specific props

package/es/form/components/Text/index.js

@@ -68,8 +68,10 @@ var PassWordStrength = function PassWordStrength(props) {
             })
           }) : null]
         }),
-        overlayStyle: {
-          width: 240
+        styles: {
+          root: {
+            width: 240
+          }
         },
         placement: "rightTop"
       }, props.popoverProps), {}, {

package/es/form/components/UploadButton/index.d.ts

@@ -48,5 +48,5 @@ export type ProFormUploadButtonProps = ProFormFieldItemProps<UploadProps<any>, H
      */
     imageProps?: Omit<ImageProps, 'src'>;
 } & PickUploadProps;
-declare const ProFormUploadButton: React.ForwardRefRenderFunction<any, ProFormUploadButtonProps>;
+declare const ProFormUploadButton: React.FC<ProFormUploadButtonProps>;
 export default ProFormUploadButton;

package/es/form/components/UploadButton/index.js

@@ -30,7 +30,7 @@ var getBase64 = function getBase64(file) {
  *
  * @param
  */
-var BaseProFormUploadButton = function BaseProFormUploadButton(_ref, ref) {
+var BaseProFormUploadButton = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var _fieldProps$name;
   var fieldProps = _ref.fieldProps,
     action = _ref.action,
@@ -128,8 +128,8 @@ var BaseProFormUploadButton = function BaseProFormUploadButton(_ref, ref) {
       src: previewImage
     }))]
   });
-};
-var ProFormUploadButton = (_ref3 = warpField) === null || _ref3 === void 0 ? void 0 : _ref3( /*#__PURE__*/React.forwardRef(BaseProFormUploadButton), {
+});
+var ProFormUploadButton = (_ref3 = warpField) === null || _ref3 === void 0 ? void 0 : _ref3(BaseProFormUploadButton, {
   getValueFromEvent: function getValueFromEvent(value) {
     return value.fileList;
   }

package/es/form/index.d.ts

@@ -4,6 +4,7 @@ import type { ProFormGroupProps } from './typing';
 export { ProFormContext } from '../utils';
 export { LightWrapper } from './BaseForm';
 export type { LightWrapperProps, ProFormInstance } from './BaseForm';
+export type { SubmitterProps } from './BaseForm/Submitter';
 export * from './components';
 export type { FormListActionType, ProFormCaptchaProps, ProFormCheckboxGroupProps, ProFormCheckboxProps, ProFormColorPickerProps, ProFormColumnsType, ProFormDependencyProps, ProFormDigitProps, ProFormDigitRangeProps, ProFormFieldProps, ProFormFieldSetProps, ProFormLayoutType, ProFormListProps, ProFormMoneyProps, ProFormRadioGroupProps, ProFormSelectProps, ProFormSliderProps, ProFormSwitchProps, ProFormTreeSelectProps, ProFormUploadButtonProps, ProFormUploadDraggerProps, } from './components';
 export { FormListContext } from './components/List';

package/es/form/layouts/DrawerForm/index.d.ts

@@ -39,5 +39,5 @@ export type DrawerFormProps<T = Record<string, any>, U = Record<string, any>> =
      */
     resize?: CustomizeResizeType | boolean;
 };
-declare function DrawerForm<T = Record<string, any>, U = Record<string, any>>({ children, trigger, drawerProps, onFinish, submitTimeout, title, width, resize, onOpenChange, open: propsOpen, ...rest }: DrawerFormProps<T, U>): React.JSX.Element;
+declare function DrawerForm<T = Record<string, any>, U = Record<string, any>>({ children, trigger, drawerProps, onFinish, submitTimeout, title, width, resize, onOpenChange, open: propsOpen, ...rest }: DrawerFormProps<T, U>): React.ReactElement<any, string | React.JSXElementConstructor<any>>;
 export { DrawerForm };

package/es/form/layouts/DrawerForm/index.js

@@ -95,7 +95,8 @@ function DrawerForm(_ref) {
     var _ref2, _rest$formRef$current, _rest$formRef;
     var form = (_ref2 = (_rest$formRef$current = (_rest$formRef = rest.formRef) === null || _rest$formRef === void 0 ? void 0 : _rest$formRef.current) !== null && _rest$formRef$current !== void 0 ? _rest$formRef$current : rest.form) !== null && _ref2 !== void 0 ? _ref2 : formRef.current;
     // 重置表单
-    if (form && drawerProps !== null && drawerProps !== void 0 && drawerProps.destroyOnHidden) {
+    // issue: 8858 form.resetFields is not a function
+    if (form && drawerProps !== null && drawerProps !== void 0 && drawerProps.destroyOnHidden && typeof form.resetFields === 'function') {
       form.resetFields();
     }
   }, [drawerProps === null || drawerProps === void 0 ? void 0 : drawerProps.destroyOnHidden, rest.form, rest.formRef]);
@@ -276,7 +277,7 @@ function DrawerForm(_ref) {
     children: [/*#__PURE__*/_jsxs(Drawer, _objectSpread(_objectSpread({}, drawerProps), {}, {
       destroyOnHidden: drawerProps === null || drawerProps === void 0 ? void 0 : drawerProps.destroyOnHidden,
       title: title,
-      width: drawerWidth,
+      size: typeof drawerWidth === 'number' ? drawerWidth : drawerWidth,
       open: open,
       afterOpenChange: function afterOpenChange(open) {
         var _drawerProps$afterOpe;

package/es/form/layouts/DrawerForm/style.d.ts

@@ -4,6 +4,6 @@ export interface DrawerFormToken extends ProAliasToken {
     componentCls: string;
 }
 export declare function useStyle(prefixCls: string): {
-    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;
 };

package/es/form/layouts/LightFilter/style.d.ts

@@ -4,6 +4,6 @@ export interface LightFilterToken extends ProAliasToken {
     componentCls: string;
 }
 export declare function useStyle(prefixCls: string): {
-    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;
 };

package/es/form/layouts/LoginForm/index.d.ts

@@ -45,5 +45,5 @@ export type LoginFormProps<T> = {
     containerStyle?: React.CSSProperties;
     otherStyle?: React.CSSProperties;
 } & Omit<ProFormProps<T>, 'title'>;
-declare function LoginForm<T = Record<string, any>>(props: Partial<LoginFormProps<T>>): React.JSX.Element;
+declare function LoginForm<T = Record<string, any>>(props: Partial<LoginFormProps<T>>): React.ReactElement<any, string | React.JSXElementConstructor<any>>;
 export { LoginForm };

package/es/form/layouts/LoginForm/style.d.ts

@@ -4,6 +4,6 @@ export interface LoginFormToken extends ProAliasToken {
     componentCls: string;
 }
 export declare function useStyle(prefixCls: string): {
-    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;
 };

package/es/form/layouts/LoginFormPage/index.d.ts

@@ -62,4 +62,4 @@ export type LoginFormPageProps<T> = {
     mainStyle?: React.CSSProperties;
     otherStyle?: React.CSSProperties;
 } & Omit<ProFormProps<T>, 'title'>;
-export declare function LoginFormPage<T = Record<string, any>>(props: Partial<LoginFormPageProps<T>>): React.JSX.Element;
+export declare function LoginFormPage<T = Record<string, any>>(props: Partial<LoginFormPageProps<T>>): React.ReactElement<any, string | React.JSXElementConstructor<any>>;

package/es/form/layouts/LoginFormPage/style.d.ts

@@ -4,6 +4,6 @@ export interface LoginFormToken extends ProAliasToken {
     componentCls: string;
 }
 export declare function useStyle(prefixCls: string): {
-    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;
 };

package/es/form/layouts/ModalForm/index.js

@@ -56,7 +56,8 @@ function ModalForm(_ref) {
     var _ref2, _rest$form, _rest$formRef;
     var form = (_ref2 = (_rest$form = rest.form) !== null && _rest$form !== void 0 ? _rest$form : (_rest$formRef = rest.formRef) === null || _rest$formRef === void 0 ? void 0 : _rest$formRef.current) !== null && _ref2 !== void 0 ? _ref2 : formRef.current;
     // 重置表单
-    if (form && modalProps !== null && modalProps !== void 0 && modalProps.destroyOnHidden) {
+    // issue: 8858 form.resetFields is not a function
+    if (form && modalProps !== null && modalProps !== void 0 && modalProps.destroyOnHidden && typeof form.resetFields === 'function') {
       form.resetFields();
     }
   }, [modalProps === null || modalProps === void 0 ? void 0 : modalProps.destroyOnHidden, rest.form, rest.formRef]);

package/es/form/layouts/ProForm/index.d.ts

@@ -9,7 +9,7 @@ declare namespace ProForm {
     var Group: React.FC<import("src/form").GroupProps>;
     var useForm: typeof import("antd/es/form/Form").useForm;
     var Item: React.FC<import("src/form/components/FormItem").ProFormItemProps>;
-    var useWatch: typeof import("rc-field-form").useWatch;
+    var useWatch: typeof import("antd/es/form/Form").useWatch;
     var ErrorList: React.FC<import("antd/es/form").ErrorListProps>;
     var Provider: React.FC<import("antd/es/form/context").FormProviderProps>;
     var useFormInstance: typeof import("antd/es/form/hooks/useFormInstance").default;

package/es/form/layouts/QueryFilter/index.d.ts

@@ -1,5 +1,6 @@
 import type { ColProps, RowProps } from 'antd';
 import type { FormProps } from 'antd/lib/form/Form';
+import type { ReactElement } from 'react';
 import React from 'react';
 import type { CommonFormProps } from '../../BaseForm';
 import type { ActionsProps } from './Actions';
@@ -107,5 +108,5 @@ export type BaseQueryFilterProps = Omit<ActionsProps, 'submitter' | 'setCollapse
 export type QueryFilterProps<T = Record<string, any>, U = Record<string, any>> = Omit<FormProps<T>, 'onFinish'> & CommonFormProps<T, U> & BaseQueryFilterProps & {
     onReset?: (values: T) => void;
 };
-declare function QueryFilter<T = Record<string, any>>(props: QueryFilterProps<T>): React.JSX.Element;
+declare function QueryFilter<T = Record<string, any>>(props: QueryFilterProps<T>): ReactElement<any, string | React.JSXElementConstructor<any>>;
 export { QueryFilter };

package/es/form/layouts/QueryFilter/style.d.ts

@@ -4,6 +4,6 @@ export interface ProToken extends ProAliasToken {
     componentCls: string;
 }
 export declare function useStyle(prefixCls: string): {
-    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;
 };

package/es/form/layouts/StepsForm/index.js

@@ -226,18 +226,31 @@ function StepsForm(props) {
     var itemsProps = {
       items: formArray.map(function (item) {
         var itemProps = formMapRef.current.get(item);
-        return _objectSpread({
+        var stepItemProps = _objectSpread({
           key: item,
           title: itemProps === null || itemProps === void 0 ? void 0 : itemProps.title
         }, itemProps === null || itemProps === void 0 ? void 0 : itemProps.stepProps);
+        // Convert deprecated description to content
+        if (stepItemProps.description) {
+          stepItemProps.content = stepItemProps.description;
+          delete stepItemProps.description;
+        }
+        return stepItemProps;
       })
     };
+
+    // Convert deprecated direction to orientation
+    var processedStepsProps = stepsProps ? _objectSpread({}, stepsProps) : {};
+    if ('direction' in processedStepsProps) {
+      processedStepsProps.orientation = processedStepsProps.direction;
+      delete processedStepsProps.direction;
+    }
     return /*#__PURE__*/_jsx("div", {
       className: "".concat(prefixCls, "-steps-container ").concat(hashId).trim(),
       style: {
         maxWidth: Math.min(formArray.length * 320, 1160)
       },
-      children: /*#__PURE__*/_jsx(Steps, _objectSpread(_objectSpread(_objectSpread({}, stepsProps), itemsProps), {}, {
+      children: /*#__PURE__*/_jsx(Steps, _objectSpread(_objectSpread(_objectSpread({}, processedStepsProps), itemsProps), {}, {
         current: step,
         onChange: undefined
       }))

package/es/form/layouts/StepsForm/style.d.ts

@@ -4,6 +4,6 @@ export interface StepsFormToken extends ProAliasToken {
     componentCls: string;
 }
 export declare function useStyle(prefixCls: string): {
-    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;
 };

package/es/layout/components/AppsLogoComponents/index.js

@@ -88,7 +88,9 @@ export var AppsLogoComponents = function AppsLogoComponents(props) {
       onOpenChange: function onOpenChange(openChange) {
         return setOpen(openChange);
       },
-      overlayClassName: "".concat(baseClassName, "-popover ").concat(hashId).trim(),
+      classNames: {
+        root: "".concat(baseClassName, "-popover ").concat(hashId).trim()
+      },
       content: popoverContent,
       getPopupContainer: function getPopupContainer() {
         return ref.current || document.body;

package/es/layout/components/AppsLogoComponents/style/index.d.ts

@@ -4,6 +4,6 @@ export interface AppsLogoComponentsToken extends ProAliasToken {
     componentCls: string;
 }
 export declare function useStyle(prefixCls: string): {
-    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;
 };

package/es/layout/components/CollapsedIcon/style.d.ts

@@ -4,6 +4,6 @@ export interface SiderMenuToken extends ProAliasToken {
     componentCls: string;
 }
 export declare function useStyle(prefixCls: string): {
-    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;
 };

package/es/layout/components/FooterToolbar/style/index.d.ts

@@ -4,6 +4,6 @@ export interface FooterToolBarToken extends ProAliasToken {
     componentCls: string;
 }
 export declare function useStyle(prefixCls: string): {
-    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;
 };

package/es/layout/components/FooterToolbar/style/stylish.d.ts

@@ -6,6 +6,6 @@ export interface stylishToken extends ProAliasToken {
 export declare function useStylish(prefixCls: string, { stylish, }: {
     stylish?: GenerateStyle<stylishToken>;
 }): {
-    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;
 };

package/es/layout/components/GlobalFooter/index.d.ts

@@ -12,5 +12,5 @@ export type GlobalFooterProps = {
     prefixCls?: string;
     className?: string;
 };
-declare const GlobalFooter: ({ className, prefixCls, links, copyright, style, }: GlobalFooterProps) => React.JSX.Element | null;
+declare const GlobalFooter: ({ className, prefixCls, links, copyright, style, }: GlobalFooterProps) => React.ReactElement<any, string | React.JSXElementConstructor<any>> | null;
 export { GlobalFooter };

package/es/layout/components/GlobalFooter/style.d.ts

@@ -5,6 +5,6 @@ export interface GlobalFooterToken extends ProAliasToken {
     probgLayout?: string;
 }
 export declare function useStyle(prefixCls: string): {
-    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;
 };

package/es/layout/components/GlobalHeader/rightContentStyle.d.ts

@@ -4,6 +4,6 @@ export interface ProToken extends ProAliasToken {
     componentCls: string;
 }
 export declare function useStyle(prefixCls: string): {
-    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;
 };

package/es/layout/components/GlobalHeader/style.d.ts

@@ -4,6 +4,6 @@ export interface GlobalHeaderToken extends ProAliasToken {
     componentCls: string;
 }
 export declare function useStyle(prefixCls: string): {
-    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;
 };

package/es/layout/components/GridContent/style.d.ts

@@ -4,6 +4,6 @@ export interface GridContentToken extends ProAliasToken {
     componentCls: string;
 }
 export declare function useStyle(prefixCls: string): {
-    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;
 };

package/es/layout/components/Header/style/header.d.ts

@@ -4,6 +4,6 @@ export interface ProLayoutHeaderToken extends ProAliasToken {
     componentCls: string;
 }
 export declare function useStyle(prefixCls: string): {
-    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;
 };