@zat-design/sisyphus-react 3.6.2-beta.5 → 3.6.2-beta.7

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.
Files changed (3) hide show
  1. package/es/ProStep/index.js +21 -6
  2. package/lib/ProStep/index.js +20 -5
  3. package/package.json +1 -1
package/es/ProStep/index.js CHANGED
@@ -1,11 +1,12 @@
1
1
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
2
2
  import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
3
3
  import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
4
+ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
4
5
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
5
6
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
6
7
  var _excluded = ["children"];
7
8
  import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
8
- import { createContext, useContext, useMemo, useRef } from 'react';
9
+ import { createContext, useContext, useMemo, useRef, useState } from 'react';
9
10
  import { useSetState, useLocalStorageState, useDeepCompareEffect } from 'ahooks';
10
11
  import { handleScroll } from './utils';
11
12
  import Step from './components/Step';
@@ -19,6 +20,10 @@ export var useStep = function useStep() {
19
20
  var ProStep = function ProStep(_ref) {
20
21
  var children = _ref.children,
21
22
  resetProps = _objectWithoutProperties(_ref, _excluded);
23
+ var _useState = useState([]),
24
+ _useState2 = _slicedToArray(_useState, 2),
25
+ ids = _useState2[0],
26
+ setIds = _useState2[1];
22
27
  var _useSetState = useSetState({}),
23
28
  _useSetState2 = _slicedToArray(_useSetState, 2),
24
29
  errorCollection = _useSetState2[0],
@@ -49,10 +54,13 @@ var ProStep = function ProStep(_ref) {
49
54
  name: title,
50
55
  order: order
51
56
  };
57
+ }).filter(function (item) {
58
+ var _ids$includes;
59
+ 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);
52
60
  }).sort(function (pre, next) {
53
61
  return pre.order - next.order;
54
62
  });
55
- }, [resetProps === null || resetProps === void 0 ? void 0 : resetProps.dataSource, registerMap.current]);
63
+ }, [resetProps === null || resetProps === void 0 ? void 0 : resetProps.dataSource, registerMap.current, ids]);
56
64
  // 用来注册form匹配到对应的模块id
57
65
  var register = function register(_ref4) {
58
66
  var id = _ref4.id,
@@ -64,13 +72,18 @@ var ProStep = function ProStep(_ref) {
64
72
  var record = {};
65
73
  record.title = title;
66
74
  record.order = order;
75
+ if (!ids.includes(id)) {
76
+ setIds(function (preState) {
77
+ return [].concat(_toConsumableArray(preState), [id]);
78
+ });
79
+ }
67
80
  if (disabled) {
68
81
  registerMap.current[id] = record;
69
82
  return null;
70
83
  }
71
84
  var subEvent = /*#__PURE__*/function () {
72
85
  var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
73
- var value, _form$validateFields;
86
+ var value, _form$validateFields, _error$errorFields;
74
87
  return _regeneratorRuntime().wrap(function _callee$(_context) {
75
88
  while (1) switch (_context.prev = _context.next) {
76
89
  case 0:
@@ -96,10 +109,12 @@ var ProStep = function ProStep(_ref) {
96
109
  case 14:
97
110
  _context.prev = 14;
98
111
  _context.t0 = _context["catch"](0);
99
- console.error(_context.t0);
100
- setLocalData(false);
112
+ 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) {
113
+ console.error(_context.t0);
114
+ setLocalData(false);
115
+ }
101
116
  return _context.abrupt("return", _context.t0);
102
- case 19:
117
+ case 18:
103
118
  case "end":
104
119
  return _context.stop();
105
120
  }
package/lib/ProStep/index.js CHANGED
@@ -8,6 +8,7 @@ exports.useStep = exports.default = exports.ProStepContext = void 0;
8
8
  var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
9
9
  var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
10
10
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
11
+ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
11
12
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
12
13
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
13
14
  var _jsxRuntime = require("react/jsx-runtime");
@@ -26,6 +27,10 @@ var useStep = exports.useStep = function useStep() {
26
27
  var ProStep = function ProStep(_ref) {
27
28
  var children = _ref.children,
28
29
  resetProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
30
+ var _useState = (0, _react.useState)([]),
31
+ _useState2 = (0, _slicedToArray2.default)(_useState, 2),
32
+ ids = _useState2[0],
33
+ setIds = _useState2[1];
29
34
  var _useSetState = (0, _ahooks.useSetState)({}),
30
35
  _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
31
36
  errorCollection = _useSetState2[0],
@@ -56,10 +61,13 @@ var ProStep = function ProStep(_ref) {
56
61
  name: title,
57
62
  order: order
58
63
  };
64
+ }).filter(function (item) {
65
+ var _ids$includes;
66
+ 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);
59
67
  }).sort(function (pre, next) {
60
68
  return pre.order - next.order;
61
69
  });
62
- }, [resetProps === null || resetProps === void 0 ? void 0 : resetProps.dataSource, registerMap.current]);
70
+ }, [resetProps === null || resetProps === void 0 ? void 0 : resetProps.dataSource, registerMap.current, ids]);
63
71
  // 用来注册form匹配到对应的模块id
64
72
  var register = function register(_ref4) {
65
73
  var id = _ref4.id,
@@ -71,13 +79,18 @@ var ProStep = function ProStep(_ref) {
71
79
  var record = {};
72
80
  record.title = title;
73
81
  record.order = order;
82
+ if (!ids.includes(id)) {
83
+ setIds(function (preState) {
84
+ return [].concat((0, _toConsumableArray2.default)(preState), [id]);
85
+ });
86
+ }
74
87
  if (disabled) {
75
88
  registerMap.current[id] = record;
76
89
  return null;
77
90
  }
78
91
  var subEvent = /*#__PURE__*/function () {
79
92
  var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
80
- var value, _form$validateFields;
93
+ var value, _form$validateFields, _error$errorFields;
81
94
  return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
82
95
  while (1) switch (_context.prev = _context.next) {
83
96
  case 0:
@@ -103,10 +116,12 @@ var ProStep = function ProStep(_ref) {
103
116
  case 14:
104
117
  _context.prev = 14;
105
118
  _context.t0 = _context["catch"](0);
106
- console.error(_context.t0);
107
- setLocalData(false);
119
+ 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) {
120
+ console.error(_context.t0);
121
+ setLocalData(false);
122
+ }
108
123
  return _context.abrupt("return", _context.t0);
109
- case 19:
124
+ case 18:
110
125
  case "end":
111
126
  return _context.stop();
112
127
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.6.2-beta.5",
3
+ "version": "3.6.2-beta.7",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",