@ant-design/pro-components 3.1.12-0 → 3.1.13-0

package/lib/field/types.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/lib/form/BaseForm/BaseForm.d.ts

@@ -135,7 +135,7 @@ export type BaseFormProps<T = Record<string, any>, U = Record<string, any>> = {
     /** 是否回车提交 */
     isKeyPressSubmit?: boolean;
     /** Form 组件的类型，内部使用 */
-    formComponentType?: 'DrawerForm' | 'ModalForm' | 'QueryFilter';
+    formComponentType?: 'DrawerForm' | 'ModalForm' | 'QueryFilter' | 'LightFilter';
 } & Omit<FormProps, 'onFinish'> & CommonFormProps<T, U>;
-export declare function BaseForm<T = Record<string, any>, U = Record<string, any>>(props: BaseFormProps<T, U>): import("react/jsx-runtime").JSX.Element;
+export declare function BaseForm<T = Record<string, any>, U = Record<string, any>>(props: BaseFormProps<T, U>): React.JSX.Element;
 export {};

package/lib/form/BaseForm/BaseForm.js

@@ -7,12 +7,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.BaseForm = BaseForm;
 var _util = require("@rc-component/util");
-var _useParams = require("@umijs/use-params");
 var _antd = require("antd");
 var _clsx = require("clsx");
 var _react = _interopRequireWildcard(require("react"));
 var _provider = require("../../provider");
 var _utils = require("../../utils");
+var _useUrlSync = require("./useUrlSync");
 var _List = require("../components/List");
 var _FieldContext = _interopRequireDefault(require("../FieldContext"));
 var _helpers = require("../helpers");
