@zat-design/sisyphus-react 3.10.2 → 3.10.3-beta.2

package/es/ProTable/components/RenderColumn/index.js

@@ -1,8 +1,8 @@
 import "antd/es/space/style";
 import _Space from "antd/es/space";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import "antd/es/typography/style";
 import _Typography from "antd/es/typography";
@@ -12,6 +12,7 @@ import { isBoolean } from 'lodash';
 import classNames from 'classnames';
 import { CheckOutlined } from '@ant-design/icons';
 import { ReactSVG } from 'react-svg';
+import { getPadding } from '../../utils';
 import { isEmpty } from '../../../utils';
 import copySvg from '../../../assets/copy.svg';
 var Paragraph = _Typography.Paragraph,
@@ -41,6 +42,32 @@ var RenderColumn = function RenderColumn(props) {
     'varied-cell': props === null || props === void 0 ? void 0 : props.isChanged,
     'add-cell': props === null || props === void 0 ? void 0 : props.isAddCell
   });
+  var checkEllipsis = function checkEllipsis(box) {
+    var range = document.createRange();
+    range.setStart(box, 0);
+    range.setEnd(box, box.childNodes.length);
+    var rangeWidth = range.getBoundingClientRect().width;
+    var _getPadding = getPadding(box),
+      pLeft = _getPadding.pLeft,
+      pRight = _getPadding.pRight,
+      pTop = _getPadding.pTop,
+      pBottom = _getPadding.pBottom;
+    var horizontalPadding = pLeft + pRight;
+    if (rangeWidth + horizontalPadding > box.clientWidth) {
+      return true;
+    }
+    return false;
+  };
+  var handleMouseOver = function handleMouseOver(e) {
+    setState({
+      tooltip: checkEllipsis(e.target)
+    });
+  };
+  var tooltipProps = _objectSpread({
+    getPopupContainer: function getPopupContainer(triggerNode) {
+      return triggerNode.parentNode;
+    }
+  }, toolTipProps);
   // 比对场景走的逻辑
   if (!isInNewRowFlag && isBoolean(props === null || props === void 0 ? void 0 : props.isChanged)) {
     var renderNode = value ? node : '-';
@@ -58,11 +85,36 @@ var RenderColumn = function RenderColumn(props) {
       }) : _jsx("div", {
         style: {
           minWidth: minWidth,
-          width: width
+          width: width,
+          overflow: 'hidden',
+          textOverflow: 'ellipsis',
+          whiteSpace: 'nowrap'
         },
         children: ellipsis ? currentValue : renderNode
       });
       if ((props === null || props === void 0 ? void 0 : props.isChanged) === false) {
+        if (ellipsis) {
+          return _jsx(_Tooltip, _objectSpread(_objectSpread({
+            title: currentValue,
+            onOpenChange: function onOpenChange(open) {
+              setState({
+                tooltip: false
+              });
+            },
+            open: tooltip
+          }, tooltipProps), {}, {
+            children: _jsx(Text, {
+              style: {
+                width: width,
+                minWidth: minWidth
+              },
+              ellipsis: true,
+              onMouseOver: handleMouseOver,
+              onFocus: handleMouseOver,
+              children: renderNode
+            })
+          }));
+        }
         return renderNode;
       }
       if (Array.isArray(originalValue)) {
@@ -86,7 +138,7 @@ var RenderColumn = function RenderColumn(props) {
         title: _jsx(_Space, {
           direction: "vertical",
           className: "changed-tooltip",
-          children: (props === null || props === void 0 ? void 0 : props.isChanged) ? _jsxs(_Fragment, {
+          children: (props === null || props === void 0 ? void 0 : props.isChanged) && !(props === null || props === void 0 ? void 0 : props.isAddCell) ? _jsxs(_Fragment, {
             children: [_jsxs(_Space, {
               align: "start",
               className: "original-value-container",
@@ -138,45 +190,6 @@ var RenderColumn = function RenderColumn(props) {
     });
   }
   if (ellipsis) {
-    var getPadding = function getPadding(el) {
-      var style = window.getComputedStyle(el, null);
-      var paddingLeft = Number.parseInt(style.paddingLeft, 10) || 0;
-      var paddingRight = Number.parseInt(style.paddingRight, 10) || 0;
-      var paddingTop = Number.parseInt(style.paddingTop, 10) || 0;
-      var paddingBottom = Number.parseInt(style.paddingBottom, 10) || 0;
-      return {
-        pLeft: paddingLeft,
-        pRight: paddingRight,
-        pTop: paddingTop,
-        pBottom: paddingBottom
-      };
-    };
-    var checkEllipsis = function checkEllipsis(box) {
-      var range = document.createRange();
-      range.setStart(box, 0);
-      range.setEnd(box, box.childNodes.length);
-      var rangeWidth = range.getBoundingClientRect().width;
-      var _getPadding = getPadding(box),
-        pLeft = _getPadding.pLeft,
-        pRight = _getPadding.pRight,
-        pTop = _getPadding.pTop,
-        pBottom = _getPadding.pBottom;
-      var horizontalPadding = pLeft + pRight;
-      if (rangeWidth + horizontalPadding > box.clientWidth) {
-        return true;
-      }
-      return false;
-    };
-    var handleMouseOver = function handleMouseOver(e) {
-      setState({
-        tooltip: checkEllipsis(e.target)
-      });
-    };
-    var tooltipProps = _objectSpread({
-      getPopupContainer: function getPopupContainer(triggerNode) {
-        return triggerNode.parentNode;
-      }
-    }, toolTipProps);
     if (!value) {
       return _jsx("div", {
         style: {

package/es/ProTable/hooks/useAntdTable.js

@@ -7,11 +7,11 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["page", "filters", "sorter"];
-import { useCallback, useMemo, useState } from 'react';
-import { useRequest, useSetState, useDeepCompareEffect } from 'ahooks';
+import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useRequest, useSetState, useDeepCompareEffect, usePrevious } from 'ahooks';
 import { pickBy, isObject, merge, set, isEqual } from 'lodash';
 import { defaultPage } from '../index';
-import { isListResult, removeEmptyKeys } from '../utils';
+import { isListResult, removeEmptyKeys, isNonEmptyObject } from '../utils';
 import locale, { formatMessage } from '../../locale';
 var useDefaultOptions = function useDefaultOptions(options) {
   var _useState = useState((options === null || options === void 0 ? void 0 : options.page) || defaultPage),
@@ -24,6 +24,7 @@ var useDefaultOptions = function useDefaultOptions(options) {
     onPageChange: (options === null || options === void 0 ? void 0 : options.onPageChange) || onPageChange
   });
 };
+var previousSearchValues = null;
 function useAntdTable(service, options, useRequestOptions) {
   var _locale$ProTable2, _locale$ProTable3, _locale$ProTable4, _locale$ProTable5;
   var _useSetState = useSetState({
@@ -32,7 +33,10 @@ function useAntdTable(service, options, useRequestOptions) {
       selectedRecords: [],
       selectedRowKeys: [],
       searchValues: undefined,
-      extraFilter: undefined,
+      extraFilter: {
+        filters: undefined,
+        sorter: undefined
+      },
       allSelected: false
     }),
     _useSetState2 = _slicedToArray(_useSetState, 2),
@@ -63,10 +67,10 @@ function useAntdTable(service, options, useRequestOptions) {
     transformResponse = _useDefaultOptions.transformResponse,
     disabled = _useDefaultOptions.disabled;
   var _ref = useRequestOptions || {},
-    defaultParams = _ref.defaultParams,
-    manual = _ref.manual;
+    defaultParams = _ref.defaultParams;
   var defaultParam = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
   var initPage = (options === null || options === void 0 ? void 0 : options.page) || defaultPage;
+  var previousPage = usePrevious(page || defaultPage);
   var getTransformParams = useCallback(function (params) {
     var _pickBy;
     var realParams = _objectSpread(_objectSpread(_objectSpread({}, defaultParam), extraParams), params);
@@ -105,9 +109,17 @@ function useAntdTable(service, options, useRequestOptions) {
       page: page
     }, newQueryBean));
   }, [page, searchValues, extraFilter]);
+  var curService = useMemo(function () {
+    return service.toString();
+  }, [service]);
+  var curExtraParams = useMemo(function () {
+    return extraParams ? JSON.stringify(extraParams) : extraParams;
+  }, [extraParams]);
   // 调接口
-  var result = useRequest(service, _objectSpread(_objectSpread({}, useRequestOptions), {}, {
-    debounceWait: 50,
+  var result = useRequest(service, _objectSpread(_objectSpread({
+    debounceWait: 300,
+    refreshDeps: [curService, curExtraParams]
+  }, useRequestOptions), {}, {
     defaultParams: [getTransformParams()],
     onSuccess: function onSuccess(res, params) {
       var transformResult = transformResponse ? transformResponse(res) : res || {};
@@ -131,9 +143,6 @@ function useAntdTable(service, options, useRequestOptions) {
   }));
   var run = result.run,
     refreshAsync = result.refreshAsync;
-  var curService = useMemo(function () {
-    return service.toString();
-  }, [service]);
   // service变化时触发 (禁止掉防止service变更时导致的死循环)
   var clearSelected = useCallback(function () {
     setState({
@@ -172,6 +181,12 @@ function useAntdTable(service, options, useRequestOptions) {
       setState(nextObject);
     }
   }, [allSelected, data]);
+  // 释放
+  useEffect(function () {
+    return function () {
+      previousSearchValues = null;
+    };
+  }, []);
   // 分页变更
   var handlePageChange = useCallback(function (current, pageSize) {
     var page = {
@@ -213,26 +228,32 @@ function useAntdTable(service, options, useRequestOptions) {
       filters: filters,
       sorter: sorter
     })));
-  }, [allSelected, searchValues, run, getTransformParams]);
+  }, [allSelected, searchValues, getTransformParams]);
   var onSearch = useCallback(function (values) {
     var newPage = {
       pageNum: 1,
       pageSize: page.pageSize
     };
     var _values = removeEmptyKeys(values);
-    onPageChange(newPage);
-    setState({
-      searchValues: _values,
-      allSelected: false,
-      selectedRecords: [],
-      selectedRowKeys: []
-    });
+    // 如果 previousPage 存在且与 page 不相等，则触发页面变化
+    if (previousPage && !isEqual(previousPage, page)) {
+      onPageChange(newPage);
+    }
+    // 减少查询按钮的渲染，只有需要重置值时才需要调用
+    if ((selectedRecords === null || selectedRecords === void 0 ? void 0 : selectedRecords.length) || isNonEmptyObject(_values) && !isEqual(previousSearchValues, _values)) {
+      previousSearchValues = _values;
+      setState({
+        searchValues: _values,
+        allSelected: false,
+        selectedRecords: [],
+        selectedRowKeys: []
+      });
+    }
     run(getTransformParams(_objectSpread(_objectSpread({
       page: newPage
     }, extraFilter), _values)));
-  }, [extraFilter, page.pageSize, run, getTransformParams]);
-  var resetParams = useCallback(function () {
-    var page = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initPage;
+  }, [extraFilter, page.pageSize, previousPage, getTransformParams]);
+  var resetParams = useCallback(function (page) {
     setState({
       searchValues: undefined,
       allSelected: false,
@@ -302,28 +323,6 @@ function useAntdTable(service, options, useRequestOptions) {
       return _ref4.apply(this, arguments);
     };
   }();
-  useDeepCompareEffect(function () {
-    if (!manual && curService) {
-      // service改变时重新请求
-      resetParams();
-      onPageChange(initPage);
-      run(getTransformParams());
-    }
-  }, [curService]);
-  useDeepCompareEffect(function () {
-    // extraParams改变时重新请求
-    if (!manual && extraParams) {
-      var newPage = {
-        pageNum: 1,
-        pageSize: page.pageSize
-      };
-      onPageChange(newPage);
-      resetParams(newPage);
-      run(getTransformParams({
-        page: newPage
-      }));
-    }
-  }, [extraParams]);
   var _rowSelection = {
     fixed: true,
     type: rowSelectType,
@@ -449,8 +448,8 @@ function useAntdTable(service, options, useRequestOptions) {
       });
     }
   }
-  var selectedTip = allSelected || selectedRowKeys.length ? formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProTable5 = locale.ProTable) === null || _locale$ProTable5 === void 0 ? void 0 : _locale$ProTable5.selectAll, {
-    selectedNum: allSelected ? total : selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length
+  var selectedTip = allSelected && selectedRowKeys.length ? formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProTable5 = locale.ProTable) === null || _locale$ProTable5 === void 0 ? void 0 : _locale$ProTable5.selectAll, {
+    total: allSelected ? total : selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length
   }) : null;
   var pagination = {
     current: page.pageNum,

package/es/ProTable/style/index.less

@@ -585,7 +585,9 @@
 
   .@{ant-prefix}-table-summary {
     background-color: var(--zaui-table-header-bg, #f2f3f5);
-
+    td{
+      padding:calc(4px + var(--zaui-size)* 8px);
+    }
     .@{ant-prefix}-table-cell {
       font-weight: 500;
       background-color: var(--zaui-table-header-bg, #f2f3f5);

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

@@ -33,3 +33,11 @@ export declare const getRowKey: (rowKey: any, record: any) => any;
 export declare const removeEmptyKeys: (obj: any) => {
     [k: string]: unknown;
 };
+export declare const getPadding: (el: HTMLElement) => {
+    pLeft: number;
+    pRight: number;
+    pTop: number;
+    pBottom: number;
+};
+/** 判断是有值的对象 */
+export declare const isNonEmptyObject: (obj: any) => obj is Record<string, any>;

package/es/ProTable/utils/index.js

@@ -1,3 +1,4 @@
+import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { get, isEqual } from 'lodash';
 import { validate } from '@zat-design/utils';
@@ -85,4 +86,22 @@ export var removeEmptyKeys = function removeEmptyKeys(obj) {
   });
   // 使用 Object.fromEntries() 将过滤后的键值对数组转换回对象
   return Object.fromEntries(filteredEntries);
+};
+/* 获取边距 */
+export var getPadding = function getPadding(el) {
+  var style = window.getComputedStyle(el, null);
+  var paddingLeft = Number.parseInt(style.paddingLeft, 10) || 0;
+  var paddingRight = Number.parseInt(style.paddingRight, 10) || 0;
+  var paddingTop = Number.parseInt(style.paddingTop, 10) || 0;
+  var paddingBottom = Number.parseInt(style.paddingBottom, 10) || 0;
+  return {
+    pLeft: paddingLeft,
+    pRight: paddingRight,
+    pTop: paddingTop,
+    pBottom: paddingBottom
+  };
+};
+/** 判断是有值的对象 */
+export var isNonEmptyObject = function isNonEmptyObject(obj) {
+  return obj !== null && _typeof(obj) === 'object' && !Array.isArray(obj) && Object.keys(obj).length > 0;
 };

package/lib/ProEditTable/components/RenderField/ListChangedWrapper.d.ts

@@ -10,7 +10,7 @@ interface Props {
     namesStr?: NamePath;
     originalValues?: any;
     form: FormInstance;
-    equalWith?: DiffOriginalParams['equalWith'];
+    onDiff?: DiffOriginalParams['onDiff'];
     [name: string]: any;
 }
 declare const ListChangedWrapper: React.FC<Props>;

package/lib/ProEditTable/components/RenderField/ListChangedWrapper.js

@@ -17,7 +17,7 @@ var _lodash = require("lodash");
 var _diffOriginal = require("../../utils/diffOriginal");
 var _ProConfigProvider = require("../../../ProConfigProvider");
 var _utils = require("../../../utils");
-var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "equalWith", "rowKeyPath", "children", "type", "normalize", "getValueProps", "valuePropName", "viewRender", "diffConfig", "index"];
+var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "onDiff", "rowKeyPath", "children", "type", "normalize", "getValueProps", "valuePropName", "viewRender", "diffConfig", "index"];
 var toNamePath = function toNamePath(name) {
   if (Array.isArray(name)) {
     return name;
@@ -89,7 +89,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     originalNames = _props$originalNames === void 0 ? names : _props$originalNames,
     originalValues = props.originalValues,
     form = props.form,
-    equalWith = props.equalWith,
+    onDiff = props.onDiff,
     rowKeyPath = props.rowKeyPath,
     children = props.children,
     type = props.type,
@@ -120,7 +120,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     form: form
   });
   var originalValue = isWatch ? originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originalValue : undefined;
-  var noChange = !equalWith && (!originalValues || isDiffAll ? false : (0, _utils.isEmpty)(originalValue));
+  var noChange = !onDiff && (!originalValues || isDiffAll ? false : (0, _utils.isEmpty)(originalValue));
   var diffType = (0, _react.useMemo)(function () {
     if (!isWatch || noChange) return 'same';
     var _value = normalize ? normalize(props[valuePropName], undefined, undefined, true) // true 代表是值比对时的调用
@@ -135,7 +135,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
       value: _value,
       originalValue: _originalValue,
       form: form,
-      equalWith: equalWith,
+      onDiff: onDiff,
       originRecord: originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originRecord,
       record: originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.record,
       index: index

package/lib/ProEditTable/components/RenderField/index.js

@@ -575,9 +575,10 @@ var RenderField = function RenderField(_ref) {
         originalNames: originalNames,
         originalValues: originalValues,
         form: form,
-        equalWith: onDiff,
+        onDiff: onDiff,
         type: type,
         onChange: _onChange,
+        onBlur: _onblur,
         valuePropName: _formItemProps.valuePropName,
         normalize: _formItemProps.normalize,
         getValueProps: _formItemProps.getValueProps,

package/lib/ProEditTable/index.js

@@ -8,6 +8,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
@@ -163,6 +165,40 @@ var ProEditTable = function ProEditTable(_ref, ref) {
       return getRowKey(item) === getRowKey(record);
     }));
   };
+  // 分页变更
+  var handlePageChange = (0, _react.useCallback)(/*#__PURE__*/function () {
+    var _ref4 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(current, pageSize) {
+      return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.prev = 0;
+            _context.next = 3;
+            return form.validateFields([name], {
+              recursive: true
+            });
+          case 3:
+            setState({
+              page: {
+                pageNum: current,
+                pageSize: pageSize !== null && pageSize !== void 0 ? pageSize : page.pageSize
+              }
+            });
+            _context.next = 9;
+            break;
+          case 6:
+            _context.prev = 6;
+            _context.t0 = _context["catch"](0);
+            (0, _tools.handleScrollToError)();
+          case 9:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[0, 6]]);
+    }));
+    return function (_x, _x2) {
+      return _ref4.apply(this, arguments);
+    };
+  }(), []);
   var config = (0, _objectSpread2.default)({
     form: form,
     mode: mode,
@@ -197,7 +233,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     rowDisabled: rowDisabled,
     actionDirection: actionDirection,
     diffConfig: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, resetProps === null || resetProps === void 0 ? void 0 : (_resetProps$otherProp = resetProps.otherProps) === null || _resetProps$otherProp === void 0 ? void 0 : _resetProps$otherProp.diffConfig), diffConfig),
-    getIsNew: getIsNew
+    getIsNew: getIsNew,
+    handlePageChange: handlePageChange
   }, resetProps);
   // 编辑行设置下样式
   var _rowClassName = function _rowClassName(record) {
@@ -248,15 +285,6 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     },
     hideSelectAll: isHideCheckBox
   }, rowSelection);
-  // 分页变更
-  var handlePageChange = (0, _react.useCallback)(function (current, pageSize) {
-    setState({
-      page: {
-        pageNum: current,
-        pageSize: pageSize
-      }
-    });
-  }, []);
   // 空列表状态
   var empty = function empty() {
     var _toolbarProps$filter;

package/lib/ProEditTable/propsType.d.ts

@@ -110,7 +110,7 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
     rules?: ProRule[] | RulesFn<T>;
     confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps | void>;
     dependencies?: NamePath[];
-    onDiff?: DiffOriginalParams['equalWith'];
+    onDiff?: DiffOriginalParams['onDiff'];
     [key: string]: any;
 }
 export type ProEditTableColumnsProps<K = any> = ProColumnsProps & ColumnPropsMap<K, 'ProEditTable'>;

package/lib/ProEditTable/style/index.less

@@ -151,7 +151,9 @@
         background-color: var(--zaui-table-header-bg, #f2f3f5);
         color           : var(--zaui-text, #343434);
         font-weight     : 600;
-
+        td{
+          padding: 8px 16px;
+        }
         .@{ant-prefix}-table-cell-fix-left,
         .@{ant-prefix}-table-cell-fix-right {
           background-color: var(--zaui-table-header-bg, #f2f3f5);

package/lib/ProEditTable/utils/config.d.ts

@@ -20,6 +20,6 @@ export declare const actions: {
     save: ({ record, editingKeys, setState, form, rowName, virtualRowName, result }: any) => Promise<void>;
     cancel: ({ name, record, editingKeys, setState, form, virtualRowName, virtualKey }: any) => void;
     delete: ({ name, record, editingKeys, setState, form, virtualKey, onlyOneLineMsg }: any) => boolean;
-    add: ({ result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, prefixCls, }: any) => Promise<boolean>;
+    add: ({ result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, prefixCls, page, handlePageChange, }: any) => Promise<boolean>;
     mulDelete: ({ form, name, virtualKey, setState, selectedRowKeys, editingKeys }: any) => void;
 };

package/lib/ProEditTable/utils/config.js

@@ -12,6 +12,7 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _icons = require("@ant-design/icons");
+var _utils = require("@zat-design/utils");
 var _antd = require("antd");
 var _lodash = require("lodash");
 var _tools = require("./tools");
@@ -174,11 +175,11 @@ var actions = exports.actions = {
   add: function () {
     var _add = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(_ref5) {
       var _tableRef$current$que, _tableRef$current$que2;
-      var result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, _ref5$prefixCls, prefixCls, nextData, rowKey, addData, nextEditingKeys;
+      var result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, _ref5$prefixCls, prefixCls, page, handlePageChange, nextData, rowKey, addData, nextPageNum, nextEditingKeys;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            result = _ref5.result, insertType = _ref5.insertType, editingKeys = _ref5.editingKeys, setState = _ref5.setState, form = _ref5.form, name = _ref5.name, virtualName = _ref5.virtualName, virtualKey = _ref5.virtualKey, onlyOneLineMsg = _ref5.onlyOneLineMsg, tableRef = _ref5.tableRef, _ref5$prefixCls = _ref5.prefixCls, prefixCls = _ref5$prefixCls === void 0 ? 'ant' : _ref5$prefixCls;
+            result = _ref5.result, insertType = _ref5.insertType, editingKeys = _ref5.editingKeys, setState = _ref5.setState, form = _ref5.form, name = _ref5.name, virtualName = _ref5.virtualName, virtualKey = _ref5.virtualKey, onlyOneLineMsg = _ref5.onlyOneLineMsg, tableRef = _ref5.tableRef, _ref5$prefixCls = _ref5.prefixCls, prefixCls = _ref5$prefixCls === void 0 ? 'ant' : _ref5$prefixCls, page = _ref5.page, handlePageChange = _ref5.handlePageChange;
             nextData = (0, _toConsumableArray2.default)(form.getFieldValue(name) || []); // 单行编辑时，需要先保存，才能进行下面的编辑
             if (!(virtualKey && editingKeys.length >= 1)) {
               _context2.next = 5;
@@ -195,7 +196,14 @@ var actions = exports.actions = {
               addData.addFlag = true;
               addData.isEditing = true;
             }
-            insertType === 'before' ? nextData.unshift(addData) : nextData.push(addData);
+            if (insertType === 'before') {
+              nextData.unshift(addData);
+              handlePageChange(1);
+            } else {
+              nextData.push(addData);
+              nextPageNum = Math.ceil(_utils.tools.calc(nextData.length, '/', page.pageSize));
+              handlePageChange(nextPageNum);
+            }
             // 当单选情况下，存储正在编辑值
             if (virtualKey) {
               nextEditingKeys = (0, _toConsumableArray2.default)(editingKeys); // 开启编辑状态

package/lib/ProEditTable/utils/diffOriginal.d.ts

@@ -4,7 +4,7 @@ export interface DiffOriginalParams {
     originalValue: any;
     value: any;
     form: FormInstance;
-    equalWith?: ({ originValue, originRecord, value, record, index, }: {
+    onDiff?: ({ originValue, originRecord, value, record, index, }: {
         originValue: any;
         originRecord: any;
         value: any;

package/lib/ProEditTable/utils/diffOriginal.js

@@ -37,13 +37,13 @@ var filterObject = function filterObject(data) {
 var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
   var originalValue = params.originalValue,
     value = params.value,
-    equalWith = params.equalWith,
+    onDiff = params.onDiff,
     originRecord = params.originRecord,
     record = params.record,
     index = params.index;
   // 支持传入自定义比较事件
-  if ((0, _lodash.isFunction)(equalWith)) {
-    var diffRes = equalWith({
+  if ((0, _lodash.isFunction)(onDiff)) {
+    var diffRes = onDiff({
       originValue: originalValue,
       originRecord: originRecord,
       value: value,

package/lib/ProForm/components/combination/ProModalSelect/index.js

@@ -599,7 +599,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       });
     }
   });
-  (0, _ahooks.useDebounceEffect)(function () {
+  (0, _react.useEffect)(function () {
     if (onOff && !visible) {
       var _useRequest$options6;
       if ((useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options6 = useRequest.options) === null || _useRequest$options6 === void 0 ? void 0 : _useRequest$options6.manual) !== true) {

package/lib/ProForm/components/render/ChangedWrapper.d.ts

@@ -9,7 +9,7 @@ interface Props {
     namesStr?: string;
     diffConfig?: DiffConfigProps;
     form: FormInstance;
-    equalWith?: DiffOriginalParams['equalWith'];
+    onDiff?: DiffOriginalParams['onDiff'];
     valuePropName?: string;
     [name: string]: any;
 }