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

package/lib/table/components/EditableTable/index.js

@@ -14,6 +14,7 @@ var _form = _interopRequireWildcard(require("../../../form"));
 var _provider = require("../../../provider");
 var _utils = require("../../../utils");
 var _Table = _interopRequireDefault(require("../../Table"));
+var _utils2 = require("../../utils");
 var _jsxRuntime = require("react/jsx-runtime");
 const EditableTableActionContext = /*#__PURE__*/_react.default.createContext(undefined);
 
@@ -99,25 +100,15 @@ function createTopButtonProps(creatorButtonDom, columnsLength) {
           children
         }) => /*#__PURE__*/(0, _jsxRuntime.jsxs)("thead", {
           className: className,
-          children: [children, /*#__PURE__*/(0, _jsxRuntime.jsxs)("tr", {
-            style: {
-              position: 'relative'
-            },
-            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("td", {
-              colSpan: 0,
+          children: [children, /*#__PURE__*/(0, _jsxRuntime.jsx)("tr", {
+            children: /*#__PURE__*/(0, _jsxRuntime.jsx)("td", {
+              colSpan: columnsLength || 1,
               style: {
-                visibility: 'hidden'
+                padding: 0,
+                border: 'none'
               },
               children: creatorButtonDom
-            }), /*#__PURE__*/(0, _jsxRuntime.jsx)("td", {
-              style: {
-                position: 'absolute',
-                left: 0,
-                width: '100%'
-              },
-              colSpan: columnsLength,
-              children: creatorButtonDom
-            })]
+            })
           })]
         })
       }
@@ -131,7 +122,7 @@ function createTopButtonProps(creatorButtonDom, columnsLength) {
 function createBottomButtonProps(creatorButtonDom, tableViewRender) {
   return {
     tableViewRender: (_, dom) => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-      children: [tableViewRender?.(_, dom) ?? dom, creatorButtonDom]
+      children: [tableViewRender?.(_, dom) ?? (0, _utils2.resolveTableViewDefaultDom)(dom), creatorButtonDom]
     })
   };
 }
