@zat-design/sisyphus-react 3.5.3-beta.7 → 3.5.3

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 (isView) {
+  if (!isEditing) {
     delete _formItemProps.rules;
   }
   var _className = classNames(_defineProperty(_defineProperty({}, className, className), 'pro-form-item-changed', changed));

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

@@ -92,10 +92,6 @@ 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

@@ -604,11 +604,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           nextState.selectedRows = value;
         }
       } else if (value) {
-        var nextSelectedRowKeys = isMultiple ? value : [value];
-        nextState.selectedRowKeys = nextSelectedRowKeys;
-        nextState.selectedRows = options.filter(function (item) {
-          return nextSelectedRowKeys.includes(item[valueKey]);
-        });
+        nextState.selectedRowKeys = [value];
       }
       setState(nextState);
     }
@@ -683,7 +679,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       labelInValue: labelInValue,
       dataSource: options,
       scrollFollowParent: false,
-      mode: isMultiple ? 'multiple' : undefined,
       onFocus: function onFocus() {
         if (useRequest) {
           var _useRequest$options9;

package/es/ProForm/utils/useShouldUpdate.js

@@ -1,3 +1,4 @@
+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';
@@ -164,10 +165,9 @@ var useShouldUpdate = function useShouldUpdate(props) {
           clearInterval(timerRef.current);
           timerRef.current = setTimeout(function () {
             if (Array.isArray(names)) {
-              form.resetFields(names);
+              form.resetFields(_toConsumableArray(names));
             } else {
-              var clearName = formItemProps.namePath ? formItemProps.namePath.slice(0, -1).concat(formItemProps.name) : formItemProps.name;
-              form.resetFields([clearName]);
+              form.resetFields([formItemProps.name]);
             }
           }, 200);
         } else {

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 _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 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, useRef, useState } from 'react';
+import { createContext, useContext, useEffect, useMemo, useState } from 'react';
 import { useEventEmitter, useSetState, useLocalStorageState, useDeepCompareEffect } from 'ahooks';
 import { handleScroll } from './utils';
 import Step from './components/Step';
@@ -26,7 +26,10 @@ var ProStep = function ProStep(_ref) {
     errorCollection = _useSetState2[0],
     setErrorCollection = _useSetState2[1];
   // 注册子节点id与title映射的集合
-  var registerMap = useRef({});
+  var _useSetState3 = useSetState({}),
+    _useSetState4 = _slicedToArray(_useSetState3, 2),
+    registerMap = _useSetState4[0],
+    setRegisterMap = _useSetState4[1];
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     anchorIds = _useState2[0],
@@ -45,7 +48,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.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) {
+    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) {
       var _ref3 = _slicedToArray(_ref2, 2),
         key = _ref3[0],
         _ref3$ = _ref3[1],
@@ -61,76 +64,65 @@ var ProStep = function ProStep(_ref) {
     }).sort(function (pre, next) {
       return pre.order - next.order;
     });
-  }, [resetProps === null || resetProps === void 0 ? void 0 : resetProps.dataSource, registerMap.current, anchorIds]);
+  }, [resetProps === null || resetProps === void 0 ? void 0 : resetProps.dataSource, registerMap, 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;
-    var record = {};
-    record.title = title;
-    record.order = order;
+    if (title && !registerMap[id]) {
+      setRegisterMap(_defineProperty({}, id, {
+        title: title,
+        order: order
+      }));
+    }
     if (disabled) {
-      registerMap.current[id] = record;
       return null;
     }
-    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;
-            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 = 19;
+    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;
               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));
-              return _context.abrupt("return", _context.t0);
-            case 19:
-              return _context.abrupt("return", values[id]);
-            case 20:
-            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);
+            }
+            _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]]);
+    })));
   };
   var notify = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
