@zat-design/sisyphus-react 3.10.4-beta.2 → 3.11.0

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

@@ -7,8 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _lodash = require("lodash");
 var _react = _interopRequireDefault(require("react"));
 var _index = require("../../index");
@@ -33,16 +33,34 @@ var findFirstErrorDom = function findFirstErrorDom() {
   }
   return null;
 };
+var getLoadedMap = function getLoadedMap(registerMap) {
+  if (!(registerMap === null || registerMap === void 0 ? void 0 : registerMap.current)) {
+    return undefined;
+  }
+  var stepList = Object.values(registerMap === null || registerMap === void 0 ? void 0 : registerMap.current).map(function (item) {
+    return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.pick)(item, ['id', 'order', 'title'])), {}, {
+      loaded: !document.querySelector(".".concat(item === null || item === void 0 ? void 0 : item.id, "-placeholder"))
+    });
+  });
+  return stepList;
+};
+// Function to check if all modules are loaded
+var areAllModulesLoaded = function areAllModulesLoaded(data) {
+  return data.every(function (item) {
+    return (item === null || item === void 0 ? void 0 : item.loaded) === true;
+  });
+};
 var _default = exports.default = function _default(_ref) {
   var children = _ref.children,
     delayTime = _ref.delayTime,
     excludes = _ref.excludes,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var _useStep = (0, _index.useStep)(),
-    notify = _useStep.notify;
+    notify = _useStep.notify,
+    registerMap = _useStep.registerMap;
   return /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
     onClick: (0, _lodash.throttle)(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
-      var values;
+      var values, loadedMap;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -53,6 +71,7 @@ var _default = exports.default = function _default(_ref) {
             });
           case 3:
             values = _context.sent;
+            loadedMap = getLoadedMap(registerMap);
             setTimeout(function () {
               var localData = localStorage.getItem('cache-pro-step');
               var _ref3 = findFirstErrorDom() || {},
@@ -62,10 +81,10 @@ var _default = exports.default = function _default(_ref) {
               }
               if (localData !== 'false') {
                 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);
+                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, areAllModulesLoaded(loadedMap), loadedMap);
               }
             }, delayTime !== null && delayTime !== void 0 ? delayTime : 0);
-          case 5:
+          case 6:
           case "end":
             return _context.stop();
         }

package/lib/ProStep/index.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="react" />
+import Item from './components/Item';
 import { ProStepPropsType } from './propsType';
 import './style/index.less';
 export declare const ProStepContext: import("react").Context<any>;
@@ -6,7 +7,7 @@ export declare const useStep: () => any;
 declare const ProStep: {
     ({ children, ...resetProps }: ProStepPropsType): import("react/jsx-runtime").JSX.Element;
     useStep: () => any;
-    Item: ({ id, title, collapse: collapseItem, children, ...restProps }: import("./propsType").ProStepItemPropsType) => import("react/jsx-runtime").JSX.Element;
+    Item: typeof Item;
     Listener: ({ children, delayTime, excludes, ...props }: any) => import("react").DetailedReactHTMLElement<any, HTMLElement>;
 };
 export default ProStep;

package/lib/ProStep/index.js

@@ -30,10 +30,12 @@ var ProStep = function ProStep(_ref) {
   var _useState = (0, _react.useState)({}),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     reRender = _useState2[1];
-  var _useSetState = (0, _ahooks.useSetState)({}),
+  var _useSetState = (0, _ahooks.useSetState)({
+      errorCollection: {}
+    }),
     _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
-    errorCollection = _useSetState2[0],
-    setErrorCollection = _useSetState2[1];
+    errorCollection = _useSetState2[0].errorCollection,
+    setState = _useSetState2[1];
   // 注册子节点id与title映射的集合
   var registerMap = (0, _react.useRef)({});
   var _useLocalStorageState = (0, _ahooks.useLocalStorageState)('cache-pro-step'),
@@ -78,8 +80,10 @@ var ProStep = function ProStep(_ref) {
       title = _ref4.title,
       validator = _ref4.validator,
       order = _ref4.order,
-      disabled = _ref4.disabled;
+      disabled = _ref4.disabled,
+      lazyLoad = _ref4.lazyLoad;
     var record = {};
+    record.id = id;
     record.title = title;
     record.order = order;
     if (!registerMap.current[id]) {
@@ -162,7 +166,9 @@ var ProStep = function ProStep(_ref) {
                 errorFields = _ref8.errorFields;
               nextErrorCollection[id] = (errorFields === null || errorFields === void 0 ? void 0 : errorFields.length) || 0;
             });
-            setErrorCollection(nextErrorCollection);
+            setState({
+              errorCollection: nextErrorCollection
+            });
             return _context2.abrupt("return", res);
           case 11:
           case "end":
@@ -197,7 +203,9 @@ var ProStep = function ProStep(_ref) {
                 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);
+            setState({
+              errorCollection: nextErrorCollection
+            });
             return _context3.abrupt("return", result);
           case 9:
           case "end":
@@ -227,6 +235,7 @@ var ProStep = function ProStep(_ref) {
   }, [errorCollection, dataSource]);
   return (0, _jsxRuntime.jsx)(ProStepContext.Provider, {
     value: {
+      registerMap: registerMap,
       collapse: collapse,
       register: register,
       notify: notify,

package/package.json

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