@@ -145,7 +136,7 @@ function useCreatorButton({
   tableViewRender
 }) {
   const creatorButtonDom = (0, _react.useMemo)(() => {
-    if (!shouldShowCreatorButton(maxLength, value?.length || 0, recordCreatorProps)) {
+    if (!shouldShowCreatorButton(maxLength, value?.length ?? 0, recordCreatorProps)) {
       return false;
     }
     if (!recordCreatorProps) {
@@ -187,12 +178,17 @@ function EditableTable(props) {
     ...rest
   } = props;
   const preData = (0, _react.useRef)(undefined);
+  /** ProFormDependency render 回调写入最新 list，useEffect 读取并处理副作用 */
+  const latestFormListRef = (0, _react.useRef)(null);
   const actionRef = (0, _react.useRef)();
   const formRef = (0, _react.useRef)();
   const form = _antd.Form.useFormInstance();
 
   // 设置 ref
-  (0, _react.useImperativeHandle)(rest.actionRef, () => actionRef.current, [actionRef.current]);
+  // actionRef 是 useRef 返回的稳定对象，其引用永远不变，
+  // 将 actionRef.current 放入 deps 无效（ref 变化不触发 effect），应使用空数组。
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  (0, _react.useImperativeHandle)(rest.actionRef, () => actionRef.current, []);
 
   // 在 name 模式下，如果没有传递 value prop，尝试从表单值中获取初始值
   const getInitialValue = () => {
@@ -213,15 +209,14 @@ function EditableTable(props) {
     return [];
   };
   const [value, setValueInner] = (0, _util.useControlledState)(getInitialValue, props.value);
-  const onChangeFn = props.controlled ? props.onChange : undefined;
-  const setValue = (0, _react.useCallback)(updater => {
-    setValueInner(prev => {
-      const next = typeof updater === 'function' ? updater(prev) : updater;
-      // 在非受控模式下，onChange 应该在 onDataSourceChange 中触发
-      onChangeFn?.(next);
-      return next;
-    });
-  }, [onChangeFn]);
+  // useRefFunction 等价于 useCallback(fn, [])，引用永远稳定，项目统一约定
+  const setValue = (0, _utils.useRefFunction)(updater => {
+    // setValue 仅负责更新内部数据状态，不触发任何 onChange 副作用：
+    //   受控模式的 onChange 由 handleValuesChange 在表单值变化时触发
+    //   非受控模式的 onChange 由 onDataSourceChange 回调在行保存/删除后触发
+    // 这样保证每次用户操作 onChange 只被调用一次，符合 React 纯函数规范。
+    setValueInner(updater);
+  });
   const getRowKey = _react.default.useMemo(() => {
     if (typeof rowKey === 'function') {
       return rowKey;
@@ -241,51 +236,47 @@ function EditableTable(props) {
    */
   const syncFormValuesExcludingEditing = (0, _utils.useRefFunction)((dataSource, editingKeysSet, namePath) => {
     if (!formRef.current) return;
-    try {
-      if (namePath && namePath.length > 0) {
-        // name 模式：需要保留正在编辑的行
-        const currentFormValues = formRef.current.getFieldsValue() || {};
-        const currentList = (0, _util.get)(currentFormValues, namePath);
-        if (currentList && Array.isArray(currentList)) {
-          // 构建新的表单值，保留正在编辑的行
-          // 使用 Map 优化查找性能，将 O(n²) 降低到 O(n)
-          const currentListMap = new Map();
-          currentList.forEach((item, idx) => {
-            const key = getRowKey(item, idx);
-            currentListMap.set(String(key), item);
-          });
-          const newList = dataSource.map((item, index) => {
-            const key = getRowKey(item, index);
-            const keyStr = String(key);
-
-            // 如果该行正在编辑，保留表单中的值
-            if (editingKeysSet.has(keyStr)) {
-              return currentListMap.get(keyStr) || item;
-            }
-            return item;
-          });
-          const newValue = (0, _util.set)({}, namePath, newList);
-          formRef.current.setFieldsValue(newValue);
-        } else {
-          const newValue = (0, _util.set)({}, namePath, dataSource);
-          formRef.current.setFieldsValue(newValue);
-        }
-      } else {
-        // 非 name 模式：直接设置值
-        const formValues = {};
-        dataSource.forEach((current, index) => {
-          const key = getRowKey(current, index);
+    if (namePath && namePath.length > 0) {
+      // name 模式：需要保留正在编辑的行
+      const currentFormValues = formRef.current.getFieldsValue() || {};
+      const currentList = (0, _util.get)(currentFormValues, namePath);
+      if (currentList && Array.isArray(currentList)) {
+        // 构建新的表单值，保留正在编辑的行
+        // 使用 Map 优化查找性能，将 O(n²) 降低到 O(n)
+        const currentListMap = new Map();
+        currentList.forEach((item, idx) => {
+          const key = getRowKey(item, idx);
+          currentListMap.set(String(key), item);
+        });
+        const newList = dataSource.map((item, index) => {
+          const key = getRowKey(item, index);
           const keyStr = String(key);
-          if (!editingKeysSet.has(keyStr)) {
-            formValues[keyStr] = current;
+
+          // 如果该行正在编辑，保留表单中的值
+          if (editingKeysSet.has(keyStr)) {
+            return currentListMap.get(keyStr) || item;
           }
+          return item;
         });
-        if (Object.keys(formValues).length > 0) {
-          formRef.current.setFieldsValue(formValues);
+        const newValue = (0, _util.set)({}, namePath, newList);
+        formRef.current.setFieldsValue(newValue);
+      } else {
+        const newValue = (0, _util.set)({}, namePath, dataSource);
+        formRef.current.setFieldsValue(newValue);
+      }
+    } else {
+      // 非 name 模式：直接设置值
+      const formValues = {};
+      dataSource.forEach((current, index) => {
+        const key = getRowKey(current, index);
+        const keyStr = String(key);
+        if (!editingKeysSet.has(keyStr)) {
+          formValues[keyStr] = current;
         }
+      });
+      if (Object.keys(formValues).length > 0) {
+        formRef.current.setFieldsValue(formValues);
       }
-    } catch (error) {
-      console.warn('Failed to sync form values:', error);
     }
   });
 
@@ -314,16 +305,19 @@ function EditableTable(props) {
   });
 
   /**
-   * 根据不同的情况返回不同的 rowKey
+   * 根据不同的模式（name / 非 name）将用户传入的 rowKey 解析为表单可用的 key。
+   * - 非 name 模式 + 数字索引 → 转换为实际 rowKey
+   * - name 模式 → 将 rowKey 转换为数组索引
+   * - 其他情况 → 原样返回
    */
-  const coverRowKey = (0, _utils.useRefFunction)(finlayRowKey => {
-    if (typeof finlayRowKey === 'number' && !props.name) {
-      return convertIndexToRowKey(finlayRowKey);
+  const resolveRowKey = (0, _utils.useRefFunction)(inputKey => {
+    if (typeof inputKey === 'number' && !props.name) {
+      return convertIndexToRowKey(inputKey);
     }
     if (props.name) {
-      return convertRowKeyToIndex(finlayRowKey);
+      return convertRowKeyToIndex(inputKey);
     }
-    return finlayRowKey;
+    return inputKey;
   });
 
   /**
@@ -340,8 +334,8 @@ function EditableTable(props) {
     if (rowIndex == null) {
       throw new Error('rowIndex is required');
     }
-    const finlayRowKey = coverRowKey(rowIndex);
-    const rowKeyName = buildFormFieldPath(finlayRowKey);
+    const resolvedKey = resolveRowKey(rowIndex);
+    const rowKeyName = buildFormFieldPath(resolvedKey);
     return formRef.current?.getFieldValue(rowKeyName);
   });
 
@@ -350,11 +344,14 @@ function EditableTable(props) {
    */
   const getRowsData = (0, _utils.useRefFunction)(() => {
     const rowKeyName = [props.name].flat(1).filter(Boolean);
-    if (Array.isArray(rowKeyName) && rowKeyName.length === 0) {
+    // 非 name 模式：rowKeyName 为空，从表单顶层拿所有字段，值是 Record<rowKey, DataType>
+    if (rowKeyName.length === 0) {
       const rowData = formRef.current?.getFieldsValue();
-      if (Array.isArray(rowData)) return rowData;
+      if (!rowData) return undefined;
+      // getFieldsValue() 返回的永远是对象，按 key 排列后取 values
       return Object.keys(rowData).map(key => rowData[key]);
     }
+    // name 模式：直接取数组
     return formRef.current?.getFieldValue(rowKeyName);
   });
 
@@ -365,8 +362,8 @@ function EditableTable(props) {
     if (rowIndex == null) {
       throw new Error('rowIndex is required');
     }
-    const finlayRowKey = coverRowKey(rowIndex);
-    const rowKeyName = buildFormFieldPath(finlayRowKey);
+    const resolvedKey = resolveRowKey(rowIndex);
+    const rowKeyName = buildFormFieldPath(resolvedKey);
     const currentRowData = getRowData(rowIndex);
     const newRowData = {
       ...currentRowData,
@@ -377,12 +374,12 @@ function EditableTable(props) {
     if (props.name) {
       const tableName = [props.name].flat(1).filter(Boolean);
       // 优先从 value prop 获取数据（受控模式），否则从表单值获取
-      let currentTableData = props.value || formRef.current?.getFieldValue(tableName);
+      const currentTableData = props.value || formRef.current?.getFieldValue(tableName);
       if (Array.isArray(currentTableData)) {
         // 找到要更新的行的索引
-        const rowIndexToUpdate = typeof finlayRowKey === 'number' ? finlayRowKey : currentTableData.findIndex((row, index) => {
+        const rowIndexToUpdate = typeof resolvedKey === 'number' ? resolvedKey : currentTableData.findIndex((row, index) => {
           const rowKey = getRowKey?.(row, index);
-          return rowKey === finlayRowKey || rowKey?.toString() === finlayRowKey?.toString();
+          return rowKey === resolvedKey || rowKey?.toString() === resolvedKey?.toString();
         });
         if (rowIndexToUpdate >= 0 && rowIndexToUpdate < currentTableData.length) {
           // 更新数组中的对应行
@@ -421,7 +418,39 @@ function EditableTable(props) {
       getRowsData,
       setRowData
     };
-  }, [coverRowKey, props.name, getRowData, getRowsData, setRowData]);
+  }, [resolveRowKey, props.name, getRowData, getRowsData, setRowData]);
+
+  /**
+   * 处理 name 模式下表单内部编辑引起的 onValuesChange 副作用。
+   * ProFormDependency 的渲染回调是纯函数，仅把最新 list 写入 latestFormListRef；
+   * 此 effect 在每次渲染后读取 ref，完成真正的副作用（比较 + 回调触发 + preData 更新）。
+   * 这样在 React 严格模式 double-invoke 下也不会出现 preData 被更新两次导致
+   * changeIndex 找错位置的问题。
+   */
+  (0, _react.useEffect)(() => {
+    if (!props.name) return;
+    const list = latestFormListRef.current;
+
+    // 初始化 preData（首次挂载时 preData 还没有值）
+    if (!preData.current) {
+      preData.current = value;
+      return;
+    }
+    if (!list || !Array.isArray(list)) {
+      preData.current = value;
+      return;
+    }
+    const changeIndex = list.findIndex((item, index) => {
+      return !(0, _utils.isDeepEqualReact)(item, preData.current?.[index]);
+    });
+    if (changeIndex !== -1) {
+      const changeItem = list[changeIndex];
+      props?.editable?.onValuesChange?.(changeItem, list);
+    }
+
+    // 必须在回调触发之后再更新 preData，保证对比基准正确
+    preData.current = list;
+  });
 
   /**
    * 受控模式下同步表单值
@@ -506,9 +535,12 @@ function EditableTable(props) {
 
   /**
    * 构建可编辑属性
-   * 使用 useMemo 优化性能，避免不必要的重新创建
+   *
+   * 使用 useRefFunction 替代 useMemo：props.editable 是对象，用户通常内联传入
+   * `editable={{ ... }}`，每次父组件 render 都产生新引用导致 useMemo 永远失效。
+   * useRefFunction 返回稳定引用的 getter，内部始终读取最新 props。
    */
-  const editableProps = (0, _react.useMemo)(() => {
+  const getEditableProps = (0, _utils.useRefFunction)(() => {
     const baseProps = {
       ...props.editable
     };
@@ -517,7 +549,8 @@ function EditableTable(props) {
       baseProps.onValuesChange = handleValuesChange;
     }
     return baseProps;
-  }, [props.editable, props.onValuesChange, props.controlled, props.onChange, handleValuesChange]);
+  });
+  const editableProps = getEditableProps();
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(EditableTableActionContext.Provider, {
       value: actionRef,
@@ -541,8 +574,8 @@ function EditableTable(props) {
         },
         dataSource: value,
         onDataSourceChange: dataSource => {
-          // setValue 会触发 onChange，但我们需要确保数据已经正确更新
-          // 所以先设置数据，然后手动触发 onChange
+          // setValue 仅更新内部数据状态，不触发任何 onChange 副作用。
+          // 非受控模式的 onChange 由下方路径 B 触发，受控模式由 handleValuesChange 触发。
           setValue(dataSource);
 
           /**
@@ -567,34 +600,11 @@ function EditableTable(props) {
     }), props.name ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_form.ProFormDependency, {
       name: [props.name],
       children: changeValue => {
-        // 初始化 preData
-        if (!preData.current) {
-          preData.current = value;
-          return null;
-        }
         const namePath = [props.name].flat(1);
         const list = (0, _util.get)(changeValue, namePath);
-
-        // 添加空值检查，避免后续操作出错
-        if (!list || !Array.isArray(list)) {
-          preData.current = value;
-          return null;
-        }
-
-        // 在更新 preData 之前找到变化的项
-        // 使用 findIndex 可以同时获取变化的项和索引
-        const changeIndex = list.findIndex((item, index) => {
-          return !(0, _utils.isDeepEqualReact)(item, preData.current?.[index]);
-        });
-
-        // 只有在找到变化项时才触发回调
-        if (changeIndex !== -1) {
-          const changeItem = list[changeIndex];
-          props?.editable?.onValuesChange?.(changeItem, list);
-        }
-
-        // 在找到 changeItem 之后再更新 preData，确保后续比较正确
-        preData.current = list;
+        // 纯计算：派生出当前 list，通过 latestFormList ref 传给 useEffect
+        // 不在此处修改任何 ref 或触发任何回调
+        latestFormListRef.current = list ?? null;
         return null;
       }
     }) : null]
@@ -621,11 +631,10 @@ function FieldEditableTable(props) {
     },
     shouldUpdate: (prev, next) => {
       const name = [props.name].flat(1);
-      try {
-        return JSON.stringify((0, _util.get)(prev, name)) !== JSON.stringify((0, _util.get)(next, name));
-      } catch (_error) {
-        return true;
-      }
+      // 用 isDeepEqualReact 代替 JSON.stringify：
+      // 1. 避免循环引用导致 JSON.stringify 抛出
+      // 2. 大数据量时性能更优（短路退出）
+      return !(0, _utils.isDeepEqualReact)((0, _util.get)(prev, name), (0, _util.get)(next, name));
     },
     ...props?.formItemProps,
     name: props.name,

package/lib/table/components/Form/FormRender.d.ts

@@ -27,5 +27,5 @@ export type TableFormItem<T, U = any> = {
  * @param param0
  * @returns
  */
-declare const FormRender: <T, U = any>({ onSubmit, formRef, dateFormatter, type, columns, action, ghost, manualRequest, onReset, submitButtonLoading, search: searchConfig, form: formConfig, bordered, }: TableFormItem<T, U>) => import("react/jsx-runtime").JSX.Element;
+declare const FormRender: <T, U = any>({ onSubmit, formRef, dateFormatter, type, columns, action, ghost, manualRequest, onReset, submitButtonLoading, search: searchConfig, form: formConfig, bordered, }: TableFormItem<T, U>) => React.JSX.Element;
 export default FormRender;

package/lib/table/components/Form/FormRender.js

@@ -13,14 +13,8 @@ var _form = require("../../../form");
 var _provider = require("../../../provider");
 var _jsxRuntime = require("react/jsx-runtime");
 function toLowerLine(str) {
-  let temp = str.replace(/[A-Z]/g, match => {
-    return `-${match.toLowerCase()}`;
-  });
-  if (temp.startsWith('-')) {
-    // 如果首字母是大写，执行replace时会多一个_，这里需要去掉
-    temp = temp.slice(1);
-  }
-  return temp;
+  const result = str.replace(/[A-Z]/g, match => `-${match.toLowerCase()}`);
+  return result.startsWith('-') ? result.slice(1) : result;
 }
 /**
  * 获取当前选择的 Form Layout 配置
@@ -47,7 +41,7 @@ const getFormCompetent = (isForm, searchConfig) => {
  */
 const getFromProps = (isForm, searchConfig, name) => {
   if (!isForm && name === 'LightFilter') {
-    // 传给 lightFilter 的问题
+    // 传给轻量筛选表单的配置
     return (0, _util.omit)({
       ...searchConfig
     }, ['labelWidth', 'defaultCollapsed', 'filterType']);
@@ -105,15 +99,12 @@ const FormRender = ({
     hashId
   } = (0, _react.useContext)(_provider.ProProvider);
   const isForm = type === 'form';
-  /** 提交表单，根据两种模式不同，方法不相同 */
-  const submit = async (values, firstLoad) => {
-    if (onSubmit) {
-      onSubmit(values, firstLoad);
-    }
-  };
   const {
     getPrefixCls
   } = (0, _react.useContext)(_antd.ConfigProvider.ConfigContext);
+  const className = getPrefixCls('pro-table-search');
+  const formClassName = getPrefixCls('pro-table-form');
+  const competentName = (0, _react.useMemo)(() => getFormCompetent(isForm, searchConfig), [searchConfig, isForm]);
   const columnsList = (0, _react.useMemo)(() => {
     return columns.filter(item => {
       if (item === _antd.Table.EXPAND_COLUMN || item === _antd.Table.SELECTION_COLUMN) {
@@ -135,24 +126,24 @@ const FormRender = ({
         ...(item.search && typeof item.search === 'object' ? item.search : {}),
         valueType: finalValueType,
         proFieldProps: {
+          ...(competentName === 'LightFilter' && item.proFieldProps?.light === undefined ? {
+            light: true
+          } : {}),
           ...item.proFieldProps,
           proFieldKey: columnKey ? `table-field-${columnKey}` : undefined
         }
       };
     });
-  }, [columns, type]);
-  const className = getPrefixCls('pro-table-search');
-  const formClassName = getPrefixCls('pro-table-form');
-  const competentName = (0, _react.useMemo)(() => getFormCompetent(isForm, searchConfig), [searchConfig, isForm]);
+  }, [columns, type, competentName]);
 
   // 传给每个表单的配置，理论上大家都需要
-  const loadingProps = (0, _react.useMemo)(() => ({
+  const loadingProps = {
     submitter: {
       submitButtonProps: {
         loading: submitButtonLoading
       }
     }
-  }), [submitButtonLoading]);
+  };
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     className: (0, _clsx.clsx)(hashId, {
       [getPrefixCls('pro-card')]: true,
@@ -193,14 +184,14 @@ const FormRender = ({
           });
           /** 如果是手动模式不需要提交 */
           if (manualRequest) return;
-          submit(values, true);
+          onSubmit?.(values, true);
         }
       },
       onReset: values => {
         onReset?.(values);
       },
       onFinish: values => {
-        submit(values, false);
+        onSubmit?.(values, false);
       },
       initialValues: formConfig?.initialValues
     })

package/lib/table/components/Form/index.d.ts

@@ -20,5 +20,5 @@ type BaseFormProps<T, U> = {
 };
 declare const _default: <T, U>(props: BaseFormProps<T, U> & {
     ghost?: boolean | undefined;
-}) => import("react/jsx-runtime").JSX.Element;
+}) => React.JSX.Element;
 export default _default;

package/lib/table/components/Form/index.js

@@ -39,51 +39,29 @@ const FormSearch = props => {
     pageSize: pagination.pageSize
   }) : {}, [pagination]);
   const onSubmitHandler = (0, _utils.useRefFunction)((value, firstLoad) => {
-    // 检查是否需要验证
-    if (form?.ignoreRules === false && firstLoad) {
-      formRef?.current?.validateFields().then(() => {
-        const submitParams = {
-          ...value,
-          _timestamp: Date.now(),
-          ...pageInfo
-        };
-        const omitParams = (0, _util.omit)(beforeSearchSubmit(submitParams), Object.keys(pageInfo));
-        onFormSearchSubmit(omitParams);
-        if (!firstLoad) {
-          // back first page
-          action.current?.setPageInfo?.({
-            current: 1
-          });
-        }
-        // 不是第一次提交就不触发，第一次提交是 js 触发的
+    const runSubmit = () => {
+      const submitParams = {
+        ...value,
+        _timestamp: Date.now(),
+        ...pageInfo
+      };
+      const omitParams = (0, _util.omit)(beforeSearchSubmit(submitParams), Object.keys(pageInfo));
+      onFormSearchSubmit(omitParams);
+      if (!firstLoad) {
+        // 不是第一次提交才跳回第一页，并触发 onSubmit
         // 为了解决 https://github.com/ant-design/pro-components/issues/579
-        if (onSubmit && !firstLoad) {
-          onSubmit?.(value);
-        }
-      }).catch(e => {
-        // 验证失败，不执行后续逻辑
-        // console.error(e);
-      });
-      return;
-    }
-    const submitParams = {
-      ...value,
-      _timestamp: Date.now(),
-      ...pageInfo
+        action.current?.setPageInfo?.({
+          current: 1
+        });
+        onSubmit?.(value);
+      }
     };
-    const omitParams = (0, _util.omit)(beforeSearchSubmit(submitParams), Object.keys(pageInfo));
-    onFormSearchSubmit(omitParams);
-    if (!firstLoad) {
-      // back first page
-      action.current?.setPageInfo?.({
-        current: 1
-      });
-    }
-    // 不是第一次提交就不触发，第一次提交是 js 触发的
-    // 为了解决 https://github.com/ant-design/pro-components/issues/579
-    if (onSubmit && !firstLoad) {
-      onSubmit?.(value);
+    if (form?.ignoreRules === false && firstLoad) {
+      // 首次提交时需要先通过校验再执行
+      formRef?.current?.validateFields().then(runSubmit).catch(() => {});
+      return;
     }
+    runSubmit();
   });
   const onResetHandler = (0, _utils.useRefFunction)(value => {
     const resetLogic = () => {

package/lib/table/components/ListToolBar/HeaderMenu.js

@@ -11,6 +11,7 @@ var _antd = require("antd");
 var _clsx = require("clsx");
 var _react = _interopRequireWildcard(require("react"));
 var _provider = require("../../../provider");
+var _utils = require("../../../utils");
 var _jsxRuntime = require("react/jsx-runtime");
 const HeaderMenu = props => {
   const {
@@ -25,13 +26,11 @@ const HeaderMenu = props => {
     defaultActiveKey
   } = props;
   const [activeKey, setActiveKeyInner] = (0, _util.useControlledState)(propActiveKey || defaultActiveKey, propActiveKey);
-  const setActiveKey = (0, _react.useCallback)(updater => {
-    setActiveKeyInner(prev => {
-      const next = typeof updater === 'function' ? updater(prev) : updater;
-      props.onChange?.(next, prev);
-      return next;
-    });
-  }, [props.onChange]);
+  const setActiveKey = (0, _utils.useRefFunction)(next => {
+    const prev = activeKey;
+    props.onChange?.(next, prev);
+    setActiveKeyInner(next);
+  });
   if (items.length < 1) {
     return null;
   }