@zat-design/sisyphus-react 3.5.3 → 3.5.4-beta.2

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

@@ -530,7 +530,7 @@ var RenderField = function RenderField(_ref) {
   }
   Object.assign(_formItemProps, _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultTransform()), valueTypeTransform()), namesTransform()), isTrim(type, trim, useProConfig())));
   // 编辑&保存模式，在查看状态下移除表单的rules不做校验
-  if (!isEditing) {
+  if (isView) {
     delete _formItemProps.rules;
   }
   var _className = classNames(_defineProperty(_defineProperty({}, className, className), 'pro-form-item-changed', changed));

package/es/ProEditTable/index.js

@@ -22,7 +22,7 @@ import ProForm from '../ProForm';
 import Empty from '../assets/empty.png';
 import locale, { formatMessage } from '../locale';
 var ProEditTable = function ProEditTable(_ref, ref) {
-  var _resetProps$id, _resetProps$id$split, _themeConfig$data2, _value$2;
+  var _resetProps$id, _resetProps$id$split, _themeConfig$data2, _value$;
   var value = _ref.value,
     onChange = _ref.onChange,
     onDrag = _ref.onDrag,
@@ -279,9 +279,11 @@ var ProEditTable = function ProEditTable(_ref, ref) {
   //   },
   // );
   useEffect(function () {
-    var _value$;
+    var isAllHasKey = value.every(function (item) {
+      return item.rowKey;
+    });
     // 初始化默认生成row-key
-    if ((value === null || value === void 0 ? void 0 : value.length) && !(value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey)) {
+    if ((value === null || value === void 0 ? void 0 : value.length) && !isAllHasKey) {
       var _originalArr$forEach;
       var nextValues = value === null || value === void 0 ? void 0 : value.map(function (item) {
         return _objectSpread(_objectSpread({}, item), {}, {
@@ -328,7 +330,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
         }) : null, _jsx(_Table, _objectSpread(_objectSpread({
           ref: tableRef,
           className: _className,
-          dataSource: (value === null || value === void 0 ? void 0 : (_value$2 = value[0]) === null || _value$2 === void 0 ? void 0 : _value$2.rowKey) ? value : undefined,
+          dataSource: (value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey) ? value : undefined,
           columns: _columns,
           rowSelection: renderRowSelection(),
           rowClassName: _rowClassName,

package/es/ProForm/components/Container.js

@@ -2,18 +2,19 @@ import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
 import { jsx as _jsx } from "react/jsx-runtime";
 import classNames from 'classnames';
-import { isNullArray } from '../utils';
+import { isEmptyArray } from '../utils';
 var Container = function Container(props) {
   var children = props.children,
     tooltip = props.tooltip,
     nowrap = props.nowrap,
     viewEmpty = props.viewEmpty;
-  var emptyChildren = isNullArray(children);
+  // 值为false但不为0, 或者值为空数组
+  var nullValue = children !== 0 && !children || isEmptyArray(children);
   var _className = classNames({
     'pro-form-view-container': true,
     'pro-form-view-container_nowrap': nowrap !== null && nowrap !== void 0 ? nowrap : tooltip
   });
-  if (tooltip && !emptyChildren) {
+  if (tooltip && !nullValue) {
     return _jsx(_Tooltip, {
       placement: "topLeft",
       title: children,
@@ -25,7 +26,7 @@ var Container = function Container(props) {
   }
   return _jsx("div", {
     className: _className,
-    children: emptyChildren ? viewEmpty : children
+    children: nullValue ? viewEmpty : children
   });
 };
 export default Container;

package/es/ProForm/components/base/DatePicker/index.js

@@ -92,6 +92,10 @@ var DatePicker = function DatePicker(props) {
   if (isObject(_rest.showTime)) {
     _rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
   }
+  // 传进来showTime权重最高
+  if (isBoolean(rest.showTime)) {
+    _rest.showTime = rest.showTime;
+  }
   return _jsx(_DatePicker, _objectSpread(_objectSpread(_objectSpread({}, initialConfig), {}, {
     format: _format
   }, _rest), {}, {

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

@@ -137,7 +137,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         var _res$data;
         var list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list : res === null || res === void 0 ? void 0 : res.data;
         setState({
-          options: list
+          options: transformResponse ? transformResponse(res === null || res === void 0 ? void 0 : res.data) : list
         });
       }
     })),
@@ -301,7 +301,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             _context2.prev = 0;
-            if (selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length) {
+            if (!(!(selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length) || !(selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.length))) {
               _context2.next = 4;
               break;
             }
@@ -434,7 +434,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   // 初始化回显，当传入initParams时，前端用来回险
   var getInitValues = /*#__PURE__*/function () {
     var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-      var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _list, list, _res$data2, _data, nextSelectRowKeys;
+      var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _res$data2, _list, list, _data, nextSelectRowKeys;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -459,11 +459,9 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           case 8:
             res = _context4.sent;
             if (res === null || res === void 0 ? void 0 : res.data) {
-              list = [];
+              list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.list : res === null || res === void 0 ? void 0 : res.data;
               if (transformResponse) {
                 list = transformResponse(res === null || res === void 0 ? void 0 : res.data);
-              } else {
-                list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.list : res === null || res === void 0 ? void 0 : res.data;
               }
               _data = isMultiple ? list : (_list = list) === null || _list === void 0 ? void 0 : _list[0];
               if (_data) {
@@ -500,7 +498,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   var getDefaultOneValues = /*#__PURE__*/function () {
     var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
       var _useRequest$options4, _useRequest$options5;
-      var queryBean, page, params, res, _list2, list, _res$data3, _data2, nextSelectRowKeys;
+      var queryBean, page, params, res, _res$data3, _list2, list, _data2, nextSelectRowKeys;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
@@ -518,11 +516,9 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           case 6:
             res = _context5.sent;
             if (res === null || res === void 0 ? void 0 : res.data) {
-              list = [];
+              list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.list : res === null || res === void 0 ? void 0 : res.data;
               if (transformResponse) {
                 list = transformResponse(res === null || res === void 0 ? void 0 : res.data);
-              } else {
-                list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.list : res === null || res === void 0 ? void 0 : res.data;
               }
               _data2 = isMultiple ? list : (_list2 = list) === null || _list2 === void 0 ? void 0 : _list2[0];
               nextSelectRowKeys = isMultiple ? value : [value];
@@ -604,7 +600,13 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           nextState.selectedRows = value;
         }
       } else if (value) {
-        nextState.selectedRowKeys = [value];
+        var _list$filter;
+        var nextSelectedRowKeys = isMultiple ? value : [value];
+        nextState.selectedRowKeys = nextSelectedRowKeys;
+        var list = options !== null && options !== void 0 ? options : data;
+        nextState.selectedRows = list === null || list === void 0 ? void 0 : (_list$filter = list.filter) === null || _list$filter === void 0 ? void 0 : _list$filter.call(list, function (item) {
+          return nextSelectedRowKeys.includes(item[valueKey]);
+        });
       }
       setState(nextState);
     }
@@ -625,7 +627,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
             pageSize: 50,
             queryBean: _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options7 = useRequest.options) === null || _useRequest$options7 === void 0 ? void 0 : _useRequest$options7.defaultParams), initParams)
           } : _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options8 = useRequest.options) === null || _useRequest$options8 === void 0 ? void 0 : _useRequest$options8.defaultParams), initParams);
-          run(params);
+          var nextParams = transformParams ? transformParams(params) : params;
+          run(nextParams);
           setState({
             isInit: false
           });
@@ -679,6 +682,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       labelInValue: labelInValue,
       dataSource: options,
       scrollFollowParent: false,
+      mode: isMultiple ? 'multiple' : undefined,
       onFocus: function onFocus() {
         if (useRequest) {
           var _useRequest$options9;
@@ -688,7 +692,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
             pageSize: 50,
             queryBean: queryBean
           } : queryBean;
-          run(params);
+          var nextParams = transformParams ? transformParams(params) : params;
+          run(nextParams);
           setState({
             isInit: false
           });
@@ -702,7 +707,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           pageSize: 50,
           queryBean: queryBean
         } : queryBean;
-        run(params);
+        var nextParams = transformParams ? transformParams(params) : params;
+        run(nextParams);
       }, 2000),
       style: {
         width: isView || disabled ? '100%' : 'calc(100% - 30px)'

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

@@ -43,6 +43,12 @@ export declare const isNotFullArray: (arr: any, length: any, required: any) => b
  * @returns boole
  */
 export declare const isNullArray: (arr: any) => boolean;
+/**
+ * 判断数组中值是否全部为空  如果值不是数组返回false
+ * @param arr 值
+ * @returns boole
+ */
+export declare const isEmptyArray: (arr: any) => boolean;
 export declare function toArray<T>(value?: T | T[] | null): T[];
 /**
  * names值合并

package/es/ProForm/utils/index.js

@@ -218,6 +218,26 @@ export var isNullArray = function isNullArray(arr) {
     return false;
   });
 };
+/**
+ * 判断数组中值是否全部为空  如果值不是数组返回false
+ * @param arr 值
+ * @returns boole
+ */
+export var isEmptyArray = function isEmptyArray(arr) {
+  if (!Array.isArray(arr)) return false;
+  return arr.every(function (item) {
+    if (item === undefined || item === null) {
+      return true;
+    }
+    if (typeof item === 'string' && item.trim().length === 0) {
+      return true;
+    }
+    if (Array.isArray(item) && item.length === 0) {
+      return true;
+    }
+    return false;
+  });
+};
 export function toArray(value) {
   if (value === undefined || value === null) {
     return [];

package/es/ProForm/utils/useShouldUpdate.js

@@ -1,4 +1,3 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { useRef, useState } from 'react';
 import { isFunction, isEqualWith } from 'lodash';
@@ -165,9 +164,10 @@ var useShouldUpdate = function useShouldUpdate(props) {
           clearInterval(timerRef.current);
           timerRef.current = setTimeout(function () {
             if (Array.isArray(names)) {
-              form.resetFields(_toConsumableArray(names));
+              form.resetFields(names);
             } else {
-              form.resetFields([formItemProps.name]);
+              var clearName = formItemProps.namePath ? formItemProps.namePath.slice(0, -1).concat(formItemProps.name) : formItemProps.name;
+              form.resetFields([clearName]);
             }
           }, 200);
         } else {

package/es/ProStep/components/Listener/index.js

@@ -11,8 +11,11 @@ export default (function (_ref) {
     delayTime = _ref.delayTime,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useStep = useStep(),
-    notify = _useStep.notify;
+    notify = _useStep.notify,
+    loading = _useStep.loading,
+    setLoading = _useStep.setLoading;
   return /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, props), {}, {
+    loading: loading || (props === null || props === void 0 ? void 0 : props.loading),
     onClick: throttle( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var values;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -24,6 +27,7 @@ export default (function (_ref) {
           case 3:
             values = _context.sent;
             setTimeout(function () {
+              setLoading(false);
               var localData = localStorage.getItem('cache-pro-step');
               if (localData !== 'false') {
                 var _children$props, _children$props$onCli;

package/es/ProStep/index.js

@@ -1,12 +1,12 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["children"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { createContext, useContext, useEffect, useMemo, useState } from 'react';
+import { createContext, useContext, useEffect, useMemo, useRef, useState } from 'react';
 import { useEventEmitter, useSetState, useLocalStorageState, useDeepCompareEffect } from 'ahooks';
 import { handleScroll } from './utils';
 import Step from './components/Step';
@@ -26,14 +26,15 @@ var ProStep = function ProStep(_ref) {
     errorCollection = _useSetState2[0],
     setErrorCollection = _useSetState2[1];
   // 注册子节点id与title映射的集合
-  var _useSetState3 = useSetState({}),
-    _useSetState4 = _slicedToArray(_useSetState3, 2),
-    registerMap = _useSetState4[0],
-    setRegisterMap = _useSetState4[1];
+  var registerMap = useRef({});
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     anchorIds = _useState2[0],
     setAnchorIds = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    loading = _useState4[0],
+    setLoading = _useState4[1];
   var _useLocalStorageState = useLocalStorageState('cache-pro-step'),
     _useLocalStorageState2 = _slicedToArray(_useLocalStorageState, 2),
     setLocalData = _useLocalStorageState2[1];
@@ -48,7 +49,7 @@ var ProStep = function ProStep(_ref) {
     if (resetProps === null || resetProps === void 0 ? void 0 : resetProps.dataSource) {
       return resetProps === null || resetProps === void 0 ? void 0 : resetProps.dataSource;
     }
-    return (_Object$entries = Object.entries(registerMap)) === null || _Object$entries === void 0 ? void 0 : (_Object$entries$map = _Object$entries.map) === null || _Object$entries$map === void 0 ? void 0 : _Object$entries$map.call(_Object$entries, function (_ref2) {
+    return (_Object$entries = Object.entries(registerMap.current)) === null || _Object$entries === void 0 ? void 0 : (_Object$entries$map = _Object$entries.map) === null || _Object$entries$map === void 0 ? void 0 : _Object$entries$map.call(_Object$entries, function (_ref2) {
       var _ref3 = _slicedToArray(_ref2, 2),
         key = _ref3[0],
         _ref3$ = _ref3[1],
@@ -64,76 +65,89 @@ var ProStep = function ProStep(_ref) {
     }).sort(function (pre, next) {
       return pre.order - next.order;
     });
-  }, [resetProps === null || resetProps === void 0 ? void 0 : resetProps.dataSource, registerMap, anchorIds]);
+  }, [resetProps === null || resetProps === void 0 ? void 0 : resetProps.dataSource, registerMap.current, anchorIds]);
   // 用来注册form匹配到对应的模块id
   var register = function register(_ref4) {
+    var _registerMap$current;
     var id = _ref4.id,
       form = _ref4.form,
       title = _ref4.title,
       validator = _ref4.validator,
       order = _ref4.order,
       disabled = _ref4.disabled;
-    if (title && !registerMap[id]) {
-      setRegisterMap(_defineProperty({}, id, {
-        title: title,
-        order: order
-      }));
-    }
+    var record = {};
+    record.title = title;
+    record.order = order;
     if (disabled) {
+      registerMap.current[id] = record;
       return null;
     }
-    emitter.useSubscription( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var num, _form$validateFields, _errors$errorFields;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            num = 0;
-            _context.prev = 1;
-            if (!validator) {
-              _context.next = 8;
+    var subEvent = /*#__PURE__*/function () {
+      var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        var num, _form$validateFields, _errors$errorFields;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              num = 0;
+              _context.prev = 1;
+              if (!validator) {
+                _context.next = 8;
+                break;
+              }
+              _context.next = 5;
+              return validator === null || validator === void 0 ? void 0 : validator();
+            case 5:
+              values[id] = _context.sent;
+              _context.next = 11;
               break;
-            }
-            _context.next = 5;
-            return validator === null || validator === void 0 ? void 0 : validator();
-          case 5:
-            values[id] = _context.sent;
-            _context.next = 11;
-            break;
-          case 8:
-            _context.next = 10;
-            return form === null || form === void 0 ? void 0 : (_form$validateFields = form.validateFields) === null || _form$validateFields === void 0 ? void 0 : _form$validateFields.call(form);
-          case 10:
-            values[id] = _context.sent;
-          case 11:
-            _context.next = 17;
-            break;
-          case 13:
-            _context.prev = 13;
-            _context.t0 = _context["catch"](1);
-            num = _context.t0 === null || _context.t0 === void 0 ? void 0 : (_errors$errorFields = _context.t0.errorFields) === null || _errors$errorFields === void 0 ? void 0 : _errors$errorFields.length;
-            if (num) {
-              setLocalData(false);
-              console.error(_context.t0);
-            }
-          case 17:
-            setErrorCollection(_defineProperty({}, id, num));
-          case 18:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee, null, [[1, 13]]);
-    })));
+            case 8:
+              _context.next = 10;
+              return form === null || form === void 0 ? void 0 : (_form$validateFields = form.validateFields) === null || _form$validateFields === void 0 ? void 0 : _form$validateFields.call(form);
+            case 10:
+              values[id] = _context.sent;
+            case 11:
+              _context.next = 20;
+              break;
+            case 13:
+              _context.prev = 13;
+              _context.t0 = _context["catch"](1);
+              num = _context.t0 === null || _context.t0 === void 0 ? void 0 : (_errors$errorFields = _context.t0.errorFields) === null || _errors$errorFields === void 0 ? void 0 : _errors$errorFields.length;
+              if (num) {
+                setLocalData(false);
+                console.error(_context.t0);
+              }
+              setErrorCollection(_defineProperty({}, id, num));
+              setLoading(false);
+              return _context.abrupt("return", _context.t0);
+            case 20:
+              return _context.abrupt("return", values[id]);
+            case 21:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, null, [[1, 13]]);
+      }));
+      return function subEvent() {
+        return _ref5.apply(this, arguments);
+      };
+    }();
+    record.subEvent = subEvent;
+    if (title && !(registerMap === null || registerMap === void 0 ? void 0 : (_registerMap$current = registerMap.current) === null || _registerMap$current === void 0 ? void 0 : _registerMap$current[id])) {
+      registerMap.current[id] = record;
+    }
+    emitter.useSubscription(subEvent);
   };
   var notify = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            _context2.next = 2;
+            setLoading(true);
+            _context2.next = 3;
             return emitter.emit();
-          case 2:
-            return _context2.abrupt("return", values);
           case 3:
+            return _context2.abrupt("return", values);
+          case 4:
           case "end":
             return _context2.stop();
         }
@@ -164,6 +178,41 @@ var ProStep = function ProStep(_ref) {
     };
     observer.observe(targetElement, config);
   };
+  var triggerTo = /*#__PURE__*/function () {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(keys) {
+      var events, result, nextErrorCollection;
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            events = [];
+            keys === null || keys === void 0 ? void 0 : keys.forEach(function (key) {
+              var _registerMap$current2, _registerMap$current3, _registerMap$current4;
+              events.push(registerMap === null || registerMap === void 0 ? void 0 : (_registerMap$current2 = registerMap.current) === null || _registerMap$current2 === void 0 ? void 0 : (_registerMap$current3 = _registerMap$current2[key]) === null || _registerMap$current3 === void 0 ? void 0 : (_registerMap$current4 = _registerMap$current3.subEvent) === null || _registerMap$current4 === void 0 ? void 0 : _registerMap$current4.call(_registerMap$current3));
+            });
+            _context3.next = 4;
+            return Promise.all(events);
+          case 4:
+            result = _context3.sent;
+            nextErrorCollection = {};
+            result === null || result === void 0 ? void 0 : result.forEach(function (item, index) {
+              var _item$errorFields;
+              if (item === null || item === void 0 ? void 0 : (_item$errorFields = item.errorFields) === null || _item$errorFields === void 0 ? void 0 : _item$errorFields.length) {
+                var _item$errorFields2;
+                nextErrorCollection[keys[index]] = item === null || item === void 0 ? void 0 : (_item$errorFields2 = item.errorFields) === null || _item$errorFields2 === void 0 ? void 0 : _item$errorFields2.length;
+              }
+            });
+            setErrorCollection(nextErrorCollection);
+            return _context3.abrupt("return", result);
+          case 9:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3);
+    }));
+    return function triggerTo(_x) {
+      return _ref7.apply(this, arguments);
+    };
+  }();
   useDeepCompareEffect(function () {
     var errorModuleKeys = Object.keys(errorCollection).reverse();
     if (errorModuleKeys === null || errorModuleKeys === void 0 ? void 0 : errorModuleKeys.length) {
@@ -188,7 +237,10 @@ var ProStep = function ProStep(_ref) {
       collapse: collapse,
       register: register,
       notify: notify,
-      handleScroll: handleScroll
+      triggerTo: triggerTo,
+      handleScroll: handleScroll,
+      loading: loading,
+      setLoading: setLoading
     },
     children: _jsxs("div", {
       className: "pro-step-wrapper",

package/es/ProTable/propsType.d.ts

@@ -85,6 +85,7 @@ export interface RequestOptions<T, R> {
     onPageChange?: (page: PaginationProps) => void;
     transformParams?: (params: any, requestParams: any) => any;
     transformResponse?: (res: any) => ListResponse<R>;
+    disabled?: (record: any) => boolean;
 }
 export interface Params<T = any> extends PaginationProps {
     queryBean?: Partial<T>;

package/es/ProTable/useAntdTable.js

@@ -60,7 +60,8 @@ function useAntdTable(service, options, useRequestOptions) {
     crossPageSelect = _useDefaultOptions$cr === void 0 ? false : _useDefaultOptions$cr,
     onPageChange = _useDefaultOptions.onPageChange,
     transformParams = _useDefaultOptions.transformParams,
-    transformResponse = _useDefaultOptions.transformResponse;
+    transformResponse = _useDefaultOptions.transformResponse,
+    disabled = _useDefaultOptions.disabled;
   var _ref = useRequestOptions || {},
     defaultParams = _ref.defaultParams,
     manual = _ref.manual;
@@ -136,12 +137,29 @@ function useAntdTable(service, options, useRequestOptions) {
       var filterList = data.filter(function (item) {
         return !selectedRowKeys.includes(item === null || item === void 0 ? void 0 : item[rowKey]);
       });
-      setState({
+      var nextObject = {
         selectedRecords: [].concat(_toConsumableArray(selectedRecords), _toConsumableArray(filterList)),
         selectedRowKeys: [].concat(_toConsumableArray(selectedRowKeys), _toConsumableArray(filterList === null || filterList === void 0 ? void 0 : filterList.map(function (item) {
           return item === null || item === void 0 ? void 0 : item[rowKey];
         })))
-      });
+      };
+      if (typeof disabled === 'function') {
+        var _selectedRecords$filt, _nextSelectRecords$ma;
+        var _nextObject = nextObject,
+          _selectedRecords = _nextObject.selectedRecords;
+        var nextSelectRecords = (_selectedRecords$filt = _selectedRecords.filter(function (item) {
+          // 去掉禁用的
+          return !disabled(item);
+        })) !== null && _selectedRecords$filt !== void 0 ? _selectedRecords$filt : [];
+        var nextSelectedRowKeys = (_nextSelectRecords$ma = nextSelectRecords.map(function (item) {
+          return item === null || item === void 0 ? void 0 : item[rowKey];
+        })) !== null && _nextSelectRecords$ma !== void 0 ? _nextSelectRecords$ma : [];
+        nextObject = {
+          selectedRecords: nextSelectRecords,
+          selectedRowKeys: nextSelectedRowKeys
+        };
+      }
+      setState(nextObject);
     }
   }, [allSelected, data]);
   // 分页变更
@@ -282,6 +300,7 @@ function useAntdTable(service, options, useRequestOptions) {
     }
   }, [curService]);
   useDeepCompareEffect(function () {
+    // extraParams改变时重新请求
     if (!manual && extraParams) {
       var newPage = {
         pageNum: 1,

package/es/ProTable/utils.js

@@ -116,12 +116,16 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
       if (!value && value !== 0 && renderValue === originalRenderValue) {
         return '-';
       }
+      var node = _jsxs(_Space, {
+        size: 8,
+        children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
+      });
       return _jsx(RenderColumn, {
         valueType: valueType,
         originalValue: originalValue === undefined ? undefined : originalRenderValue,
         ellipsis: ellipsis,
         width: width,
-        node: renderValue,
+        node: node,
         value: value,
         currentValue: renderValue,
         originalDiffTip: originalDiffTip,