@zat-design/sisyphus-react 3.5.0-beta.10 → 3.5.0-beta.12

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/ProForm/utils/useForm.js +14 -19
  2. package/lib/ProForm/utils/useForm.js +14 -19
  3. package/package.json +1 -1
package/es/ProForm/utils/useForm.js CHANGED
@@ -1,4 +1,5 @@
1
1
  import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
2
+ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
2
3
  import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
3
4
  import "antd/es/form/style";
4
5
  import _Form from "antd/es/form";
@@ -11,7 +12,6 @@ export var useForm = function useForm(originForm) {
11
12
  form = _Form$useForm2[0];
12
13
  var getFieldsValue = form.getFieldsValue,
13
14
  validateFields = form.validateFields,
14
- setFieldsValue = form.setFieldsValue,
15
15
  isModified = form.isModified;
16
16
  if (isModified) return [form];
17
17
  // @ts-ignore
@@ -23,13 +23,6 @@ export var useForm = function useForm(originForm) {
23
23
  }
24
24
  return getFieldsValue(nameList, filterFunc);
25
25
  };
26
- // const _setFieldsValue: FormInstance<T>['setFieldsValue'] = (data) => {
27
- // // 解决names通过set设置无法触发rc-field-form中onStoreChange的问题
28
- // setTimeout(() => {
29
- // const baseData = getFieldsValue(true);
30
- // setFieldsValue({ ...baseData, ...data });
31
- // }, 0);
32
- // };
33
26
  var _validateFields = /*#__PURE__*/function () {
34
27
  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(nameList) {
35
28
  var _rest$,
@@ -54,7 +47,7 @@ export var useForm = function useForm(originForm) {
54
47
  isRecursive = rest === null || rest === void 0 ? void 0 : (_rest$ = rest[0]) === null || _rest$ === void 0 ? void 0 : _rest$.recursive;
55
48
  validateNames = []; // 前缀校验模式
56
49
  if (!isRecursive) {
57
- _context.next = 12;
50
+ _context.next = 13;
58
51
  break;
59
52
  }
60
53
  // @ts-ignore
@@ -66,23 +59,26 @@ export var useForm = function useForm(originForm) {
66
59
  validateNames.push(item.name);
67
60
  }
68
61
  });
62
+ if (Array.isArray(nameList) && nameList.length && !validateNames.length) {
63
+ validateNames = _toConsumableArray(nameList);
64
+ }
69
65
  // @ts-ignore
70
66
  delete rest[0].recursive;
71
- _context.next = 11;
67
+ _context.next = 12;
72
68
  return validateFields.apply(void 0, [validateNames].concat(rest)).then(function (values) {
73
69
  return filterInternalFields(values);
74
70
  });
75
- case 11:
76
- return _context.abrupt("return", _context.sent);
77
71
  case 12:
78
- _context.next = 14;
72
+ return _context.abrupt("return", _context.sent);
73
+ case 13:
74
+ _context.next = 15;
79
75
  return validateFields.apply(void 0, [nameList].concat(rest)).then(function (values) {
80
76
  return nameList ? values : _getFieldsValue();
81
77
  });
82
- case 14:
78
+ case 15:
83
79
  return _context.abrupt("return", _context.sent);
84
- case 17:
85
- _context.prev = 17;
80
+ case 18:
81
+ _context.prev = 18;
86
82
  _context.t0 = _context["catch"](0);
87
83
  if (_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.errorFields) {
88
84
  form.scrollToField((_error$errorFields$ = _context.t0.errorFields[0]) === null || _error$errorFields$ === void 0 ? void 0 : _error$errorFields$.name, {
@@ -92,11 +88,11 @@ export var useForm = function useForm(originForm) {
92
88
  }
93
89
  handleScrollToError();
94
90
  throw _context.t0;
95
- case 22:
91
+ case 23:
96
92
  case "end":
97
93
  return _context.stop();
98
94
  }
99
- }, _callee, null, [[0, 17]]);
95
+ }, _callee, null, [[0, 18]]);
100
96
  }));
101
97
  return function _validateFields(_x) {
102
98
  return _ref.apply(this, arguments);
@@ -105,6 +101,5 @@ export var useForm = function useForm(originForm) {
105
101
  form.getFieldsValue = _getFieldsValue;
106
102
  form.validateFields = _validateFields;
107
103
  form.isModified = true;
108
- // form.setFieldsValue = _setFieldsValue;
109
104
  return [form];
110
105
  };
package/lib/ProForm/utils/useForm.js CHANGED
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
6
6
  });
