@ant-design/pro-components 3.0.0-beta.1 → 3.0.0-beta.2

package/es/form/BaseForm/BaseForm.js

@@ -1,161 +1,106 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
-
-// src/form/BaseForm/BaseForm.tsx
-import { useUrlSearchParams } from "@umijs/use-params";
-import { ConfigProvider, Form, Spin } from "antd";
-import classNames from "classnames";
-import omit from "rc-util/lib/omit";
-import get from "rc-util/lib/utils/get";
-import { default as namePathSet, default as set } from "rc-util/lib/utils/set";
-import { noteOnce } from "rc-util/lib/warning";
-import React, {
-  useContext,
-  useEffect,
-  useImperativeHandle,
-  useMemo,
-  useRef,
-  useState
-} from "react";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _typeof from "@babel/runtime/helpers/esm/typeof";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["children", "contentRender", "submitter", "fieldProps", "formItemProps", "groupProps", "transformKey", "formRef", "onInit", "form", "loading", "formComponentType", "extraUrlParams", "syncToUrl", "onUrlSearchChange", "onReset", "omitNil", "isKeyPressSubmit", "autoFocusFirstInput", "grid", "rowProps", "colProps"],
+  _excluded2 = ["extraUrlParams", "syncToUrl", "isKeyPressSubmit", "syncToUrlAsImportant", "syncToInitialValues", "children", "contentRender", "submitter", "fieldProps", "proFieldProps", "formItemProps", "groupProps", "dateFormatter", "formRef", "onInit", "form", "formComponentType", "onReset", "grid", "rowProps", "colProps", "omitNil", "request", "params", "initialValues", "formKey", "readonly", "onLoadingChange", "loading"];
+/* eslint-disable react-hooks/exhaustive-deps */import { useUrlSearchParams } from '@umijs/use-params';
+import { ConfigProvider, Form, Spin } from 'antd';
+import classNames from 'classnames';
+import { get, set as namePathSet, set, warning } from 'rc-util';
+import omit from 'rc-util/lib/omit';
+import React, { useContext, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { ProConfigProvider } from "../../provider";
-import {
-  ProFormContext,
-  conversionMomentValue,
-  isDeepEqualReact,
-  nanoid,
-  runFunction,
-  transformKeySubmitValue,
-  useFetchData,
-  useMountMergeState,
-  usePrevious,
-  useRefFunction,
-  useStyle
-} from "../../utils";
+import { ProFormContext, conversionMomentValue, isDeepEqualReact, nanoid, runFunction, transformKeySubmitValue, useFetchData, useMountMergeState, usePrevious, useRefFunction, useStyle } from "../../utils";
 import { FormListContext } from "../components/List";
 import FieldContext from "../FieldContext";
 import { GridContext, useGridHelpers } from "../helpers";
 import { EditOrReadOnlyContext } from "./EditOrReadOnlyContext";
 import Submitter from "./Submitter";
-var genParams = (syncUrl, params, type) => {
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+var noteOnce = warning.noteOnce;
+
+// Define ProFormInstance and ProFormRef
+
+var genParams = function genParams(syncUrl, params, type) {
   if (syncUrl === true) {
     return params;
   }
   return runFunction(syncUrl, params, type);
 };
-var covertFormName = (name) => {
-  if (!name)
-    return name;
-  if (Array.isArray(name))
-    return name;
+
+/**
+ * It takes a name path and converts it to an array.
+ * @param {NamePath} name - The name of the form.
+ * @returns string[]
+ *
+ * a-> [a]
+ * [a] -> [a]
+ */
+var covertFormName = function covertFormName(name) {
+  if (!name) return name;
+  if (Array.isArray(name)) return name;
   return [name];
 };
 function BaseFormComponents(props) {
-  var _b, _c;
-  const _a = props, {
-    children,
-    contentRender,
-    submitter,
-    fieldProps,
-    formItemProps,
-    groupProps,
-    transformKey,
-    formRef: propsFormRef,
-    onInit,
-    form,
-    loading,
-    formComponentType,
-    extraUrlParams = {},
-    syncToUrl,
-    onUrlSearchChange,
-    onReset,
-    omitNil = true,
-    isKeyPressSubmit,
-    autoFocusFirstInput = true,
-    grid,
-    rowProps,
-    colProps
-  } = _a, rest = __objRest(_a, [
-    "children",
-    "contentRender",
-    "submitter",
-    "fieldProps",
-    "formItemProps",
-    "groupProps",
-    "transformKey",
-    "formRef",
-    "onInit",
-    "form",
-    "loading",
-    "formComponentType",
-    "extraUrlParams",
-    "syncToUrl",
-    "onUrlSearchChange",
-    "onReset",
-    "omitNil",
-    "isKeyPressSubmit",
-    "autoFocusFirstInput",
-    "grid",
-    "rowProps",
-    "colProps"
-  ]);
-  const formInstance = Form.useFormInstance();
-  const { componentSize } = ((_c = (_b = ConfigProvider) == null ? void 0 : _b.useConfig) == null ? void 0 : _c.call(_b)) || {
-    componentSize: "middle"
-  };
-  const formRef = useRef(form || formInstance);
-  const { RowWrapper } = useGridHelpers({ grid, rowProps });
-  const getFormInstance = useRefFunction(() => formInstance);
-  const formatValues = useMemo(
-    () => ({
+  var _ConfigProvider$useCo;
+  var children = props.children,
+    contentRender = props.contentRender,
+    submitter = props.submitter,
+    fieldProps = props.fieldProps,
+    formItemProps = props.formItemProps,
+    groupProps = props.groupProps,
+    transformKey = props.transformKey,
+    propsFormRef = props.formRef,
+    onInit = props.onInit,
+    form = props.form,
+    loading = props.loading,
+    formComponentType = props.formComponentType,
+    _props$extraUrlParams = props.extraUrlParams,
+    extraUrlParams = _props$extraUrlParams === void 0 ? {} : _props$extraUrlParams,
+    syncToUrl = props.syncToUrl,
+    onUrlSearchChange = props.onUrlSearchChange,
+    _onReset = props.onReset,
+    _props$omitNil = props.omitNil,
+    omitNil = _props$omitNil === void 0 ? true : _props$omitNil,
+    isKeyPressSubmit = props.isKeyPressSubmit,
+    _props$autoFocusFirst = props.autoFocusFirstInput,
+    autoFocusFirstInput = _props$autoFocusFirst === void 0 ? true : _props$autoFocusFirst,
+    grid = props.grid,
+    rowProps = props.rowProps,
+    colProps = props.colProps,
+    rest = _objectWithoutProperties(props, _excluded);
+
+  /**
+   * 获取 form 实例
+   */
+  var formInstance = Form.useFormInstance();
+  var _ref = (ConfigProvider === null || ConfigProvider === void 0 || (_ConfigProvider$useCo = ConfigProvider.useConfig) === null || _ConfigProvider$useCo === void 0 ? void 0 : _ConfigProvider$useCo.call(ConfigProvider)) || {
+      componentSize: 'middle'
+    },
+    componentSize = _ref.componentSize;
+
+  /** 同步 url 上的参数 */
+  var formRef = useRef(form || formInstance);
+
+  /**
+   * 获取布局
+   */
+  var _useGridHelpers = useGridHelpers({
+      grid: grid,
+      rowProps: rowProps
+    }),
+    RowWrapper = _useGridHelpers.RowWrapper;
+  var getFormInstance = useRefFunction(function () {
+    return formInstance;
+  });
+  var formatValues = useMemo(function () {
+    return {
       /**
        * 获取被 ProForm 格式化后的所有数据
        * @param allData boolean
@@ -164,16 +109,13 @@ function BaseFormComponents(props) {
        *
        * @example  getFieldsFormatValue(true) ->返回所有数据，即使没有被 form 托管的
        */
-      getFieldsFormatValue: (allData, omitNilParam) => {
-        const formInstance2 = getFormInstance();
-        if (!formInstance2) {
+      getFieldsFormatValue: function getFieldsFormatValue(allData, omitNilParam) {
+        var formInstance = getFormInstance();
+        if (!formInstance) {
           return {};
         }
-        const values = formInstance2.getFieldsValue(allData);
-        return transformKey(
-          values,
-          omitNilParam !== void 0 ? omitNilParam : omitNil
-        );
+        var values = formInstance.getFieldsValue(allData);
+        return transformKey(values, omitNilParam !== undefined ? omitNilParam : omitNil);
       },
       /**
        * 获取被 ProForm 格式化后的单个数据
@@ -184,26 +126,26 @@ function BaseFormComponents(props) {
        * @example {a:{b:value}} -> getFieldFormatValue(['a', 'b']) -> value
        */
       /** 获取格式化之后的单个数据 */
-      getFieldFormatValue: (paramsNameList = [], omitNilParam) => {
-        const formInstance2 = getFormInstance();
-        if (!formInstance2) {
-          return void 0;
+      getFieldFormatValue: function getFieldFormatValue() {
+        var paramsNameList = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+        var omitNilParam = arguments.length > 1 ? arguments[1] : undefined;
+        var formInstance = getFormInstance();
+        if (!formInstance) {
+          return undefined;
         }
-        const nameList = covertFormName(paramsNameList);
-        if (!nameList)
-          throw new Error("nameList is require");
-        const value = formInstance2.getFieldValue(nameList);
-        const obj = nameList ? set({}, nameList, value) : value;
-        const newNameList = [...nameList];
+        var nameList = covertFormName(paramsNameList);
+        if (!nameList) throw new Error('nameList is require');
+        var value = formInstance.getFieldValue(nameList);
+        var obj = nameList ? set({}, nameList, value) : value;
+        //transformKey会将keys重新和nameList拼接，所以这里要将nameList的首个元素弹出
+        var newNameList = _toConsumableArray(nameList);
         newNameList.shift();
-        const transformed = transformKey(
-          obj,
-          omitNilParam !== void 0 ? omitNilParam : omitNil,
-          newNameList
-        );
-        const result = get(transformed, nameList);
-        if (result && typeof result === "object" && !Array.isArray(result)) {
-          const objValue = Object.values(result)[0];
+        var transformed = transformKey(obj, omitNilParam !== undefined ? omitNilParam : omitNil, newNameList);
+        var result = get(transformed, nameList);
+        // 如果结果是对象，返回对象的值
+        if (result && _typeof(result) === 'object' && !Array.isArray(result)) {
+          var objValue = Object.values(result)[0];
+          // 如果对象的值是数组，返回数组
           if (Array.isArray(objValue)) {
             return objValue;
           }
@@ -220,19 +162,15 @@ function BaseFormComponents(props) {
        * @example  {a:{b:value}} -> getFieldFormatValueObject(['a', 'b']) -> {a:{b:value}}
        */
       /** 获取格式化之后的单个数据 */
-      getFieldFormatValueObject: (paramsNameList, omitNilParam) => {
-        const formInstance2 = getFormInstance();
-        if (!formInstance2) {
+      getFieldFormatValueObject: function getFieldFormatValueObject(paramsNameList, omitNilParam) {
+        var formInstance = getFormInstance();
+        if (!formInstance) {
           return {};
         }
-        const nameList = covertFormName(paramsNameList);
-        const value = formInstance2.getFieldValue(nameList);
-        const obj = nameList ? set({}, nameList, value) : value;
-        return transformKey(
-          obj,
-          omitNilParam !== void 0 ? omitNilParam : omitNil,
-          nameList
-        );
+        var nameList = covertFormName(paramsNameList);
+        var value = formInstance.getFieldValue(nameList);
+        var obj = nameList ? set({}, nameList, value) : value;
+        return transformKey(obj, omitNilParam !== undefined ? omitNilParam : omitNil, nameList);
       },
       /** 
       /**
@@ -243,134 +181,137 @@ function BaseFormComponents(props) {
        * 
        * @example validateFieldsReturnFormatValue -> {a:{b:value}}
        */
-      validateFieldsReturnFormatValue: (nameList, omitNilParam) => __async(this, null, function* () {
-        const formInstance2 = getFormInstance();
-        if (!formInstance2) {
-          return {};
+      validateFieldsReturnFormatValue: function () {
+        var _validateFieldsReturnFormatValue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(nameList, omitNilParam) {
+          var formInstance, values, transformedKey;
+          return _regeneratorRuntime().wrap(function _callee$(_context) {
+            while (1) switch (_context.prev = _context.next) {
+              case 0:
+                formInstance = getFormInstance();
+                if (formInstance) {
+                  _context.next = 3;
+                  break;
+                }
+                return _context.abrupt("return", {});
+              case 3:
+                if (!(!Array.isArray(nameList) && nameList)) {
+                  _context.next = 5;
+                  break;
+                }
+                throw new Error('nameList must be array');
+              case 5:
+                _context.next = 7;
+                return formInstance.validateFields(nameList);
+              case 7:
+                values = _context.sent;
+                transformedKey = transformKey(values, omitNilParam !== undefined ? omitNilParam : omitNil);
+                return _context.abrupt("return", transformedKey ? transformedKey : {});
+              case 10:
+              case "end":
+                return _context.stop();
+            }
+          }, _callee);
+        }));
+        function validateFieldsReturnFormatValue(_x, _x2) {
+          return _validateFieldsReturnFormatValue.apply(this, arguments);
         }
-        if (!Array.isArray(nameList) && nameList)
-          throw new Error("nameList must be array");
-        const values = yield formInstance2.validateFields(nameList);
-        const transformedKey = transformKey(
-          values,
-          omitNilParam !== void 0 ? omitNilParam : omitNil
-        );
-        return transformedKey ? transformedKey : {};
-      })
-    }),
-    [omitNil, transformKey, getFormInstance]
-  );
-  const items = useMemo(() => {
-    return React.Children.toArray(children).map((item, index) => {
-      if (index === 0 && React.isValidElement(item) && autoFocusFirstInput) {
-        return React.cloneElement(item, __spreadProps(__spreadValues({}, item.props), {
+        return validateFieldsReturnFormatValue;
+      }()
+    };
+  }, [omitNil, transformKey, getFormInstance]);
+  var items = useMemo(function () {
+    return React.Children.toArray(children).map(function (item, index) {
+      if (index === 0 && /*#__PURE__*/React.isValidElement(item) && autoFocusFirstInput) {
+        return /*#__PURE__*/React.cloneElement(item, _objectSpread(_objectSpread({}, item.props), {}, {
           autoFocus: autoFocusFirstInput
         }));
       }
       return item;
     });
   }, [autoFocusFirstInput, children]);
-  const submitterProps = useMemo(
-    () => typeof submitter === "boolean" || !submitter ? {} : submitter,
-    [submitter]
-  );
-  const submitterNode = useMemo(() => {
-    if (submitter === false)
-      return void 0;
-    return /* @__PURE__ */ React.createElement(
-      Submitter,
-      __spreadProps(__spreadValues({
-        key: "submitter"
-      }, submitterProps), {
-        onReset: () => {
-          var _a2, _b2, _c2;
-          const finalValues = transformKey(
-            (_a2 = formRef.current) == null ? void 0 : _a2.getFieldsValue(),
-            omitNil
-          );
-          (_b2 = submitterProps == null ? void 0 : submitterProps.onReset) == null ? void 0 : _b2.call(submitterProps, finalValues);
-          onReset == null ? void 0 : onReset(finalValues);
-          if (syncToUrl) {
-            const params = Object.keys(
-              transformKey((_c2 = formRef.current) == null ? void 0 : _c2.getFieldsValue(), false)
-            ).reduce((pre, next) => {
-              return __spreadProps(__spreadValues({}, pre), {
-                [next]: finalValues[next] || void 0
-              });
-            }, extraUrlParams);
-            onUrlSearchChange(genParams(syncToUrl, params || {}, "set"));
-          }
-        },
-        submitButtonProps: __spreadValues({
-          loading
-        }, submitterProps.submitButtonProps)
-      })
-    );
-  }, [
-    submitter,
-    submitterProps,
-    loading,
-    transformKey,
-    omitNil,
-    onReset,
-    syncToUrl,
-    extraUrlParams,
-    onUrlSearchChange
-  ]);
-  const content = useMemo(() => {
-    const wrapItems = grid ? /* @__PURE__ */ React.createElement(RowWrapper, null, items) : items;
+
+  /** 计算 props 的对象 */
+  var submitterProps = useMemo(function () {
+    return typeof submitter === 'boolean' || !submitter ? {} : submitter;
+  }, [submitter]);
+
+  /** 渲染提交按钮与重置按钮 */
+  var submitterNode = useMemo(function () {
+    if (submitter === false) return undefined;
+    return /*#__PURE__*/_jsx(Submitter, _objectSpread(_objectSpread({}, submitterProps), {}, {
+      onReset: function onReset() {
+        var _formRef$current, _submitterProps$onRes;
+        var finalValues = transformKey((_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.getFieldsValue(), omitNil);
+        submitterProps === null || submitterProps === void 0 || (_submitterProps$onRes = submitterProps.onReset) === null || _submitterProps$onRes === void 0 || _submitterProps$onRes.call(submitterProps, finalValues);
+        _onReset === null || _onReset === void 0 || _onReset(finalValues);
+        // 如果 syncToUrl，清空一下数据
+        if (syncToUrl) {
+          var _formRef$current2;
+          // 把没有的值设置为未定义可以删掉 url 的参数
+          var params = Object.keys(transformKey((_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.getFieldsValue(), false)).reduce(function (pre, next) {
+            return _objectSpread(_objectSpread({}, pre), {}, _defineProperty({}, next, finalValues[next] || undefined));
+          }, extraUrlParams);
+
+          /** 在同步到 url 上时对参数进行转化 */
+          onUrlSearchChange(genParams(syncToUrl, params || {}, 'set'));
+        }
+      },
+      submitButtonProps: _objectSpread({
+        loading: loading
+      }, submitterProps.submitButtonProps)
+    }), "submitter");
+  }, [submitter, submitterProps, loading, transformKey, omitNil, _onReset, syncToUrl, extraUrlParams, onUrlSearchChange]);
+  var content = useMemo(function () {
+    var wrapItems = grid ? /*#__PURE__*/_jsx(RowWrapper, {
+      children: items
+    }) : items;
     if (contentRender) {
       return contentRender(wrapItems, submitterNode, formRef.current);
     }
     return wrapItems;
   }, [grid, RowWrapper, items, contentRender, submitterNode]);
-  const preInitialValues = usePrevious(props.initialValues);
-  useEffect(() => {
-    if (syncToUrl || !props.initialValues || !preInitialValues || rest.request)
-      return;
-    const isEqual = isDeepEqualReact(props.initialValues, preInitialValues);
-    noteOnce(
-      isEqual,
-      `initialValues 只在 form 初始化时生效，如果你需要异步加载推荐使用 request，或者 initialValues ? <Form/> : null `
-    );
-    noteOnce(
-      isEqual,
-      `The initialValues only take effect when the form is initialized, if you need to load asynchronously recommended request, or the initialValues ? <Form/> : null `
-    );
+  var preInitialValues = usePrevious(props.initialValues);
+
+  // 提示一个 initialValues ，问的人实在是太多了
+  useEffect(function () {
+    if (syncToUrl || !props.initialValues || !preInitialValues || rest.request) return;
+    var isEqual = isDeepEqualReact(props.initialValues, preInitialValues);
+    noteOnce(isEqual, "initialValues \u53EA\u5728 form \u521D\u59CB\u5316\u65F6\u751F\u6548\uFF0C\u5982\u679C\u4F60\u9700\u8981\u5F02\u6B65\u52A0\u8F7D\u63A8\u8350\u4F7F\u7528 request\uFF0C\u6216\u8005 initialValues ? <Form/> : null ");
+    noteOnce(isEqual, "The initialValues only take effect when the form is initialized, if you need to load asynchronously recommended request, or the initialValues ? <Form/> : null ");
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [props.initialValues]);
-  useImperativeHandle(propsFormRef, () => {
-    return __spreadProps(__spreadValues({}, formRef.current), {
-      getFieldsFormatValue: (allData, omitNilParam) => {
-        const formInstance2 = formRef.current;
-        if (!formInstance2) {
+
+  // 初始化给一个默认的 form
+  useImperativeHandle(propsFormRef, function () {
+    return _objectSpread(_objectSpread({}, formRef.current), {}, {
+      getFieldsFormatValue: function getFieldsFormatValue(allData, omitNilParam) {
+        var formInstance = formRef.current;
+        if (!formInstance) {
           return {};
         }
-        const values = formInstance2.getFieldsValue(allData);
-        return transformKey(
-          values,
-          omitNilParam !== void 0 ? omitNilParam : omitNil
-        );
+        var values = formInstance.getFieldsValue(allData);
+        return transformKey(values, omitNilParam !== undefined ? omitNilParam : omitNil);
       },
-      getFieldFormatValue: (paramsNameList = [], omitNilParam) => {
-        const formInstance2 = formRef.current;
-        if (!formInstance2) {
-          return void 0;
+      getFieldFormatValue: function getFieldFormatValue() {
+        var paramsNameList = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+        var omitNilParam = arguments.length > 1 ? arguments[1] : undefined;
+        var formInstance = formRef.current;
+        if (!formInstance) {
+          return undefined;
         }
-        const nameList = covertFormName(paramsNameList);
-        if (!nameList)
-          throw new Error("nameList is require");
-        const value = formInstance2.getFieldValue(nameList);
-        const obj = nameList ? set({}, nameList, value) : value;
-        const newNameList = [...nameList];
+        var nameList = covertFormName(paramsNameList);
+        if (!nameList) throw new Error('nameList is require');
+        var value = formInstance.getFieldValue(nameList);
+        var obj = nameList ? set({}, nameList, value) : value;
+        //transformKey会将keys重新和nameList拼接，所以这里要将nameList的首个元素弹出
+        var newNameList = _toConsumableArray(nameList);
         newNameList.shift();
-        const transformed = transformKey(
-          obj,
-          omitNilParam !== void 0 ? omitNilParam : omitNil,
-          newNameList
-        );
-        const result = get(transformed, nameList);
-        if (result && typeof result === "object" && !Array.isArray(result)) {
-          const objValue = Object.values(result)[0];
+        var transformed = transformKey(obj, omitNilParam !== undefined ? omitNilParam : omitNil, newNameList);
+        var result = get(transformed, nameList);
+        // 如果结果是对象，返回对象的值
+        if (result && _typeof(result) === 'object' && !Array.isArray(result)) {
+          var objValue = Object.values(result)[0];
+          // 如果对象的值是数组，返回数组
           if (Array.isArray(objValue)) {
             return objValue;
           }
@@ -378,375 +319,395 @@ function BaseFormComponents(props) {
         }
         return result;
       },
-      getFieldFormatValueObject: (paramsNameList, omitNilParam) => {
-        const formInstance2 = formRef.current;
-        if (!formInstance2) {
+      getFieldFormatValueObject: function getFieldFormatValueObject(paramsNameList, omitNilParam) {
+        var formInstance = formRef.current;
+        if (!formInstance) {
           return {};
         }
-        const nameList = covertFormName(paramsNameList);
-        const value = formInstance2.getFieldValue(nameList);
-        const obj = nameList ? set({}, nameList, value) : value;
-        return transformKey(
-          obj,
-          omitNilParam !== void 0 ? omitNilParam : omitNil,
-          nameList
-        );
+        var nameList = covertFormName(paramsNameList);
+        var value = formInstance.getFieldValue(nameList);
+        var obj = nameList ? set({}, nameList, value) : value;
+        return transformKey(obj, omitNilParam !== undefined ? omitNilParam : omitNil, nameList);
       },
-      validateFieldsReturnFormatValue: (nameList, omitNilParam) => __async(this, null, function* () {
-        const formInstance2 = formRef.current;
-        if (!formInstance2) {
-          return {};
+      validateFieldsReturnFormatValue: function () {
+        var _validateFieldsReturnFormatValue2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(nameList, omitNilParam) {
+          var formInstance, values, transformedKey;
+          return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+            while (1) switch (_context2.prev = _context2.next) {
+              case 0:
+                formInstance = formRef.current;
+                if (formInstance) {
+                  _context2.next = 3;
+                  break;
+                }
+                return _context2.abrupt("return", {});
+              case 3:
+                if (!(!Array.isArray(nameList) && nameList)) {
+                  _context2.next = 5;
+                  break;
+                }
+                throw new Error('nameList must be array');
+              case 5:
+                _context2.next = 7;
+                return formInstance.validateFields(nameList);
+              case 7:
+                values = _context2.sent;
+                transformedKey = transformKey(values, omitNilParam !== undefined ? omitNilParam : omitNil);
+                return _context2.abrupt("return", transformedKey ? transformedKey : {});
+              case 10:
+              case "end":
+                return _context2.stop();
+            }
+          }, _callee2);
+        }));
+        function validateFieldsReturnFormatValue(_x3, _x4) {
+          return _validateFieldsReturnFormatValue2.apply(this, arguments);
         }
-        if (!Array.isArray(nameList) && nameList)
-          throw new Error("nameList must be array");
-        const values = yield formInstance2.validateFields(nameList);
-        const transformedKey = transformKey(
-          values,
-          omitNilParam !== void 0 ? omitNilParam : omitNil
-        );
-        return transformedKey ? transformedKey : {};
-      })
+        return validateFieldsReturnFormatValue;
+      }()
     });
   }, [omitNil, transformKey, formRef.current]);
-  useEffect(() => {
-    var _a2, _b2;
-    const finalValues = transformKey(
-      (_b2 = (_a2 = formRef.current) == null ? void 0 : _a2.getFieldsValue) == null ? void 0 : _b2.call(_a2, true),
-      omitNil
-    );
-    onInit == null ? void 0 : onInit(finalValues, __spreadValues(__spreadValues({}, formRef.current), formatValues));
+  useEffect(function () {
+    var _formRef$current3, _formRef$current3$get;
+    var finalValues = transformKey((_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 || (_formRef$current3$get = _formRef$current3.getFieldsValue) === null || _formRef$current3$get === void 0 ? void 0 : _formRef$current3$get.call(_formRef$current3, true), omitNil);
+    onInit === null || onInit === void 0 || onInit(finalValues, _objectSpread(_objectSpread({}, formRef.current), formatValues));
   }, []);
-  return /* @__PURE__ */ React.createElement(
-    ProFormContext.Provider,
-    {
-      value: __spreadProps(__spreadValues({}, formatValues), {
-        formRef
+  return /*#__PURE__*/_jsx(ProFormContext.Provider, {
+    value: _objectSpread(_objectSpread({}, formatValues), {}, {
+      formRef: formRef
+    }),
+    children: /*#__PURE__*/_jsx(ConfigProvider, {
+      componentSize: rest.size || componentSize,
+      children: /*#__PURE__*/_jsxs(GridContext.Provider, {
+        value: {
+          grid: grid,
+          colProps: colProps
+        },
+        children: [rest.component !== false && /*#__PURE__*/_jsx("input", {
+          type: "text",
+          style: {
+            display: 'none'
+          }
+        }), content]
       })
-    },
-    /* @__PURE__ */ React.createElement(ConfigProvider, { componentSize: rest.size || componentSize }, /* @__PURE__ */ React.createElement(GridContext.Provider, { value: { grid, colProps } }, rest.component !== false && /* @__PURE__ */ React.createElement(
-      "input",
-      {
-        type: "text",
-        style: {
-          display: "none"
-        }
-      }
-    ), content))
-  );
+    })
+  });
 }
+
+/** 自动的formKey 防止重复 */
 var requestFormCacheId = 0;
-function BaseForm(props) {
-  const _a = props, {
-    extraUrlParams = {},
-    syncToUrl,
-    isKeyPressSubmit,
-    syncToUrlAsImportant = false,
-    syncToInitialValues = true,
-    children,
-    contentRender,
-    submitter,
-    fieldProps,
-    proFieldProps,
-    formItemProps,
-    groupProps,
-    dateFormatter = "string",
-    formRef: propsFormRef,
-    onInit,
-    form,
-    formComponentType,
-    onReset,
-    grid,
-    rowProps,
-    colProps,
-    omitNil = true,
-    request,
-    params,
-    initialValues,
-    formKey = requestFormCacheId,
-    readonly,
-    onLoadingChange,
-    loading: propsLoading
-  } = _a, propRest = __objRest(_a, [
-    "extraUrlParams",
-    "syncToUrl",
-    "isKeyPressSubmit",
-    "syncToUrlAsImportant",
-    "syncToInitialValues",
-    "children",
-    "contentRender",
-    "submitter",
-    "fieldProps",
-    "proFieldProps",
-    "formItemProps",
-    "groupProps",
-    "dateFormatter",
-    "formRef",
-    "onInit",
-    "form",
-    "formComponentType",
-    "onReset",
-    "grid",
-    "rowProps",
-    "colProps",
-    "omitNil",
-    "request",
-    "params",
-    "initialValues",
-    "formKey",
-    "readonly",
-    "onLoadingChange",
-    "loading"
-  ]);
-  const formRef = useRef({});
-  const [loading, setLoading] = useMountMergeState(false, {
-    onChange: onLoadingChange,
-    value: propsLoading
-  });
-  const [urlSearch, setUrlSearch] = useUrlSearchParams(
-    {},
-    { disabled: !syncToUrl }
-  );
-  const curFormKey = useRef(nanoid());
-  useEffect(() => {
+export function BaseForm(props) {
+  var _props$extraUrlParams2 = props.extraUrlParams,
+    extraUrlParams = _props$extraUrlParams2 === void 0 ? {} : _props$extraUrlParams2,
+    syncToUrl = props.syncToUrl,
+    isKeyPressSubmit = props.isKeyPressSubmit,
+    _props$syncToUrlAsImp = props.syncToUrlAsImportant,
+    syncToUrlAsImportant = _props$syncToUrlAsImp === void 0 ? false : _props$syncToUrlAsImp,
+    _props$syncToInitialV = props.syncToInitialValues,
+    syncToInitialValues = _props$syncToInitialV === void 0 ? true : _props$syncToInitialV,
+    children = props.children,
+    contentRender = props.contentRender,
+    submitter = props.submitter,
+    fieldProps = props.fieldProps,
+    proFieldProps = props.proFieldProps,
+    formItemProps = props.formItemProps,
+    groupProps = props.groupProps,
+    _props$dateFormatter = props.dateFormatter,
+    dateFormatter = _props$dateFormatter === void 0 ? 'string' : _props$dateFormatter,
+    propsFormRef = props.formRef,
+    onInit = props.onInit,
+    form = props.form,
+    formComponentType = props.formComponentType,
+    onReset = props.onReset,
+    grid = props.grid,
+    rowProps = props.rowProps,
+    colProps = props.colProps,
+    _props$omitNil2 = props.omitNil,
+    omitNil = _props$omitNil2 === void 0 ? true : _props$omitNil2,
+    request = props.request,
+    params = props.params,
+    initialValues = props.initialValues,
+    _props$formKey = props.formKey,
+    formKey = _props$formKey === void 0 ? requestFormCacheId : _props$formKey,
+    readonly = props.readonly,
+    onLoadingChange = props.onLoadingChange,
+    propsLoading = props.loading,
+    propRest = _objectWithoutProperties(props, _excluded2);
+  var formRef = useRef({});
+  var _useMountMergeState = useMountMergeState(false, {
+      onChange: onLoadingChange,
+      value: propsLoading
+    }),
+    _useMountMergeState2 = _slicedToArray(_useMountMergeState, 2),
+    loading = _useMountMergeState2[0],
+    setLoading = _useMountMergeState2[1];
+  var _useUrlSearchParams = useUrlSearchParams({}, {
+      disabled: !syncToUrl
+    }),
+    _useUrlSearchParams2 = _slicedToArray(_useUrlSearchParams, 2),
+    urlSearch = _useUrlSearchParams2[0],
+    setUrlSearch = _useUrlSearchParams2[1];
+  var curFormKey = useRef(nanoid());
+  useEffect(function () {
     requestFormCacheId += 0;
   }, []);
-  const [initialData, initialDataLoading] = useFetchData({
-    request,
-    params,
-    proFieldKey: formKey
-  });
-  const { getPrefixCls } = useContext(ConfigProvider.ConfigContext);
-  const prefixCls = getPrefixCls("pro-form");
-  const { wrapSSR, hashId } = useStyle("ProForm", (token) => {
-    return {
-      [`.${prefixCls}`]: {
-        [`> div:not(${token.proComponentsCls}-form-light-filter)`]: {
-          ".pro-field": {
-            maxWidth: "100%",
-            "@media screen and (max-width: 575px)": {
-              // 减少了 form 的 padding
-              maxWidth: "calc(93vw - 48px)"
-            },
-            // 适用于短数字，短文本或者选项
-            "&-xs": {
-              width: 104
-            },
-            "&-s": {
-              width: 216
-            },
-            // 适用于较短字段录入、如姓名、电话、ID 等。
-            "&-sm": {
-              width: 216
-            },
-            "&-m": {
-              width: 328
-            },
-            // 标准宽度，适用于大部分字段长度
-            "&-md": {
-              width: 328
-            },
-            "&-l": {
-              width: 440
-            },
-            // 适用于较长字段录入，如长网址、标签组、文件路径等。
-            "&-lg": {
-              width: 440
-            },
-            // 适用于长文本录入，如长链接、描述、备注等，通常搭配自适应多行输入框或定高文本域使用。
-            "&-xl": {
-              width: 552
-            }
+  var _useFetchData = useFetchData({
+      request: request,
+      params: params,
+      proFieldKey: formKey
+    }),
+    _useFetchData2 = _slicedToArray(_useFetchData, 2),
+    initialData = _useFetchData2[0],
+    initialDataLoading = _useFetchData2[1];
+  var _useContext = useContext(ConfigProvider.ConfigContext),
+    getPrefixCls = _useContext.getPrefixCls;
+  var prefixCls = getPrefixCls('pro-form');
+  // css
+  var _useStyle = useStyle('ProForm', function (token) {
+      return _defineProperty({}, ".".concat(prefixCls), _defineProperty({}, "> div:not(".concat(token.proComponentsCls, "-form-light-filter)"), {
+        '.pro-field': {
+          maxWidth: '100%',
+          '@media screen and (max-width: 575px)': {
+            // 减少了 form 的 padding
+            maxWidth: 'calc(93vw - 48px)'
+          },
+          // 适用于短数字，短文本或者选项
+          '&-xs': {
+            width: 104
+          },
+          '&-s': {
+            width: 216
+          },
+          // 适用于较短字段录入、如姓名、电话、ID 等。
+          '&-sm': {
+            width: 216
+          },
+          '&-m': {
+            width: 328
+          },
+          // 标准宽度，适用于大部分字段长度
+          '&-md': {
+            width: 328
+          },
+          '&-l': {
+            width: 440
+          },
+          // 适用于较长字段录入，如长网址、标签组、文件路径等。
+          '&-lg': {
+            width: 440
+          },
+          // 适用于长文本录入，如长链接、描述、备注等，通常搭配自适应多行输入框或定高文本域使用。
+          '&-xl': {
+            width: 552
           }
         }
+      }));
+    }),
+    wrapSSR = _useStyle.wrapSSR,
+    hashId = _useStyle.hashId;
+
+  // 如果为 false，不需要触发设置进去
+  var _useState = useState(function () {
+      if (!syncToUrl) {
+        return {};
       }
-    };
-  });
-  const [urlParamsMergeInitialValues, setUrlParamsMergeInitialValues] = useState(() => {
-    if (!syncToUrl) {
-      return {};
+      return genParams(syncToUrl, urlSearch, 'get');
+    }),
+    _useState2 = _slicedToArray(_useState, 2),
+    urlParamsMergeInitialValues = _useState2[0],
+    setUrlParamsMergeInitialValues = _useState2[1];
+
+  /** 保存 transformKeyRef，用于对表单key transform */
+  var transformKeyRef = useRef({});
+  var fieldsValueType = useRef({});
+
+  /** 使用 callback 的类型 */
+  var transformKey = useRefFunction(function (values, paramsOmitNil, parentKey) {
+    if (!values || _typeof(values) !== 'object') {
+      return values;
     }
-    return genParams(syncToUrl, urlSearch, "get");
+    return transformKeySubmitValue(conversionMomentValue(values, dateFormatter, fieldsValueType.current, paramsOmitNil, parentKey), transformKeyRef.current);
   });
-  const transformKeyRef = useRef({});
-  const fieldsValueType = useRef({});
-  const transformKey = useRefFunction(
-    (values, paramsOmitNil, parentKey) => {
-      if (!values || typeof values !== "object") {
-        return values;
-      }
-      return transformKeySubmitValue(
-        conversionMomentValue(
-          values,
-          dateFormatter,
-          fieldsValueType.current,
-          paramsOmitNil,
-          parentKey
-        ),
-        transformKeyRef.current
-      );
-    }
-  );
-  useEffect(() => {
-    if (syncToInitialValues)
-      return;
+  useEffect(function () {
+    if (syncToInitialValues) return;
     setUrlParamsMergeInitialValues({});
   }, [syncToInitialValues]);
-  const getGenParams = useRefFunction(() => {
-    return __spreadValues(__spreadValues({}, urlSearch), extraUrlParams);
+  var getGenParams = useRefFunction(function () {
+    return _objectSpread(_objectSpread({}, urlSearch), extraUrlParams);
   });
-  useEffect(() => {
-    if (!syncToUrl)
-      return;
-    setUrlSearch(genParams(syncToUrl, getGenParams(), "set"));
+  useEffect(function () {
+    if (!syncToUrl) return;
+    setUrlSearch(genParams(syncToUrl, getGenParams(), 'set'));
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [extraUrlParams, getGenParams, syncToUrl]);
-  const getPopupContainer = useMemo(() => {
-    if (typeof window === "undefined")
-      return void 0;
-    if (formComponentType && ["DrawerForm"].includes(formComponentType)) {
-      return (e) => e.parentNode || document.body;
+  var getPopupContainer = useMemo(function () {
+    if (typeof window === 'undefined') return undefined;
+    // 如果在 drawerForm 和  modalForm 里就渲染dom到父节点里
+    // modalForm 可能高度太小不适合
+    if (formComponentType && ['DrawerForm'].includes(formComponentType)) {
+      return function (e) {
+        return e.parentNode || document.body;
+      };
     }
-    return void 0;
+    return undefined;
   }, [formComponentType]);
-  const onFinish = useRefFunction(() => __async(this, null, function* () {
-    var _a2, _b, _c, _d;
-    if (!propRest.onFinish)
-      return;
-    if (loading)
-      return;
-    try {
-      setLoading(true);
-      const finalValues = ((_b = (_a2 = formRef == null ? void 0 : formRef.current) == null ? void 0 : _a2.getFieldsFormatValue) == null ? void 0 : _b.call(_a2)) || {};
-      const response = propRest.onFinish(finalValues);
-      if (response && typeof response === "object" && typeof response.then === "function") {
-        try {
-          yield response;
-        } catch (error) {
+  var onFinish = useRefFunction( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+    var _formRef$current4, _formRef$current4$get, finalValues, response, _formRef$current5, _formRef$current5$get, syncToUrlParams;
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          if (propRest.onFinish) {
+            _context3.next = 2;
+            break;
+          }
+          return _context3.abrupt("return");
+        case 2:
+          if (!loading) {
+            _context3.next = 4;
+            break;
+          }
+          return _context3.abrupt("return");
+        case 4:
+          _context3.prev = 4;
+          setLoading(true);
+          finalValues = (formRef === null || formRef === void 0 || (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 || (_formRef$current4$get = _formRef$current4.getFieldsFormatValue) === null || _formRef$current4$get === void 0 ? void 0 : _formRef$current4$get.call(_formRef$current4)) || {};
+          response = propRest.onFinish(finalValues);
+          if (!(response && _typeof(response) === 'object' && typeof response.then === 'function')) {
+            _context3.next = 21;
+            break;
+          }
+          _context3.prev = 9;
+          _context3.next = 12;
+          return response;
+        case 12:
+          _context3.next = 18;
+          break;
+        case 14:
+          _context3.prev = 14;
+          _context3.t0 = _context3["catch"](9);
+          // 确保在 Promise 被拒绝时也重置 loading 状态
           setLoading(false);
-          throw error;
-        }
-        setLoading(false);
-      } else {
-        setLoading(false);
-      }
-      if (syncToUrl) {
-        const syncToUrlParams = Object.keys(
-          ((_d = (_c = formRef == null ? void 0 : formRef.current) == null ? void 0 : _c.getFieldsFormatValue) == null ? void 0 : _d.call(_c, true, false)) || {}
-        ).reduce((pre, next) => {
-          var _a3;
-          return __spreadProps(__spreadValues({}, pre), {
-            [next]: (_a3 = finalValues[next]) != null ? _a3 : void 0
-          });
-        }, extraUrlParams);
-        Object.keys(urlSearch).forEach((key) => {
-          if (syncToUrlParams[key] !== false && syncToUrlParams[key] !== 0 && !syncToUrlParams[key]) {
-            syncToUrlParams[key] = void 0;
+          throw _context3.t0;
+        case 18:
+          // 只有在 Promise 成功完成时才重置 loading 状态
+          setLoading(false);
+          _context3.next = 22;
+          break;
+        case 21:
+          setLoading(false);
+        case 22:
+          if (syncToUrl) {
+            // 把没有的值设置为未定义可以删掉 url 的参数
+            syncToUrlParams = Object.keys((formRef === null || formRef === void 0 || (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 || (_formRef$current5$get = _formRef$current5.getFieldsFormatValue) === null || _formRef$current5$get === void 0 ? void 0 : _formRef$current5$get.call(_formRef$current5, true, false)) || {}).reduce(function (pre, next) {
+              var _finalValues$next;
+              return _objectSpread(_objectSpread({}, pre), {}, _defineProperty({}, next, (_finalValues$next = finalValues[next]) !== null && _finalValues$next !== void 0 ? _finalValues$next : undefined));
+            }, extraUrlParams); // fix #3547: 当原先在url中存在的字段被删除时，应该将 params 中的该字段设置为 undefined,以便触发url同步删除
+            Object.keys(urlSearch).forEach(function (key) {
+              if (syncToUrlParams[key] !== false && syncToUrlParams[key] !== 0 && !syncToUrlParams[key]) {
+                syncToUrlParams[key] = undefined;
+              }
+            });
+            /** 在同步到 url 上时对参数进行转化 */
+            setUrlSearch(genParams(syncToUrl, syncToUrlParams, 'set'));
           }
-        });
-        setUrlSearch(genParams(syncToUrl, syncToUrlParams, "set"));
+          _context3.next = 28;
+          break;
+        case 25:
+          _context3.prev = 25;
+          _context3.t1 = _context3["catch"](4);
+          setLoading(false);
+        case 28:
+        case "end":
+          return _context3.stop();
       }
-    } catch (error) {
-      setLoading(false);
-    }
-  }));
-  useImperativeHandle(propsFormRef, () => {
+    }, _callee3, null, [[4, 25], [9, 14]]);
+  })));
+
+  // 初始化给一个默认的 form
+  useImperativeHandle(propsFormRef, function () {
     return formRef.current;
   }, [!initialData]);
   if (request && initialDataLoading) {
-    return /* @__PURE__ */ React.createElement("div", { style: { paddingTop: 50, paddingBottom: 50, textAlign: "center" } }, /* @__PURE__ */ React.createElement(Spin, null));
+    return /*#__PURE__*/_jsx("div", {
+      style: {
+        paddingTop: 50,
+        paddingBottom: 50,
+        textAlign: 'center'
+      },
+      children: /*#__PURE__*/_jsx(Spin, {})
+    });
   }
-  return wrapSSR(
-    /* @__PURE__ */ React.createElement(
-      EditOrReadOnlyContext.Provider,
-      {
+  return wrapSSR( /*#__PURE__*/_jsx(EditOrReadOnlyContext.Provider, {
+    value: {
+      mode: props.readonly ? 'read' : 'edit'
+    },
+    children: /*#__PURE__*/_jsx(ProConfigProvider, {
+      needDeps: true,
+      children: /*#__PURE__*/_jsx(FieldContext.Provider, {
         value: {
-          mode: props.readonly ? "read" : "edit"
-        }
-      },
-      /* @__PURE__ */ React.createElement(ProConfigProvider, { needDeps: true }, /* @__PURE__ */ React.createElement(
-        FieldContext.Provider,
-        {
-          value: {
-            formRef,
-            fieldProps,
-            proFieldProps,
-            formItemProps,
-            groupProps,
-            formComponentType,
-            getPopupContainer,
-            formKey: curFormKey.current,
-            setFieldValueType: (name, { valueType = "text", dateFormat, transform }) => {
-              if (!Array.isArray(name))
-                return;
-              if (transform) {
-                transformKeyRef.current = namePathSet(
-                  transformKeyRef.current,
-                  name,
-                  transform
-                );
-              }
-              fieldsValueType.current = namePathSet(
-                fieldsValueType.current,
-                name,
-                {
-                  valueType,
-                  dateFormat
-                }
-              );
+          formRef: formRef,
+          fieldProps: fieldProps,
+          proFieldProps: proFieldProps,
+          formItemProps: formItemProps,
+          groupProps: groupProps,
+          formComponentType: formComponentType,
+          getPopupContainer: getPopupContainer,
+          formKey: curFormKey.current,
+          setFieldValueType: function setFieldValueType(name, _ref4) {
+            var _ref4$valueType = _ref4.valueType,
+              valueType = _ref4$valueType === void 0 ? 'text' : _ref4$valueType,
+              dateFormat = _ref4.dateFormat,
+              transform = _ref4.transform;
+            if (!Array.isArray(name)) return;
+
+            // Store transform function in the correct nested structure
+            if (transform) {
+              transformKeyRef.current = namePathSet(transformKeyRef.current, name, transform);
             }
+            fieldsValueType.current = namePathSet(fieldsValueType.current, name, {
+              valueType: valueType,
+              dateFormat: dateFormat
+            });
           }
         },
-        /* @__PURE__ */ React.createElement(FormListContext.Provider, { value: {} }, /* @__PURE__ */ React.createElement(
-          Form,
-          __spreadProps(__spreadValues({
-            onKeyPress: (event) => {
-              var _a2;
-              if (!isKeyPressSubmit)
-                return;
-              if (event.key === "Enter") {
-                (_a2 = formRef.current) == null ? void 0 : _a2.submit();
+        children: /*#__PURE__*/_jsx(FormListContext.Provider, {
+          value: {},
+          children: /*#__PURE__*/_jsx(Form, _objectSpread(_objectSpread({
+            onKeyPress: function onKeyPress(event) {
+              if (!isKeyPressSubmit) return;
+              if (event.key === 'Enter') {
+                var _formRef$current6;
+                (_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 || _formRef$current6.submit();
               }
             },
             autoComplete: "off",
-            form
-          }, omit(propRest, [
-            "ref",
-            "labelWidth",
-            "autoFocusFirstInput"
-          ])), {
-            ref: (instance) => {
-              if (!formRef.current)
-                return;
-              formRef.current.nativeElement = instance == null ? void 0 : instance.nativeElement;
-            },
-            initialValues: syncToUrlAsImportant ? __spreadValues(__spreadValues(__spreadValues({}, initialValues), initialData), urlParamsMergeInitialValues) : __spreadValues(__spreadValues(__spreadValues({}, urlParamsMergeInitialValues), initialValues), initialData),
-            onValuesChange: (changedValues, values) => {
-              var _a2;
-              (_a2 = propRest == null ? void 0 : propRest.onValuesChange) == null ? void 0 : _a2.call(
-                propRest,
-                transformKey(changedValues, !!omitNil),
-                transformKey(values, !!omitNil)
-              );
+            form: form
+          }, omit(propRest, ['ref', 'labelWidth', 'autoFocusFirstInput'])), {}, {
+            ref: function ref(instance) {
+              if (!formRef.current) return;
+              formRef.current.nativeElement = instance === null || instance === void 0 ? void 0 : instance.nativeElement;
+            }
+            // 组合 urlSearch 和 initialValues
+            ,
+            initialValues: syncToUrlAsImportant ? _objectSpread(_objectSpread(_objectSpread({}, initialValues), initialData), urlParamsMergeInitialValues) : _objectSpread(_objectSpread(_objectSpread({}, urlParamsMergeInitialValues), initialValues), initialData),
+            onValuesChange: function onValuesChange(changedValues, values) {
+              var _propRest$onValuesCha;
+              propRest === null || propRest === void 0 || (_propRest$onValuesCha = propRest.onValuesChange) === null || _propRest$onValuesCha === void 0 || _propRest$onValuesCha.call(propRest, transformKey(changedValues, !!omitNil), transformKey(values, !!omitNil));
             },
             className: classNames(props.className, prefixCls, hashId),
-            onFinish
-          }),
-          /* @__PURE__ */ React.createElement(
-            BaseFormComponents,
-            __spreadProps(__spreadValues({
-              transformKey,
+            onFinish: onFinish,
+            children: /*#__PURE__*/_jsx(BaseFormComponents, _objectSpread(_objectSpread({
+              transformKey: transformKey,
               autoComplete: "off",
               loading: loading || !!(request && !initialData && initialDataLoading),
               onUrlSearchChange: setUrlSearch
-            }, props), {
-              formRef,
-              initialValues: __spreadValues(__spreadValues({}, initialValues), initialData)
-            })
-          )
-        ))
-      ))
-    )
-  );
-}
-export {
-  BaseForm
-};
+            }, props), {}, {
+              formRef: formRef,
+              initialValues: _objectSpread(_objectSpread({}, initialValues), initialData)
+            }))
+          }))
+        })
+      })
+    })
+  }));
+}