@@ -25,13 +25,6 @@ const {
 
 // Define ProFormInstance and ProFormRef
 
-const genParams = (syncUrl, params, type) => {
-  if (syncUrl === true) {
-    return params;
-  }
-  return (0, _utils.runFunction)(syncUrl, params, type);
-};
-
 /**
  * It takes a name path and converts it to an array.
  * @param {NamePath} name - The name of the form.
@@ -46,6 +39,61 @@ const covertFormName = name => {
   return [name];
 };
 const defaultExtraUrlParams = {};
+
+/**
+ * 构建 ProForm 格式化方法集合，供 formatValues useMemo 与 useImperativeHandle 共用，
+ * 消除两处完全相同的 ~80 行重复实现。
+ */
+function buildFormatValues(getFormInstance, transformKey, omitNil) {
+  return {
+    getFieldsFormatValue: (allData, omitNilParam) => {
+      const instance = getFormInstance();
+      if (!instance) return {};
+      const values = instance.getFieldsValue(allData);
+      return transformKey(values, omitNilParam !== undefined ? omitNilParam : omitNil);
+    },
+    getFieldFormatValue: (paramsNameList = [], omitNilParam) => {
+      const instance = getFormInstance();
+      if (!instance) return undefined;
+      const nameList = covertFormName(paramsNameList);
+      if (!nameList) throw new Error('nameList is require');
+      const value = instance.getFieldValue(nameList);
+      const obj = nameList ? (0, _util.set)({}, nameList, value) : value;
+      // transformKey 会将 keys 重新和 nameList 拼接，所以要将 nameList 的首个元素弹出
+      const newNameList = [...nameList];
+      newNameList.shift();
+      const transformed = transformKey(obj, omitNilParam !== undefined ? omitNilParam : omitNil, newNameList);
+      const result = (0, _util.get)(transformed, nameList);
+      // 如果结果是对象，返回对象的值
+      if (result && typeof result === 'object' && !Array.isArray(result)) {
+        const objValue = Object.values(result)[0];
+        return objValue;
+      }
+      return result;
+    },
+    getFieldFormatValueObject: (paramsNameList, omitNilParam) => {
+      const instance = getFormInstance();
+      if (!instance) return {};
+      const nameList = covertFormName(paramsNameList);
+      const value = instance.getFieldValue(nameList);
+      const obj = nameList ? (0, _util.set)({}, nameList, value) : value;
+      // 与 getFieldFormatValue 一致：弹出 nameList 首段再交给 transformKey，
+      // 否则 conversionMomentValue 会得到重复的 parentPath（如可编辑表格行 key），
+      // fieldsValueType 匹配失败且极端情况下日期字段无法格式化为 string/number。
+      const newNameList = nameList ? [...nameList] : [];
+      newNameList.shift();
+      return transformKey(obj, omitNilParam !== undefined ? omitNilParam : omitNil, newNameList);
+    },
+    validateFieldsReturnFormatValue: async (nameList, omitNilParam) => {
+      const instance = getFormInstance();
+      if (!instance) return {};
+      if (!Array.isArray(nameList) && nameList) throw new Error('nameList must be array');
+      const values = await instance.validateFields(nameList);
+      const transformedKey = transformKey(values, omitNilParam !== undefined ? omitNilParam : omitNil);
+      return transformedKey ?? {};
+    }
+  };
+}
 function BaseFormComponents(props) {
   const {
     children,
@@ -62,7 +110,7 @@ function BaseFormComponents(props) {
     formComponentType,
     extraUrlParams = defaultExtraUrlParams,
     syncToUrl,
-    onUrlSearchChange,
+    onUrlSyncReset,
     onReset,
     omitNil = true,
     isKeyPressSubmit,
@@ -83,8 +131,8 @@ function BaseFormComponents(props) {
     componentSize: 'middle'
   };
 
-  /** 同步 url 上的参数 */
-  const formRef = (0, _react.useRef)(form || formInstance);
+  /** 内部持有当前 FormInstance，供 useImperativeHandle 和 submitter 使用 */
+  const formInstanceRef = (0, _react.useRef)(form || formInstance);
 
   /**
    * 获取布局
@@ -96,146 +144,38 @@ function BaseFormComponents(props) {
     rowProps
   });
   const getFormInstance = (0, _utils.useRefFunction)(() => formInstance);
-  const formatValues = (0, _react.useMemo)(() => ({
-    /**
-     * 获取被 ProForm 格式化后的所有数据
-     * @param allData boolean
-     * @param omitNilParam boolean
-     * @returns T
-     *
-     * @example  getFieldsFormatValue(true) ->返回所有数据，即使没有被 form 托管的
-     */
-    getFieldsFormatValue: (allData, omitNilParam) => {
-      const formInstance = getFormInstance();
-      if (!formInstance) {
-        return {};
-      }
-      const values = formInstance.getFieldsValue(allData);
-      return transformKey(values, omitNilParam !== undefined ? omitNilParam : omitNil);
-    },
-    /**
-     * 获取被 ProForm 格式化后的单个数据
-     * @param nameList (string|number)[]
-     * @param omitNilParam boolean
-     * @returns T
-     *
-     * @example {a:{b:value}} -> getFieldFormatValue(['a', 'b']) -> value
-     */
-    /** 获取格式化之后的单个数据 */
-    getFieldFormatValue: (paramsNameList = [], omitNilParam) => {
-      const formInstance = getFormInstance();
-      if (!formInstance) {
-        return undefined;
-      }
-      const nameList = covertFormName(paramsNameList);
-      if (!nameList) throw new Error('nameList is require');
-      const value = formInstance.getFieldValue(nameList);
-      const obj = nameList ? (0, _util.set)({}, nameList, value) : value;
-      //transformKey会将keys重新和nameList拼接，所以这里要将nameList的首个元素弹出
-      const newNameList = [...nameList];
-      newNameList.shift();
-      const transformed = transformKey(obj, omitNilParam !== undefined ? omitNilParam : omitNil, newNameList);
-      const result = (0, _util.get)(transformed, nameList);
-      // 如果结果是对象，返回对象的值
-      if (result && typeof result === 'object' && !Array.isArray(result)) {
-        const objValue = Object.values(result)[0];
-        // 如果对象的值是数组，返回数组
-        if (Array.isArray(objValue)) {
-          return objValue;
-        }
-        return objValue;
-      }
-      return result;
-    },
-    /**
-     * 获取被 ProForm 格式化后的单个数据, 包含他的 name
-     * @param nameList (string|number)[]
-     * @param omitNilParam boolean
-     * @returns T
-     *
-     * @example  {a:{b:value}} -> getFieldFormatValueObject(['a', 'b']) -> {a:{b:value}}
-     */
-    /** 获取格式化之后的单个数据 */
-    getFieldFormatValueObject: (paramsNameList, omitNilParam) => {
-      const formInstance = getFormInstance();
-      if (!formInstance) {
-        return {};
-      }
-      const nameList = covertFormName(paramsNameList);
-      const value = formInstance.getFieldValue(nameList);
-      const obj = nameList ? (0, _util.set)({}, nameList, value) : value;
-      return transformKey(obj, omitNilParam !== undefined ? omitNilParam : omitNil, nameList);
-    },
-    /** 
-    /**
-     *验字段后返回格式化之后的所有数据
-     * @param nameList (string|number)[]
-     * @param omitNilParam boolean
-     * @returns T
-     * 
-     * @example validateFieldsReturnFormatValue -> {a:{b:value}}
-     */
-    validateFieldsReturnFormatValue: async (nameList, omitNilParam) => {
-      const formInstance = getFormInstance();
-      if (!formInstance) {
-        return {};
-      }
-      if (!Array.isArray(nameList) && nameList) throw new Error('nameList must be array');
-      const values = await formInstance.validateFields(nameList);
-      const transformedKey = transformKey(values, omitNilParam !== undefined ? omitNilParam : omitNil);
-      return transformedKey ? transformedKey : {};
+
+  // 消除 formatValues useMemo 与 useImperativeHandle 里的重复实现，统一由 buildFormatValues 生成
+  const formatValues = (0, _react.useMemo)(() => buildFormatValues(getFormInstance, transformKey, omitNil), [omitNil, transformKey, getFormInstance]);
+  const items = _react.default.Children.toArray(children).map((item, index) => {
+    if (index === 0 && /*#__PURE__*/_react.default.isValidElement(item) && autoFocusFirstInput) {
+      return (0, _utils.autoFocusToFirstChild)(item, autoFocusFirstInput);
     }
-  }), [omitNil, transformKey, getFormInstance]);
-  const items = (0, _react.useMemo)(() => {
-    return _react.default.Children.toArray(children).map((item, index) => {
-      if (index === 0 && /*#__PURE__*/_react.default.isValidElement(item) && autoFocusFirstInput) {
-        return (0, _utils.autoFocusToFirstChild)(item, autoFocusFirstInput);
-      }
-      return item;
-    });
-  }, [autoFocusFirstInput, children]);
+    return item;
+  });
 
   /** 计算 props 的对象 */
-  const submitterProps = (0, _react.useMemo)(() => typeof submitter === 'boolean' || !submitter ? {} : submitter, [submitter]);
+  const submitterProps = typeof submitter === 'boolean' || !submitter ? {} : submitter;
 
   /** 渲染提交按钮与重置按钮 */
-  const submitterNode = (0, _react.useMemo)(() => {
-    if (submitter === false) return undefined;
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Submitter.default, {
-      ...submitterProps,
-      onReset: () => {
-        const finalValues = transformKey(formRef.current?.getFieldsValue(), omitNil);
-        submitterProps?.onReset?.(finalValues);
-        onReset?.(finalValues);
-        // 如果 syncToUrl，清空一下数据
-        if (syncToUrl) {
-          // 把没有的值设置为未定义可以删掉 url 的参数
-          const params = Object.keys(transformKey(formRef.current?.getFieldsValue(), false)).reduce((pre, next) => {
-            return {
-              ...pre,
-              [next]: finalValues[next] || undefined
-            };
-          }, extraUrlParams);
-
-          /** 在同步到 url 上时对参数进行转化 */
-          onUrlSearchChange(genParams(syncToUrl, params || {}, 'set'));
-        }
-      },
-      submitButtonProps: {
-        loading,
-        ...submitterProps.submitButtonProps
-      }
-    }, "submitter");
-  }, [submitter, submitterProps, loading, transformKey, omitNil, onReset, syncToUrl, extraUrlParams, onUrlSearchChange]);
-  const content = (0, _react.useMemo)(() => {
-    const wrapItems = grid ? /*#__PURE__*/(0, _jsxRuntime.jsx)(RowWrapper, {
-      children: items
-    }) : items;
-    if (contentRender) {
-      return contentRender(wrapItems, submitterNode, formRef.current);
+  const submitterNode = submitter === false ? undefined : /*#__PURE__*/(0, _jsxRuntime.jsx)(_Submitter.default, {
+    ...submitterProps,
+    onReset: () => {
+      const finalValues = transformKey(formInstanceRef.current?.getFieldsValue(), omitNil);
+      submitterProps?.onReset?.(finalValues);
+      onReset?.(finalValues);
+      // 如果 syncToUrl，清空 URL 上对应的参数
+      onUrlSyncReset(finalValues, extraUrlParams);
+    },
+    submitButtonProps: {
+      loading,
+      ...submitterProps.submitButtonProps
     }
-    return wrapItems;
-  }, [grid, RowWrapper, items, contentRender, submitterNode]);
+  }, "submitter");
+  const wrapItems = grid ? /*#__PURE__*/(0, _jsxRuntime.jsx)(RowWrapper, {
+    children: items
+  }) : items;
+  const content = contentRender ? contentRender(wrapItems, submitterNode, formInstanceRef.current) : wrapItems;
   const preInitialValues = (0, _utils.usePrevious)(props.initialValues);
 
   // 提示一个 initialValues ，问的人实在是太多了
@@ -246,76 +186,22 @@ function BaseFormComponents(props) {
     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 `);
   }, [props.initialValues]);
 
-  // 初始化给一个默认的 form
-  (0, _react.useImperativeHandle)(propsFormRef, () => {
-    return {
-      ...formRef.current,
-      getFieldsFormatValue: (allData, omitNilParam) => {
-        const formInstance = formRef.current;
-        if (!formInstance) {
-          return {};
-        }
-        const values = formInstance.getFieldsValue(allData);
-        return transformKey(values, omitNilParam !== undefined ? omitNilParam : omitNil);
-      },
-      getFieldFormatValue: (paramsNameList = [], omitNilParam) => {
-        const formInstance = formRef.current;
-        if (!formInstance) {
-          return undefined;
-        }
-        const nameList = covertFormName(paramsNameList);
-        if (!nameList) throw new Error('nameList is require');
-        const value = formInstance.getFieldValue(nameList);
-        const obj = nameList ? (0, _util.set)({}, nameList, value) : value;
-        //transformKey会将keys重新和nameList拼接，所以这里要将nameList的首个元素弹出
-        const newNameList = [...nameList];
-        newNameList.shift();
-        const transformed = transformKey(obj, omitNilParam !== undefined ? omitNilParam : omitNil, newNameList);
-        const result = (0, _util.get)(transformed, nameList);
-        // 如果结果是对象，返回对象的值
-        if (result && typeof result === 'object' && !Array.isArray(result)) {
-          const objValue = Object.values(result)[0];
-          // 如果对象的值是数组，返回数组
-          if (Array.isArray(objValue)) {
-            return objValue;
-          }
-          return objValue;
-        }
-        return result;
-      },
-      getFieldFormatValueObject: (paramsNameList, omitNilParam) => {
-        const formInstance = formRef.current;
-        if (!formInstance) {
-          return {};
-        }
-        const nameList = covertFormName(paramsNameList);
-        const value = formInstance.getFieldValue(nameList);
-        const obj = nameList ? (0, _util.set)({}, nameList, value) : value;
-        return transformKey(obj, omitNilParam !== undefined ? omitNilParam : omitNil, nameList);
-      },
-      validateFieldsReturnFormatValue: async (nameList, omitNilParam) => {
-        const formInstance = formRef.current;
-        if (!formInstance) {
-          return {};
-        }
-        if (!Array.isArray(nameList) && nameList) throw new Error('nameList must be array');
-        const values = await formInstance.validateFields(nameList);
-        const transformedKey = transformKey(values, omitNilParam !== undefined ? omitNilParam : omitNil);
-        return transformedKey ? transformedKey : {};
-      }
-    };
-  }, [omitNil, transformKey, formRef.current]);
+  // 初始化给一个默认的 form；直接复用 buildFormatValues，消除重复实现
+  (0, _react.useImperativeHandle)(propsFormRef, () => ({
+    ...formInstanceRef.current,
+    ...buildFormatValues(() => formInstanceRef.current, transformKey, omitNil)
+  }), [omitNil, transformKey, propsFormRef]);
   (0, _react.useEffect)(() => {
-    const finalValues = transformKey(formRef.current?.getFieldsValue?.(true), omitNil);
+    const finalValues = transformKey(formInstanceRef.current?.getFieldsValue?.(true), omitNil);
     onInit?.(finalValues, {
-      ...formRef.current,
+      ...formInstanceRef.current,
       ...formatValues
     });
   }, []);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_utils.ProFormContext.Provider, {
     value: {
       ...formatValues,
-      formRef
+      formRef: formInstanceRef
     },
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.ConfigProvider, {
       componentSize: rest.size || componentSize,
@@ -384,7 +270,7 @@ function BaseForm(props) {
    * 包装 setLoading，使用 queueMicrotask 延迟回调调用
    * 避免在渲染阶段调用外部回调导致的 React 警告
    */
-  const setLoading = (0, _react.useCallback)(updater => {
+  const setLoading = (0, _utils.useRefFunction)(updater => {
     setLoadingInner(prev => {
       const next = typeof updater === 'function' ? updater(prev) : updater;
       queueMicrotask(() => {
@@ -392,13 +278,19 @@ function BaseForm(props) {
       });
       return next;
     });
-  }, [onLoadingChangeCallback]);
-  const [urlSearch, setUrlSearch] = (0, _useParams.useUrlSearchParams)({}, {
-    disabled: !syncToUrl
+  });
+  const {
+    urlParamsMergeInitialValues,
+    onUrlSyncReset,
+    onUrlSyncFinish
+  } = (0, _useUrlSync.useUrlSync)({
+    syncToUrl,
+    syncToInitialValues,
+    extraUrlParams
   });
   const curFormKey = (0, _react.useRef)((0, _utils.nanoid)());
   (0, _react.useEffect)(() => {
-    requestFormCacheId += 0;
+    requestFormCacheId += 1;
   }, []);
   const [initialData, initialDataLoading] = (0, _utils.useFetchData)({
     request,
@@ -458,14 +350,6 @@ function BaseForm(props) {
     };
   });
 
-  // 如果为 false，不需要触发设置进去
-  const [urlParamsMergeInitialValues, setUrlParamsMergeInitialValues] = (0, _react.useState)(() => {
-    if (!syncToUrl) {
-      return {};
-    }
-    return genParams(syncToUrl, urlSearch, 'get');
-  });
-
   /** 保存 transformKeyRef，用于对表单key transform */
   const transformKeyRef = (0, _react.useRef)({});
   const fieldsValueType = (0, _react.useRef)({});
@@ -477,20 +361,6 @@ function BaseForm(props) {
     }
     return (0, _utils.transformKeySubmitValue)((0, _utils.conversionMomentValue)(values, dateFormatter, fieldsValueType.current, paramsOmitNil, parentKey), transformKeyRef.current);
   });
-  (0, _react.useEffect)(() => {
-    if (syncToInitialValues) return;
-    setUrlParamsMergeInitialValues({});
-  }, [syncToInitialValues]);
-  const getGenParams = (0, _utils.useRefFunction)(() => {
-    return {
-      ...urlSearch,
-      ...extraUrlParams
-    };
-  });
-  (0, _react.useEffect)(() => {
-    if (!syncToUrl) return;
-    setUrlSearch(genParams(syncToUrl, getGenParams(), 'set'));
-  }, [extraUrlParams, getGenParams, syncToUrl]);
   const getPopupContainer = (0, _react.useMemo)(() => {
     if (typeof window === 'undefined') return undefined;
     // 如果在 drawerForm 和  modalForm 里就渲染dom到父节点里
@@ -509,35 +379,24 @@ function BaseForm(props) {
       setLoading(true);
       const finalValues = formRef?.current?.getFieldsFormatValue?.() || {};
       const response = propRest.onFinish(finalValues);
+      let responseResult;
       if (response && typeof response === 'object' && typeof response.then === 'function') {
         try {
-          await response;
+          responseResult = await response;
         } catch (error) {
-          // 确保在 Promise 被拒绝时也重置 loading 状态
+          // Promise 被拒绝时重置 loading 并向上抛出，不同步 URL
           setLoading(false);
           throw error;
         }
-        // 只有在 Promise 成功完成时才重置 loading 状态
         setLoading(false);
       } else {
+        responseResult = response;
         setLoading(false);
       }
-      if (syncToUrl) {
-        // 把没有的值设置为未定义可以删掉 url 的参数
-        const syncToUrlParams = Object.keys(formRef?.current?.getFieldsFormatValue?.(true, false) || {}).reduce((pre, next) => {
-          return {
-            ...pre,
-            [next]: finalValues[next] ?? undefined
-          };
-        }, extraUrlParams);
-        // fix #3547: 当原先在url中存在的字段被删除时，应该将 params 中的该字段设置为 undefined,以便触发url同步删除
-        Object.keys(urlSearch).forEach(key => {
-          if (syncToUrlParams[key] !== false && syncToUrlParams[key] !== 0 && !syncToUrlParams[key]) {
-            syncToUrlParams[key] = undefined;
-          }
-        });
-        /** 在同步到 url 上时对参数进行转化 */
-        setUrlSearch(genParams(syncToUrl, syncToUrlParams, 'set'));
+      // 仅在 onFinish 返回 truthy 时才同步 URL，失败时不更新
+      if (responseResult) {
+        const allFieldKeys = Object.keys(formRef?.current?.getFieldsFormatValue?.(true, false) || {});
+        onUrlSyncFinish(finalValues, allFieldKeys, extraUrlParams);
       }
     } catch (error) {
       setLoading(false);
@@ -612,7 +471,7 @@ function BaseForm(props) {
                 firstInput?.focus();
               };
             }
-            // 组合 urlSearch 和 initialValues
+            // 组合 urlParamsMergeInitialValues 和 initialValues
             ,
             initialValues: syncToUrlAsImportant ? {
               ...initialValues,
@@ -633,7 +492,7 @@ function BaseForm(props) {
               transformKey: transformKey,
               autoComplete: "off",
               loading: loading || !!(request && !initialData && initialDataLoading),
-              onUrlSearchChange: setUrlSearch,
+              onUrlSyncReset: onUrlSyncReset,
               ...props,
               formRef: formRef,
               initialValues: {

package/lib/form/BaseForm/Submitter/index.d.ts

@@ -7,6 +7,9 @@ export type SearchConfig = {
     /** @name 提交按钮的文本 */
     submitText?: React.ReactNode;
 };
+type ActionButtonProps = ButtonProps & {
+    preventDefault?: boolean;
+};
 export type SubmitterProps<T = Record<string, any>> = {
     /** @name 提交方法 */
     onSubmit?: (value?: T) => void;
@@ -15,13 +18,9 @@ export type SubmitterProps<T = Record<string, any>> = {
     /** @name 搜索的配置，一般用来配置文本 */
     searchConfig?: SearchConfig;
     /** @name 提交按钮的 props */
-    submitButtonProps?: false | (ButtonProps & {
-        preventDefault?: boolean;
-    });
+    submitButtonProps?: false | ActionButtonProps;
     /** @name 重置按钮的 props */
-    resetButtonProps?: false | (ButtonProps & {
-        preventDefault?: boolean;
-    });
+    resetButtonProps?: false | ActionButtonProps;
     /** @name 自定义操作的渲染 */
     render?: ((props: SubmitterProps & T & {
         submit: () => void;

package/lib/form/BaseForm/Submitter/index.js

@@ -5,19 +5,37 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _util = require("@rc-component/util");
 var _antd = require("antd");
 var _react = _interopRequireWildcard(require("react"));
 var _provider = require("../../../provider");
 var _jsxRuntime = require("react/jsx-runtime");
 /** @name 用于配置操作栏 */
 
+/** 渲染单个操作按钮，消除 reset/submit 两个按钮 90% 的重复 */
+function renderActionButton(buttonProps, key, text, onAction, extraProps) {
+  // 剥离非原生 ButtonProps 的扩展字段，避免透传给 antd Button 导致警告
+  const {
+    preventDefault,
+    onClick,
+    fieldProps: _fieldProps,
+    ...restButtonProps
+  } = buttonProps;
+  return /*#__PURE__*/(0, _react.createElement)(_antd.Button, {
+    ...extraProps,
+    ...restButtonProps,
+    key: key,
+    onClick: e => {
+      if (!preventDefault) onAction();
+      onClick?.(e);
+    }
+  }, text);
+}
+
 /**
  * FormFooter 的组件，可以自动进行一些配置
  *
  * @param props
  */
-
 const Submitter = props => {
   const intl = (0, _provider.useIntl)();
   const form = _antd.Form.useFormInstance();
@@ -47,28 +65,14 @@ const Submitter = props => {
     submitText = intl.getMessage('tableForm.submit', '提交'),
     resetText = intl.getMessage('tableForm.reset', '重置')
   } = searchConfig;
-  /** 默认的操作的逻辑 */
   const dom = [];
   if (resetButtonProps !== false) {
-    dom.push( /*#__PURE__*/(0, _react.createElement)(_antd.Button, {
-      ...(0, _util.omit)(resetButtonProps ?? {}, ['preventDefault', 'fieldProps']),
-      key: "rest",
-      onClick: e => {
-        if (!resetButtonProps?.preventDefault) reset();
-        resetButtonProps?.onClick?.(e);
-      }
-    }, resetText));
+    dom.push(renderActionButton(resetButtonProps ?? {}, 'rest', resetText, reset));
   }
   if (submitButtonProps !== false) {
-    dom.push( /*#__PURE__*/(0, _react.createElement)(_antd.Button, {
-      type: "primary",
-      ...(0, _util.omit)(submitButtonProps || {}, ['preventDefault', 'fieldProps']),
-      key: "submit",
-      onClick: e => {
-        if (!submitButtonProps?.preventDefault) submit();
-        submitButtonProps?.onClick?.(e);
-      }
-    }, submitText));
+    dom.push(renderActionButton(submitButtonProps ?? {}, 'submit', submitText, submit, {
+      type: 'primary'
+    }));
   }
   const renderDom = render ? render({
     ...props,
@@ -76,16 +80,10 @@ const Submitter = props => {
     submit,
     reset
   }, dom) : dom;
-  if (!renderDom) {
-    return null;
-  }
+  if (!renderDom) return null;
   if (Array.isArray(renderDom)) {
-    if (renderDom?.length < 1) {
-      return null;
-    }
-    if (renderDom?.length === 1) {
-      return renderDom[0];
-    }
+    if (renderDom.length < 1) return null;
+    if (renderDom.length === 1) return renderDom[0];
     return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       style: {
         display: 'flex',

package/lib/form/BaseForm/index.d.ts

@@ -1,3 +1,2 @@
 export * from '../components/FormItem/warpField';
 export * from './BaseForm';
-export * from './LightWrapper';

package/lib/form/BaseForm/index.js

@@ -24,15 +24,4 @@ Object.keys(_BaseForm).forEach(function (key) {
       return _BaseForm[key];
     }
   });
-});
-var _LightWrapper = require("./LightWrapper");
-Object.keys(_LightWrapper).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _LightWrapper[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _LightWrapper[key];
-    }
-  });
 });