7
7
  exports.useForm = void 0;
8
8
  var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
9
+ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
9
10
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
10
11
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
11
12
  var _antd = require("antd");
@@ -17,7 +18,6 @@ var useForm = exports.useForm = function useForm(originForm) {
17
18
  form = _Form$useForm2[0];
18
19
  var getFieldsValue = form.getFieldsValue,
19
20
  validateFields = form.validateFields,
20
- setFieldsValue = form.setFieldsValue,
21
21
  isModified = form.isModified;
22
22
  if (isModified) return [form];
23
23
  // @ts-ignore
@@ -29,13 +29,6 @@ var useForm = exports.useForm = function useForm(originForm) {
29
29
  }
30
30
  return getFieldsValue(nameList, filterFunc);
31
31
  };
32
- // const _setFieldsValue: FormInstance<T>['setFieldsValue'] = (data) => {
33
- // // 解决names通过set设置无法触发rc-field-form中onStoreChange的问题
34
- // setTimeout(() => {
35
- // const baseData = getFieldsValue(true);
36
- // setFieldsValue({ ...baseData, ...data });
37
- // }, 0);
38
- // };
39
32
  var _validateFields = /*#__PURE__*/function () {
40
33
  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(nameList) {
41
34
  var _rest$,
@@ -60,7 +53,7 @@ var useForm = exports.useForm = function useForm(originForm) {
60
53
  isRecursive = rest === null || rest === void 0 ? void 0 : (_rest$ = rest[0]) === null || _rest$ === void 0 ? void 0 : _rest$.recursive;
61
54
  validateNames = []; // 前缀校验模式
62
55
  if (!isRecursive) {
63
- _context.next = 12;
56
+ _context.next = 13;
64
57
  break;
65
58
  }
66
59
  // @ts-ignore
@@ -72,23 +65,26 @@ var useForm = exports.useForm = function useForm(originForm) {
72
65
  validateNames.push(item.name);
73
66
  }
74
67
  });
68
+ if (Array.isArray(nameList) && nameList.length && !validateNames.length) {
69
+ validateNames = (0, _toConsumableArray2.default)(nameList);
70
+ }
75
71
  // @ts-ignore
76
72
  delete rest[0].recursive;
77
- _context.next = 11;
73
+ _context.next = 12;
78
74
  return validateFields.apply(void 0, [validateNames].concat(rest)).then(function (values) {
79
75
  return (0, _index.filterInternalFields)(values);
80
76
  });
81
- case 11:
82
- return _context.abrupt("return", _context.sent);
83
77
  case 12:
84
- _context.next = 14;
78
+ return _context.abrupt("return", _context.sent);
79
+ case 13:
80
+ _context.next = 15;
85
81
  return validateFields.apply(void 0, [nameList].concat(rest)).then(function (values) {
86
82
  return nameList ? values : _getFieldsValue();
87
83
  });
88
- case 14:
84
+ case 15:
89
85
  return _context.abrupt("return", _context.sent);
90
- case 17:
91
- _context.prev = 17;
86
+ case 18:
87
+ _context.prev = 18;
92
88
  _context.t0 = _context["catch"](0);
93
89
  if (_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.errorFields) {
94
90
  form.scrollToField((_error$errorFields$ = _context.t0.errorFields[0]) === null || _error$errorFields$ === void 0 ? void 0 : _error$errorFields$.name, {
@@ -98,11 +94,11 @@ var useForm = exports.useForm = function useForm(originForm) {
98
94
  }
99
95
  (0, _tools.handleScrollToError)();
100
96
  throw _context.t0;
101
- case 22:
97
+ case 23:
102
98
  case "end":
103
99
  return _context.stop();
104
100
  }
105
- }, _callee, null, [[0, 17]]);
101
+ }, _callee, null, [[0, 18]]);
106
102
  }));
107
103
  return function _validateFields(_x) {
108
104
  return _ref.apply(this, arguments);
@@ -111,6 +107,5 @@ var useForm = exports.useForm = function useForm(originForm) {
111
107
  form.getFieldsValue = _getFieldsValue;
112
108
  form.validateFields = _validateFields;
113
109
  form.isModified = true;
114
- // form.setFieldsValue = _setFieldsValue;
115
110
  return [form];
116
111
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.5.0-beta.10",
3
+ "version": "3.5.0-beta.12",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",