@zat-design/sisyphus-react 3.10.3 → 3.10.4

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

@@ -39,3 +39,5 @@ export declare const getPadding: (el: HTMLElement) => {
     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';
@@ -99,4 +100,8 @@ export var getPadding = function getPadding(el) {
     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/index.js

@@ -595,7 +595,7 @@ var RenderField = function RenderField(_ref) {
     }
     FormItem = TargetComponent ? (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       validateFirst: true
-    }, (0, _lodash.omit)(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name', 'onCell', _fieldProps.shouldUpdate ? 'shouldUpdate' : null])), {}, {
+    }, (0, _lodash.omit)(_formItemProps, ['render', 'key', 'width', 'hiddenNames', 'name', 'onCell', _fieldProps.shouldUpdate ? 'shouldUpdate' : null])), {}, {
       className: _className,
       name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
       children: FieldComponent
@@ -605,7 +605,7 @@ var RenderField = function RenderField(_ref) {
     if (type === 'FormList') {
       FormItem = (0, _jsxRuntime.jsx)(_antd.Form.List, (0, _objectSpread2.default)((0, _objectSpread2.default)({
         name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName
-      }, (0, _lodash.omit)(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
+      }, (0, _lodash.omit)(_formItemProps, ['render', 'key', 'width', 'hiddenNames', 'name'])), {}, {
         children: function children(fields, operation, meta) {
           return (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
             otherProps: otherProps,

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"));
@@ -113,7 +115,6 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     selectedRows = state.selectedRows,
     page = state.page;
   var virtualRowName = (0, _tools.getNamePath)((0, _lodash.isArray)(name) ? name : [name], virtualKey);
-  var cacheMap = (0, _react.useRef)({});
   // 样式处理
   var _className = (0, _classnames.default)({
     'pro-edit-table': true,
@@ -163,13 +164,51 @@ 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;
+            if (!pagination) {
+              _context.next = 5;
+              break;
+            }
+            _context.next = 4;
+            return form.validateFields([name], {
+              recursive: true
+            });
+          case 4:
+            setState({
+              page: {
+                pageNum: current,
+                pageSize: pageSize !== null && pageSize !== void 0 ? pageSize : page.pageSize
+              }
+            });
+          case 5:
+            _context.next = 10;
+            break;
+          case 7:
+            _context.prev = 7;
+            _context.t0 = _context["catch"](0);
+            (0, _tools.handleScrollToError)();
+          case 10:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[0, 7]]);
+    }));
+    return function (_x, _x2) {
+      return _ref4.apply(this, arguments);
+    };
+  }(), []);
   var config = (0, _objectSpread2.default)({
     form: form,
     mode: mode,
     isView: isView,
     viewEmpty: viewEmpty,
     disabled: disabled,
-    cacheMap: cacheMap,
     cellNamePath: cellNamePath,
     forceUpdate: forceUpdate,
     insertType: insertType,
@@ -197,7 +236,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 +288,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

@@ -98,7 +98,6 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
     labelRequired?: boolean;
     name?: NamePath;
     names?: NamePath[];
-    cache?: boolean;
     isEditable?: boolean | RequiredFn<T>;
     valueType?: ProFormValueType | ((text?: any, record?: any, options?: OptionsProps) => ProFormValueType);
     tooltip?: string | ({

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/index.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.transformColumns = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -205,13 +204,10 @@ var transformColumns = exports.transformColumns = function transformColumns() {
     virtualKey = config.virtualKey,
     requiredAlign = config.requiredAlign,
     isView = config.isView,
-    cacheMap = config.cacheMap,
     setState = config.setState,
     page = config.page;
   var isCell = mode === 'cell';
   var _columns = (0, _tools.cloneDeepFilterNode)(columns);
-  // 你的函数代码
-  var _cacheMap = (0, _objectSpread2.default)({}, cacheMap.current);
   var pageNum = _utils.tools.calc(page.pageNum, '-', 1);
   var firstIndex = _utils.tools.calc(pageNum, '*', page.pageSize);
   _columns.forEach(function (item, index) {
@@ -284,26 +280,6 @@ var transformColumns = exports.transformColumns = function transformColumns() {
     if (item.className) {
       item.className = (0, _toConsumableArray2.default)(new Set(item.className.split(' '))).join(' ');
     }
-    // 当列表配置cache，接口请求静态数据会做数据缓存
-    if (item.cache) {
-      var _item$fieldProps3;
-      // 初始化加载ProSelect，缓存当前useRequest
-      if (item.type === 'ProSelect') {
-        var _cacheMap$item$dataIn, _cacheMap$item$dataIn2;
-        if (!(_cacheMap === null || _cacheMap === void 0 ? void 0 : (_cacheMap$item$dataIn = _cacheMap[item.dataIndex]) === null || _cacheMap$item$dataIn === void 0 ? void 0 : (_cacheMap$item$dataIn2 = _cacheMap$item$dataIn.dataSource) === null || _cacheMap$item$dataIn2 === void 0 ? void 0 : _cacheMap$item$dataIn2.length)) {
-          var _item$fieldProps, _item$fieldProps2;
-          _cacheMap[item.dataIndex] = {
-            useRequest: (_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 ? void 0 : _item$fieldProps.useRequest,
-            dataSource: [],
-            transformResponse: (_item$fieldProps2 = item.fieldProps) === null || _item$fieldProps2 === void 0 ? void 0 : _item$fieldProps2.transformResponse
-          };
-        } else {
-          var _cacheMap$item$dataIn3;
-          item.fieldProps.dataSource = (_cacheMap$item$dataIn3 = _cacheMap[item.dataIndex]) === null || _cacheMap$item$dataIn3 === void 0 ? void 0 : _cacheMap$item$dataIn3.dataSource;
-        }
-      }
-      (_item$fieldProps3 = item.fieldProps) === null || _item$fieldProps3 === void 0 ? true : delete _item$fieldProps3.useRequest;
-    }
     var _render = function _render(text, record, index) {
       var isEditing = !virtualKey || editingKeys.includes(record.rowKey) || record.addFlag;
       var namePath = (0, _lodash.isArray)(name) ? name : [name];
@@ -394,53 +370,6 @@ var transformColumns = exports.transformColumns = function transformColumns() {
     }));
     actionColumn && _columns.push(actionColumn);
   }
-  // cacheMap 用来存储缓存值，若有值后不再请求
-  if (JSON.stringify(cacheMap.current) === '{}') {
-    Promise.all(Object.entries(_cacheMap).map(/*#__PURE__*/function () {
-      var _ref4 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(item) {
-        var _item, key, value, _ref5, service, option;
-        return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              _item = (0, _slicedToArray2.default)(item, 2), key = _item[0], value = _item[1];
-              _ref5 = (value === null || value === void 0 ? void 0 : value.useRequest) || {}, service = _ref5.service, option = _ref5.option;
-              if (!service) {
-                _context2.next = 8;
-                break;
-              }
-              _context2.t0 = key;
-              _context2.next = 6;
-              return service((0, _objectSpread2.default)({}, option === null || option === void 0 ? void 0 : option.defaultParams));
-            case 6:
-              _context2.t1 = _context2.sent;
-              return _context2.abrupt("return", [_context2.t0, _context2.t1]);
-            case 8:
-              return _context2.abrupt("return", [key, {}]);
-            case 9:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2);
-      }));
-      return function (_x3) {
-        return _ref4.apply(this, arguments);
-      };
-    }())).then(function (res) {
-      res.forEach(function (item) {
-        var _item2 = (0, _slicedToArray2.default)(item, 2),
-          key = _item2[0],
-          value = _item2[1];
-        var transformResponse = _cacheMap[key].transformResponse;
-        _cacheMap[key].dataSource = (transformResponse ? transformResponse(value) : value === null || value === void 0 ? void 0 : value.data) || [];
-      });
-      cacheMap.current = _cacheMap;
-      if (JSON.stringify(cacheMap.current) !== '{}') {
-        setState({
-          forceUpdate: {}
-        });
-      }
-    });
-  }
   // 渲染操作列
   return _columns;
 };

package/lib/ProForm/components/render/ConfirmWrapper.js

@@ -28,25 +28,25 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
   var _ProForm$useFieldProp = _index.default.useFieldProps(),
     form = _ProForm$useFieldProp.form;
   var handleChange = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(value) {
+    var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(value) {
       var _len,
         other,
         _key,
         _value,
         confirmProps,
-        _args = arguments;
-      return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+        _args2 = arguments;
+      return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            for (_len = _args.length, other = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-              other[_key - 1] = _args[_key];
+            for (_len = _args2.length, other = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+              other[_key - 1] = _args2[_key];
             }
             _value = (value === null || value === void 0 ? void 0 : value.target) ? value.target.value : value;
             if (!(0, _lodash.isFunction)(confirm)) {
-              _context.next = 8;
+              _context2.next = 8;
               break;
             }
-            _context.next = 5;
+            _context2.next = 5;
             return confirm(value, form.getFieldsValue(), {
               option: other[0],
               form: form,
@@ -56,13 +56,13 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
               preValue: form.getFieldValue(otherProps.listName || otherProps.name)
             });
           case 5:
-            _context.t0 = _context.sent;
-            _context.next = 9;
+            _context2.t0 = _context2.sent;
+            _context2.next = 9;
             break;
           case 8:
-            _context.t0 = confirm;
+            _context2.t0 = confirm;
           case 9:
-            confirmProps = _context.t0;
+            confirmProps = _context2.t0;
             // 只处理 false, true 和 对象的情况
             if (confirmProps === false) {
               onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
@@ -76,21 +76,41 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
             }
             if ((0, _lodash.isObject)(confirmProps)) {
               _antd.Modal.confirm((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, 'title' in confirmProps || 'content' in confirmProps ? {} : defaultConfirmProps), confirmProps), {}, {
-                onOk: function onOk() {
-                  var _confirmProps$onOk;
-                  for (var _len2 = arguments.length, arg = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-                    arg[_key2] = arguments[_key2];
+                onOk: function () {
+                  var _onOk = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+                    var _confirmProps$onOk;
+                    var _len2,
+                      arg,
+                      _key2,
+                      _args = arguments;
+                    return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
+                      while (1) switch (_context.prev = _context.next) {
+                        case 0:
+                          for (_len2 = _args.length, arg = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+                            arg[_key2] = _args[_key2];
+                          }
+                          _context.next = 3;
+                          return (_confirmProps$onOk = confirmProps.onOk) === null || _confirmProps$onOk === void 0 ? void 0 : _confirmProps$onOk.call.apply(_confirmProps$onOk, [confirmProps].concat(arg));
+                        case 3:
+                          onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
+                        case 4:
+                        case "end":
+                          return _context.stop();
+                      }
+                    }, _callee);
+                  }));
+                  function onOk() {
+                    return _onOk.apply(this, arguments);
                   }
-                  (_confirmProps$onOk = confirmProps.onOk) === null || _confirmProps$onOk === void 0 ? void 0 : _confirmProps$onOk.call.apply(_confirmProps$onOk, [confirmProps].concat(arg));
-                  onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
-                }
+                  return onOk;
+                }()
               }));
             }
           case 13:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee);
+      }, _callee2);
     }));
     return function handleChange(_x) {
       return _ref.apply(this, arguments);