@zat-design/sisyphus-react 3.6.2 → 3.6.3-beta.2

package/lib/ProSelect/utils/index.js

@@ -10,7 +10,8 @@ var _lodash = _interopRequireDefault(require("lodash"));
 /* eslint-disable no-restricted-syntax */
 
 var findSelectNameValues = function findSelectNameValues(_ref) {
-  var list = _ref.list,
+  var _ref$list = _ref.list,
+    list = _ref$list === void 0 ? [] : _ref$list,
     selectName = _ref.selectName,
     value = _ref.value,
     dataSource = _ref.dataSource,
@@ -61,7 +62,7 @@ var getSelectList = exports.getSelectList = function getSelectList(_ref2) {
   var fatherName = listName.slice(0, firstNumberIndex);
   var selectName = listName.slice(firstNumberIndex + 1);
   return findSelectNameValues({
-    list: form.getFieldValue(fatherName),
+    list: form.getFieldValue(fatherName) || [],
     selectName: selectName,
     value: value,
     dataSource: dataSource,

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

@@ -14,16 +14,12 @@ var _react = _interopRequireDefault(require("react"));
 var _index = require("../../index");
 var _excluded = ["children", "delayTime"];
 var _default = exports.default = function _default(_ref) {
-  var _children$props;
   var children = _ref.children,
     delayTime = _ref.delayTime,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var _useStep = (0, _index.useStep)(),
-    notify = _useStep.notify,
-    loading = _useStep.loading,
-    setLoading = _useStep.setLoading;
+    notify = _useStep.notify;
   return /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
-    loading: loading || (children === null || children === void 0 ? void 0 : (_children$props = children.props) === null || _children$props === void 0 ? void 0 : _children$props.loading),
     onClick: (0, _lodash.throttle)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var values;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
@@ -35,11 +31,10 @@ var _default = exports.default = function _default(_ref) {
           case 3:
             values = _context.sent;
             setTimeout(function () {
-              setLoading(false);
               var localData = localStorage.getItem('cache-pro-step');
               if (localData !== 'false') {
-                var _children$props2, _children$props2$onCl;
-                children === null || children === void 0 ? void 0 : (_children$props2 = children.props) === null || _children$props2 === void 0 ? void 0 : (_children$props2$onCl = _children$props2.onClick) === null || _children$props2$onCl === void 0 ? void 0 : _children$props2$onCl.call(_children$props2, values);
+                var _children$props, _children$props$onCli;
+                children === null || children === void 0 ? void 0 : (_children$props = children.props) === null || _children$props === void 0 ? void 0 : (_children$props$onCli = _children$props.onClick) === null || _children$props$onCli === void 0 ? void 0 : _children$props$onCli.call(_children$props, values);
               }
             }, delayTime !== null && delayTime !== void 0 ? delayTime : 0);
           case 5:

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 _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
@@ -27,21 +27,16 @@ var useStep = exports.useStep = function useStep() {
 var ProStep = function ProStep(_ref) {
   var children = _ref.children,
     resetProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  var emitter = (0, _ahooks.useEventEmitter)();
+  var _useState = (0, _react.useState)([]),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    ids = _useState2[0],
+    setIds = _useState2[1];
   var _useSetState = (0, _ahooks.useSetState)({}),
     _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
     errorCollection = _useSetState2[0],
     setErrorCollection = _useSetState2[1];
   // 注册子节点id与title映射的集合
   var registerMap = (0, _react.useRef)({});
-  var _useState = (0, _react.useState)([]),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    anchorIds = _useState2[0],
-    setAnchorIds = _useState2[1];
-  var _useState3 = (0, _react.useState)(false),
-    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-    loading = _useState4[0],
-    setLoading = _useState4[1];
   var _useLocalStorageState = (0, _ahooks.useLocalStorageState)('cache-pro-step'),
     _useLocalStorageState2 = (0, _slicedToArray2.default)(_useLocalStorageState, 2),
     setLocalData = _useLocalStorageState2[1];
@@ -50,7 +45,6 @@ var ProStep = function ProStep(_ref) {
     collapse = _resetProps$collapse === void 0 ? false : _resetProps$collapse,
     _resetProps$scrollToE = resetProps.scrollToError,
     scrollToError = _resetProps$scrollToE === void 0 ? true : _resetProps$scrollToE;
-  var values = {};
   var dataSource = (0, _react.useMemo)(function () {
     var _Object$entries, _Object$entries$map;
     if (resetProps === null || resetProps === void 0 ? void 0 : resetProps.dataSource) {
@@ -68,14 +62,14 @@ var ProStep = function ProStep(_ref) {
         order: order
       };
     }).filter(function (item) {
-      return anchorIds.includes(item.code);
+      var _ids$includes;
+      return ids === null || ids === void 0 ? void 0 : (_ids$includes = ids.includes) === null || _ids$includes === void 0 ? void 0 : _ids$includes.call(ids, item.code);
     }).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.current, ids]);
   // 用来注册form匹配到对应的模块id
   var register = function register(_ref4) {
-    var _registerMap$current;
     var id = _ref4.id,
       form = _ref4.form,
       title = _ref4.title,
@@ -85,18 +79,23 @@ var ProStep = function ProStep(_ref) {
     var record = {};
     record.title = title;
     record.order = order;
+    if (!ids.includes(id)) {
+      setIds(function (preState) {
+        return [].concat((0, _toConsumableArray2.default)(preState), [id]);
+      });
+    }
     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;
+        var value, _form$validateFields, _error$errorFields;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              num = 0;
-              _context.prev = 1;
+              _context.prev = 0;
+              value = null;
               if (!validator) {
                 _context.next = 8;
                 break;
@@ -104,58 +103,60 @@ var ProStep = function ProStep(_ref) {
               _context.next = 5;
               return validator === null || validator === void 0 ? void 0 : validator();
             case 5:
-              values[id] = _context.sent;
+              value = _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;
+              value = _context.sent;
             case 11:
-              setErrorCollection((0, _defineProperty2.default)({}, id, 0));
-              _context.next = 21;
-              break;
+              return _context.abrupt("return", value);
             case 14:
               _context.prev = 14;
-              _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);
+              _context.t0 = _context["catch"](0);
+              if (_context.t0 === null || _context.t0 === void 0 ? void 0 : (_error$errorFields = _context.t0.errorFields) === null || _error$errorFields === void 0 ? void 0 : _error$errorFields.length) {
                 console.error(_context.t0);
+                setLocalData(false);
               }
-              setErrorCollection((0, _defineProperty2.default)({}, id, num));
-              setLoading(false);
               return _context.abrupt("return", _context.t0);
-            case 21:
-              return _context.abrupt("return", values[id]);
-            case 22:
+            case 18:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[1, 14]]);
+        }, _callee, null, [[0, 14]]);
       }));
       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);
+    registerMap.current[id] = record;
   };
   var notify = /*#__PURE__*/function () {
     var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
+      var events, res, nextErrorCollection;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            setLoading(true);
+            events = Object.values(registerMap.current).map(function (item) {
+              var _item$subEvent;
+              return item === null || item === void 0 ? void 0 : (_item$subEvent = item.subEvent) === null || _item$subEvent === void 0 ? void 0 : _item$subEvent.call(item);
+            });
             _context2.next = 3;
-            return emitter.emit();
+            return Promise.all(events);
           case 3:
-            return _context2.abrupt("return", values);
-          case 4:
+            res = _context2.sent;
+            nextErrorCollection = {};
+            Object.keys(registerMap.current).forEach(function (id, index) {
+              var _ref7 = (res === null || res === void 0 ? void 0 : res[index]) || {},
+                errorFields = _ref7.errorFields;
+              nextErrorCollection[id] = (errorFields === null || errorFields === void 0 ? void 0 : errorFields.length) || 0;
+            });
+            setErrorCollection(nextErrorCollection);
+            return _context2.abrupt("return", res);
+          case 8:
           case "end":
             return _context2.stop();
         }
@@ -165,37 +166,16 @@ var ProStep = function ProStep(_ref) {
       return _ref6.apply(this, arguments);
     };
   }();
-  var handleListenerDom = function handleListenerDom() {
-    var targetElement = document.getElementById('pro-step');
-    var observer = new MutationObserver(function (mutations) {
-      mutations.forEach(function (mutation) {
-        // 处理 DOM 树变化的逻辑
-        var Anchors = document.getElementsByClassName('pro-step-item') || [];
-        // 当前页面所存在的所有折叠项
-        var nextAnchorIds = [];
-        Array.prototype.slice.call(Anchors).forEach(function (dom) {
-          var id = dom.getAttribute('id');
-          nextAnchorIds.push(id);
-        });
-        setAnchorIds(nextAnchorIds);
-      });
-    });
-    var config = {
-      subtree: true,
-      childList: true // 是否观察子元素的添加或删除
-    };
-    observer.observe(targetElement, config);
-  };
   var triggerTo = /*#__PURE__*/function () {
-    var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3(keys) {
+    var _ref8 = (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));
+              var _registerMap$current, _registerMap$current$, _registerMap$current$2;
+              events.push(registerMap === null || registerMap === void 0 ? void 0 : (_registerMap$current = registerMap.current) === null || _registerMap$current === void 0 ? void 0 : (_registerMap$current$ = _registerMap$current[key]) === null || _registerMap$current$ === void 0 ? void 0 : (_registerMap$current$2 = _registerMap$current$.subEvent) === null || _registerMap$current$2 === void 0 ? void 0 : _registerMap$current$2.call(_registerMap$current$));
             });
             _context3.next = 4;
             return Promise.all(events);