@@ -172,41 +164,6 @@ 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) {
@@ -231,7 +188,6 @@ var ProStep = function ProStep(_ref) {
       collapse: collapse,
       register: register,
       notify: notify,
-      triggerTo: triggerTo,
       handleScroll: handleScroll
     },
     children: _jsxs("div", {

package/es/ProTable/propsType.d.ts

@@ -85,7 +85,6 @@ 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,8 +60,7 @@ function useAntdTable(service, options, useRequestOptions) {
     crossPageSelect = _useDefaultOptions$cr === void 0 ? false : _useDefaultOptions$cr,
     onPageChange = _useDefaultOptions.onPageChange,
     transformParams = _useDefaultOptions.transformParams,
-    transformResponse = _useDefaultOptions.transformResponse,
-    disabled = _useDefaultOptions.disabled;
+    transformResponse = _useDefaultOptions.transformResponse;
   var _ref = useRequestOptions || {},
     defaultParams = _ref.defaultParams,
     manual = _ref.manual;
@@ -137,29 +136,12 @@ function useAntdTable(service, options, useRequestOptions) {
       var filterList = data.filter(function (item) {
         return !selectedRowKeys.includes(item === null || item === void 0 ? void 0 : item[rowKey]);
       });
-      var nextObject = {
+      setState({
         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]);
   // 分页变更
@@ -300,7 +282,6 @@ function useAntdTable(service, options, useRequestOptions) {
     }
   }, [curService]);
   useDeepCompareEffect(function () {
-    // extraParams改变时重新请求
     if (!manual && extraParams) {
       var newPage = {
         pageNum: 1,

package/es/ProTreeModal/components/Trigger.js

@@ -32,15 +32,10 @@ function Trigger(props) {
   var _ref = appointProps || {},
     appointDisabled = _ref.disabled;
   var _tempAppointDisabled = appointDisabled || false;
-  var _tempDisabled = disabled || false;
-  var _ref2 = Array.isArray(disabled) ? disabled : [_tempDisabled, _tempDisabled],
+  var _ref2 = Array.isArray(appointDisabled) ? appointDisabled : [_tempAppointDisabled, _tempAppointDisabled],
     _ref3 = _slicedToArray(_ref2, 2),
-    beforeDisabled = _ref3[0],
-    afterDisabled = _ref3[1];
-  var _ref4 = Array.isArray(appointDisabled) ? appointDisabled : [_tempAppointDisabled, _tempAppointDisabled],
-    _ref5 = _slicedToArray(_ref4, 2),
-    allDisabled = _ref5[0],
-    specifyDisabled = _ref5[1];
+    allDisabled = _ref3[0],
+    specifyDisabled = _ref3[1];
   var _useSetState = useSetState({
       mode: 'appoint'
     }),
@@ -99,18 +94,18 @@ function Trigger(props) {
           style: {
             width: 'auto'
           },
-          disabled: beforeDisabled,
+          disabled: disabled,
           className: classNames(disabled ? 'trigger-no-hover' : '', appoint ? 'pro-tree-modal-input-appoint' : ''),
           defaultValue: "appoint",
           value: state.mode,
           onChange: onAppointChange,
           children: [_jsx(_Select.Option, {
             value: "all",
-            disabled: allDisabled,
+            disabled: disabled || allDisabled,
             children: locale === null || locale === void 0 ? void 0 : locale.ProTreeModal.specifyMode[0]
           }), _jsx(_Select.Option, {
             value: "appoint",
-            disabled: specifyDisabled,
+            disabled: disabled || specifyDisabled,
             children: locale === null || locale === void 0 ? void 0 : locale.ProTreeModal.specifyMode[1]
           })]
         }), props.children]
@@ -120,7 +115,7 @@ function Trigger(props) {
   };
   return _jsx(TriggerComponent, {
     children: _jsx(_Input, {
-      className: classNames(afterDisabled ? 'trigger-no-hover' : '', appoint ? 'pro-tree-modal-input-appoint' : ''),
+      className: classNames(disabled ? 'trigger-no-hover' : '', appoint ? 'pro-tree-modal-input-appoint' : ''),
       onClick: handleClick,
       value: checkedValues.length === 0 ? null : state.mode === 'all' ? formatMessage(locale === null || locale === void 0 ? void 0 : locale.ProTreeModal.checkAll1, {
         all: label
@@ -129,7 +124,7 @@ function Trigger(props) {
       }),
       addonAfter: state.mode === 'all' ? null : _jsxs("div", {
         className: "pro-enum-input-addonAfter",
-        children: [checkedValues.length > 0 && !afterDisabled && _jsx("span", {
+        children: [checkedValues.length > 0 && !disabled && _jsx("span", {
           className: "close-icon",
           children: _jsx(CloseOutlined, {
             onClick: handleClearAll
@@ -141,7 +136,7 @@ function Trigger(props) {
         })]
       }),
       placeholder: locale === null || locale === void 0 ? void 0 : (_locale$ProTreeModal3 = locale.ProTreeModal) === null || _locale$ProTreeModal3 === void 0 ? void 0 : _locale$ProTreeModal3.select,
-      disabled: afterDisabled || state.mode === 'all',
+      disabled: disabled || state.mode === 'all',
       style: _objectSpread({}, triggerStyle)
     })
   });

package/es/ProTreeModal/index.js

@@ -11,14 +11,6 @@ import _message from "antd/es/message";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-/*
- * @Author: za-xuwenli xuwenli@zhongan.io
- * @Date: 2024-06-04 10:01:18
- * @LastEditors: za-xuwenli xuwenli@zhongan.io
- * @LastEditTime: 2024-06-04 10:30:30
- * @FilePath: /za-material-warehouse/src/ProTreeModal/index.tsx
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
 import React, { useEffect, useMemo, useRef } from 'react';
 import { useDeepCompareEffect, useSetState, useRequest as useRequestFunc } from 'ahooks';
 import { cloneDeep, isFunction } from 'lodash';

package/es/ProTreeModal/propsType.d.ts

@@ -61,7 +61,7 @@ export interface ProTreeModalProps {
     /** 当为列表时可开启右侧拖动 */
     draggable?: boolean;
     /** 禁用 */
-    disabled?: any;
+    disabled?: boolean;
     /** 弹框的 title */
     title?: string | ReactNode;
     /** 全选的标识给后端 */

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

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

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

@@ -97,10 +97,6 @@ var DatePicker = function DatePicker(props) {
   if ((0, _lodash.isObject)(_rest.showTime)) {
     _rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
   }
-  // 传进来showTime权重最高
-  if ((0, _lodash.isBoolean)(rest.showTime)) {
-    _rest.showTime = rest.showTime;
-  }
   return (0, _jsxRuntime.jsx)(_antd.DatePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, initialConfig), {}, {
     format: _format
   }, _rest), {}, {

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

@@ -601,11 +601,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           nextState.selectedRows = value;
         }
       } else if (value) {
-        var nextSelectedRowKeys = isMultiple ? value : [value];
-        nextState.selectedRowKeys = nextSelectedRowKeys;
-        nextState.selectedRows = options.filter(function (item) {
-          return nextSelectedRowKeys.includes(item[valueKey]);
-        });
+        nextState.selectedRowKeys = [value];
       }
       setState(nextState);
     }
@@ -680,7 +676,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       labelInValue: labelInValue,
       dataSource: options,
       scrollFollowParent: false,
-      mode: isMultiple ? 'multiple' : undefined,
       onFocus: function onFocus() {
         if (useRequest) {
           var _useRequest$options9;

package/lib/ProForm/utils/useShouldUpdate.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _lodash = require("lodash");
@@ -171,10 +172,9 @@ var useShouldUpdate = function useShouldUpdate(props) {
           clearInterval(timerRef.current);
           timerRef.current = setTimeout(function () {
             if (Array.isArray(names)) {
-              form.resetFields(names);
+              form.resetFields((0, _toConsumableArray2.default)(names));
             } else {
-              var clearName = formItemProps.namePath ? formItemProps.namePath.slice(0, -1).concat(formItemProps.name) : formItemProps.name;
-              form.resetFields([clearName]);
+              form.resetFields([formItemProps.name]);
             }
           }, 200);
         } else {

package/lib/ProStep/index.js

@@ -7,8 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.useStep = exports.default = exports.ProStepContext = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
@@ -33,7 +33,10 @@ var ProStep = function ProStep(_ref) {
     errorCollection = _useSetState2[0],
     setErrorCollection = _useSetState2[1];
   // 注册子节点id与title映射的集合
-  var registerMap = (0, _react.useRef)({});
+  var _useSetState3 = (0, _ahooks.useSetState)({}),
+    _useSetState4 = (0, _slicedToArray2.default)(_useSetState3, 2),
+    registerMap = _useSetState4[0],
+    setRegisterMap = _useSetState4[1];
   var _useState = (0, _react.useState)([]),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     anchorIds = _useState2[0],
@@ -52,7 +55,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.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) {
+    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) {
       var _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
         key = _ref3[0],
         _ref3$ = _ref3[1],
@@ -68,76 +71,65 @@ var ProStep = function ProStep(_ref) {
     }).sort(function (pre, next) {
       return pre.order - next.order;
     });
-  }, [resetProps === null || resetProps === void 0 ? void 0 : resetProps.dataSource, registerMap.current, anchorIds]);
+  }, [resetProps === null || resetProps === void 0 ? void 0 : resetProps.dataSource, registerMap, 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;
-    var record = {};
-    record.title = title;
-    record.order = order;
+    if (title && !registerMap[id]) {
+      setRegisterMap((0, _defineProperty2.default)({}, id, {
+        title: title,
+        order: order
+      }));
+    }
     if (disabled) {
-      registerMap.current[id] = record;
       return null;
     }
-    var subEvent = /*#__PURE__*/function () {
-      var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
-        var num, _form$validateFields, _errors$errorFields;
-        return (0, _regeneratorRuntime2.default)().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;
-            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 = 19;
+    emitter.useSubscription( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+      var num, _form$validateFields, _errors$errorFields;
+      return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            num = 0;
+            _context.prev = 1;
+            if (!validator) {
+              _context.next = 8;
               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((0, _defineProperty2.default)({}, id, num));
-              return _context.abrupt("return", _context.t0);
-            case 19:
-              return _context.abrupt("return", values[id]);
-            case 20:
-            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);
+            }
+            _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((0, _defineProperty2.default)({}, id, num));
+          case 18:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[1, 13]]);
+    })));
   };
   var notify = /*#__PURE__*/function () {
     var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
@@ -179,41 +171,6 @@ var ProStep = function ProStep(_ref) {
     };
     observer.observe(targetElement, config);
   };
-  var triggerTo = /*#__PURE__*/function () {
-    var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3(keys) {
-      var events, result, nextErrorCollection;
-      return (0, _regeneratorRuntime2.default)().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);
-    };
-  }();
   (0, _ahooks.useDeepCompareEffect)(function () {
     var errorModuleKeys = Object.keys(errorCollection).reverse();
     if (errorModuleKeys === null || errorModuleKeys === void 0 ? void 0 : errorModuleKeys.length) {
@@ -238,7 +195,6 @@ var ProStep = function ProStep(_ref) {
       collapse: collapse,
       register: register,
       notify: notify,
-      triggerTo: triggerTo,
       handleScroll: _utils.handleScroll
     },
     children: (0, _jsxRuntime.jsxs)("div", {

package/lib/ProTable/propsType.d.ts

@@ -85,7 +85,6 @@ 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/lib/ProTable/useAntdTable.js

@@ -67,8 +67,7 @@ function useAntdTable(service, options, useRequestOptions) {
     crossPageSelect = _useDefaultOptions$cr === void 0 ? false : _useDefaultOptions$cr,
     onPageChange = _useDefaultOptions.onPageChange,
     transformParams = _useDefaultOptions.transformParams,
-    transformResponse = _useDefaultOptions.transformResponse,
-    disabled = _useDefaultOptions.disabled;
+    transformResponse = _useDefaultOptions.transformResponse;
   var _ref = useRequestOptions || {},
     defaultParams = _ref.defaultParams,
     manual = _ref.manual;
@@ -144,29 +143,12 @@ function useAntdTable(service, options, useRequestOptions) {
       var filterList = data.filter(function (item) {
         return !selectedRowKeys.includes(item === null || item === void 0 ? void 0 : item[rowKey]);
       });
-      var nextObject = {
+      setState({
         selectedRecords: [].concat((0, _toConsumableArray2.default)(selectedRecords), (0, _toConsumableArray2.default)(filterList)),
         selectedRowKeys: [].concat((0, _toConsumableArray2.default)(selectedRowKeys), (0, _toConsumableArray2.default)(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]);
   // 分页变更
@@ -307,7 +289,6 @@ function useAntdTable(service, options, useRequestOptions) {
     }
   }, [curService]);
   (0, _ahooks.useDeepCompareEffect)(function () {
-    // extraParams改变时重新请求
     if (!manual && extraParams) {
       var newPage = {
         pageNum: 1,

package/lib/ProTreeModal/components/Trigger.js

@@ -35,15 +35,10 @@ function Trigger(props) {
   var _ref = appointProps || {},
     appointDisabled = _ref.disabled;
   var _tempAppointDisabled = appointDisabled || false;
-  var _tempDisabled = disabled || false;
-  var _ref2 = Array.isArray(disabled) ? disabled : [_tempDisabled, _tempDisabled],
+  var _ref2 = Array.isArray(appointDisabled) ? appointDisabled : [_tempAppointDisabled, _tempAppointDisabled],
     _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
-    beforeDisabled = _ref3[0],
-    afterDisabled = _ref3[1];
-  var _ref4 = Array.isArray(appointDisabled) ? appointDisabled : [_tempAppointDisabled, _tempAppointDisabled],
-    _ref5 = (0, _slicedToArray2.default)(_ref4, 2),
-    allDisabled = _ref5[0],
-    specifyDisabled = _ref5[1];
+    allDisabled = _ref3[0],
+    specifyDisabled = _ref3[1];
   var _useSetState = (0, _ahooks.useSetState)({
       mode: 'appoint'
     }),
@@ -102,18 +97,18 @@ function Trigger(props) {
           style: {
             width: 'auto'
           },
-          disabled: beforeDisabled,
+          disabled: disabled,
           className: (0, _classnames.default)(disabled ? 'trigger-no-hover' : '', appoint ? 'pro-tree-modal-input-appoint' : ''),
           defaultValue: "appoint",
           value: state.mode,
           onChange: onAppointChange,
           children: [(0, _jsxRuntime.jsx)(_antd.Select.Option, {
             value: "all",
-            disabled: allDisabled,
+            disabled: disabled || allDisabled,
             children: _locale.default === null || _locale.default === void 0 ? void 0 : _locale.default.ProTreeModal.specifyMode[0]
           }), (0, _jsxRuntime.jsx)(_antd.Select.Option, {
             value: "appoint",
-            disabled: specifyDisabled,
+            disabled: disabled || specifyDisabled,
             children: _locale.default === null || _locale.default === void 0 ? void 0 : _locale.default.ProTreeModal.specifyMode[1]
           })]
         }), props.children]
@@ -123,7 +118,7 @@ function Trigger(props) {
   };
   return (0, _jsxRuntime.jsx)(TriggerComponent, {
     children: (0, _jsxRuntime.jsx)(_antd.Input, {
-      className: (0, _classnames.default)(afterDisabled ? 'trigger-no-hover' : '', appoint ? 'pro-tree-modal-input-appoint' : ''),
+      className: (0, _classnames.default)(disabled ? 'trigger-no-hover' : '', appoint ? 'pro-tree-modal-input-appoint' : ''),
       onClick: handleClick,
       value: checkedValues.length === 0 ? null : state.mode === 'all' ? (0, _locale.formatMessage)(_locale.default === null || _locale.default === void 0 ? void 0 : _locale.default.ProTreeModal.checkAll1, {
         all: label
@@ -132,7 +127,7 @@ function Trigger(props) {
       }),
       addonAfter: state.mode === 'all' ? null : (0, _jsxRuntime.jsxs)("div", {
         className: "pro-enum-input-addonAfter",
-        children: [checkedValues.length > 0 && !afterDisabled && (0, _jsxRuntime.jsx)("span", {
+        children: [checkedValues.length > 0 && !disabled && (0, _jsxRuntime.jsx)("span", {
           className: "close-icon",
           children: (0, _jsxRuntime.jsx)(_icons.CloseOutlined, {
             onClick: handleClearAll
@@ -144,7 +139,7 @@ function Trigger(props) {
         })]
       }),
       placeholder: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProTreeModal3 = _locale.default.ProTreeModal) === null || _locale$ProTreeModal3 === void 0 ? void 0 : _locale$ProTreeModal3.select,
-      disabled: afterDisabled || state.mode === 'all',
+      disabled: disabled || state.mode === 'all',
       style: (0, _objectSpread2.default)({}, triggerStyle)
     })
   });

package/lib/ProTreeModal/index.js

@@ -23,15 +23,6 @@ var _utils = require("./utils");
 var _inputSearch = _interopRequireDefault(require("../assets/input-search.svg"));
 var _locale = _interopRequireWildcard(require("../locale"));
 require("./style/index.less");
-/*
- * @Author: za-xuwenli xuwenli@zhongan.io
- * @Date: 2024-06-04 10:01:18
- * @LastEditors: za-xuwenli xuwenli@zhongan.io
- * @LastEditTime: 2024-06-04 10:30:30
- * @FilePath: /za-material-warehouse/src/ProTreeModal/index.tsx
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
-
 var LIST = 'LIST';
 var TREE = 'TREE';
 var CASCADER = exports.CASCADER = 'CASCADER';

package/lib/ProTreeModal/propsType.d.ts

@@ -61,7 +61,7 @@ export interface ProTreeModalProps {
     /** 当为列表时可开启右侧拖动 */
     draggable?: boolean;
     /** 禁用 */
-    disabled?: any;
+    disabled?: boolean;
     /** 弹框的 title */
     title?: string | ReactNode;
     /** 全选的标识给后端 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.5.3-beta.7",
+  "version": "3.5.3",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",