@zat-design/sisyphus-react 3.11.2 → 3.11.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -5,6 +5,7 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
5
5
  var _excluded = ["children", "delayTime", "excludes"];
6
6
  import { throttle } from 'lodash';
7
7
  import React from 'react';
8
+ import { forceVisible } from 'react-lazyload';
8
9
  import { useStep } from '../../index';
9
10
  import { getLoadedMap } from '../../utils';
10
11
  var checkErrorList = function checkErrorList(arr) {
@@ -43,18 +44,30 @@ export default (function (_ref) {
43
44
  registerMap = _useStep.registerMap;
44
45
  return /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, props), {}, {
45
46
  onClick: throttle(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
46
- var values, loadedMap;
47
+ var loadedMap, loaded, values;
47
48
  return _regeneratorRuntime().wrap(function _callee$(_context) {
48
49
  while (1) switch (_context.prev = _context.next) {
49
50
  case 0:
50
51
  localStorage.setItem('cache-pro-step', '');
51
- _context.next = 3;
52
+ loadedMap = getLoadedMap(registerMap);
53
+ loaded = areAllModulesLoaded(loadedMap); // 存在lazyload模块时,全局按钮执行全加载
54
+ if (loaded) {
55
+ _context.next = 7;
56
+ break;
57
+ }
58
+ forceVisible();
59
+ // 等待0.2秒,让dom渲染做form校验
60
+ _context.next = 7;
61
+ return new Promise(function (resolve) {
62
+ return setTimeout(resolve, 200);
63
+ });
64
+ case 7:
65
+ _context.next = 9;
52
66
  return notify === null || notify === void 0 ? void 0 : notify({
53
67
  excludes: excludes
54
68
  });
55
- case 3:
69
+ case 9:
56
70
  values = _context.sent;
57
- loadedMap = getLoadedMap(registerMap);
58
71
  setTimeout(function () {
59
72
  var localData = localStorage.getItem('cache-pro-step');
60
73
  var _ref3 = findFirstErrorDom() || {},
@@ -64,10 +77,11 @@ export default (function (_ref) {
64
77
  }
65
78
  if (localData !== 'false') {
66
79
  var _children$props, _children$props$onCli;
67
- 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);
80
+ 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);
68
81
  }
69
82
  }, delayTime !== null && delayTime !== void 0 ? delayTime : 0);
70
- case 6:
83
+ return _context.abrupt("return", null);
84
+ case 12:
71
85
  case "end":
72
86
  return _context.stop();
73
87
  }
@@ -11,6 +11,7 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
11
11
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
12
12
  var _lodash = require("lodash");
13
13
  var _react = _interopRequireDefault(require("react"));
14
+ var _reactLazyload = require("react-lazyload");
14
15
  var _index = require("../../index");
15
16
  var _utils = require("../../utils");
16
17
  var _excluded = ["children", "delayTime", "excludes"];
@@ -50,18 +51,30 @@ var _default = exports.default = function _default(_ref) {
50
51
  registerMap = _useStep.registerMap;
51
52
  return /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
52
53
  onClick: (0, _lodash.throttle)(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
53
- var values, loadedMap;
54
+ var loadedMap, loaded, values;
54
55
  return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
55
56
  while (1) switch (_context.prev = _context.next) {
56
57
  case 0:
57
58
  localStorage.setItem('cache-pro-step', '');
58
- _context.next = 3;
59
+ loadedMap = (0, _utils.getLoadedMap)(registerMap);
60
+ loaded = areAllModulesLoaded(loadedMap); // 存在lazyload模块时,全局按钮执行全加载
61
+ if (loaded) {
62
+ _context.next = 7;
63
+ break;
64
+ }
65
+ (0, _reactLazyload.forceVisible)();
66
+ // 等待0.2秒,让dom渲染做form校验
67
+ _context.next = 7;
68
+ return new Promise(function (resolve) {
69
+ return setTimeout(resolve, 200);
70
+ });
71
+ case 7:
72
+ _context.next = 9;
59
73
  return notify === null || notify === void 0 ? void 0 : notify({
60
74
  excludes: excludes
61
75
  });
62
- case 3:
76
+ case 9:
63
77
  values = _context.sent;
64
- loadedMap = (0, _utils.getLoadedMap)(registerMap);
65
78
  setTimeout(function () {
66
79
  var localData = localStorage.getItem('cache-pro-step');
67
80
  var _ref3 = findFirstErrorDom() || {},
@@ -71,10 +84,11 @@ var _default = exports.default = function _default(_ref) {
71
84
  }
72
85
  if (localData !== 'false') {
73
86
  var _children$props, _children$props$onCli;
74
- 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);
87
+ 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);
75
88
  }
76
89
  }, delayTime !== null && delayTime !== void 0 ? delayTime : 0);
77
- case 6:
90
+ return _context.abrupt("return", null);
91
+ case 12:
78
92
  case "end":
79
93
  return _context.stop();
80
94
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.11.2",
3
+ "version": "3.11.3",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",