@@ -218,7 +198,7 @@ var ProStep = function ProStep(_ref) {
       }, _callee3);
     }));
     return function triggerTo(_x) {
-      return _ref7.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
   (0, _ahooks.useDeepCompareEffect)(function () {
@@ -237,18 +217,13 @@ var ProStep = function ProStep(_ref) {
       });
     }
   }, [errorCollection, dataSource]);
-  (0, _react.useEffect)(function () {
-    handleListenerDom();
-  }, []);
   return (0, _jsxRuntime.jsx)(ProStepContext.Provider, {
     value: {
       collapse: collapse,
       register: register,
       notify: notify,
       triggerTo: triggerTo,
-      handleScroll: _utils.handleScroll,
-      loading: loading,
-      setLoading: setLoading
+      handleScroll: _utils.handleScroll
     },
     children: (0, _jsxRuntime.jsxs)("div", {
       className: "pro-step-wrapper",

package/package.json

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

package/es/ProWaterMark/__snapshots__/index.test.tsx.snap

@@ -1,7 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`render ProWaterMark with dumi 1`] = `
-<span>
-  123
-</span>
-`;

package/lib/ProWaterMark/__snapshots__/index.test.tsx.snap

@@ -1,7 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`render ProWaterMark with dumi 1`] = `
-<span>
-  123
-</span>
-`;