@zat-design/sisyphus-react 3.7.2-beta.3 → 3.7.2-beta.5

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 (7) hide show
  1. package/es/ProEditTable/utils/getDefaultProps.js +2 -1
  2. package/es/ProForm/utils/rulesCreator.d.ts +1 -1
  3. package/es/ProForm/utils/rulesCreator.js +25 -22
  4. package/lib/ProEditTable/utils/getDefaultProps.js +3 -1
  5. package/lib/ProForm/utils/rulesCreator.d.ts +1 -1
  6. package/lib/ProForm/utils/rulesCreator.js +25 -22
  7. package/package.json +1 -1
package/es/ProEditTable/utils/getDefaultProps.js CHANGED
@@ -1,3 +1,4 @@
1
+ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
1
2
  import { get, isEqual } from 'lodash';
2
3
  var defaultPropsMap = {
3
4
  ProSelect: function ProSelect(props) {
@@ -9,7 +10,7 @@ var defaultPropsMap = {
9
10
  var defaultProps = {};
10
11
  // formList场景传入列表过滤时
11
12
  if (filterInList && namePath && name) {
12
- var _namePath = namePath.slice(2, namePath.length - 1);
13
+ var _namePath = _toConsumableArray(namePath).splice(2, namePath.length - 1);
13
14
  defaultProps.shouldUpdate = function (preValues, curValues) {
14
15
  var _get, _get$map, _get2, _get2$map;
15
16
  var preListValue = (_get = get(preValues, name)) === null || _get === void 0 ? void 0 : (_get$map = _get.map) === null || _get$map === void 0 ? void 0 : _get$map.call(_get, function (item) {
package/es/ProForm/utils/rulesCreator.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  export declare const rulesCreator: ({ rules, label, isSelect, names, required }: {
2
- rules: any;
2
+ rules?: any[];
3
3
  label: any;
4
4
  isSelect: any;
5
5
  names: any;
package/es/ProForm/utils/rulesCreator.js CHANGED
@@ -14,35 +14,38 @@ var getNonEmptyValuesByIndex = function getNonEmptyValuesByIndex(required, value
14
14
  };
15
15
  export var rulesCreator = function rulesCreator(_ref) {
16
16
  var _result;
17
- var rules = _ref.rules,
17
+ var _ref$rules = _ref.rules,
18
+ rules = _ref$rules === void 0 ? [] : _ref$rules,
18
19
  label = _ref.label,
19
20
  isSelect = _ref.isSelect,
20
21
  names = _ref.names,
21
22
  required = _ref.required;
22
23
  var message = "".concat(isSelect ? "".concat(locale.ProForm.selectPlaceHolder) : "".concat(locale.ProForm.inputPlaceholder)).concat(locale.ProForm.ruleText).concat(isString(label) ? label : '');
23
24
  var result = [];
24
- result = rules.map(function (ruleItem) {
25
- var rule = _objectSpread({}, ruleItem);
26
- if (rule instanceof Object && 'type' in rule) {
27
- if (Object.keys(regExp).includes(rule.type)) {
28
- rule.validator = function (rule, value) {
29
- if (!isNullValue(value) && !regExp[rule.type].test(value)) {
30
- return Promise.reject(new Error(rule.message || message));
31
- }
32
- return Promise.resolve();
33
- };
34
- }
35
- if (Object.keys(validate).includes(rule.type)) {
36
- rule.validator = function (rule, value) {
37
- if (!isNullValue(value) && !validate[rule.type](value)) {
38
- return Promise.reject(new Error(rule.message || message));
39
- }
40
- return Promise.resolve();
41
- };
25
+ if (Array.isArray(rules)) {
26
+ result = rules.map(function (ruleItem) {
27
+ var rule = _objectSpread({}, ruleItem);
28
+ if (rule instanceof Object && 'type' in rule) {
29
+ if (Object.keys(regExp).includes(rule.type)) {
30
+ rule.validator = function (rule, value) {
31
+ if (!isNullValue(value) && !regExp[rule.type].test(value)) {
32
+ return Promise.reject(new Error(rule.message || message));
33
+ }
34
+ return Promise.resolve();
35
+ };
36
+ }
37
+ if (Object.keys(validate).includes(rule.type)) {
38
+ rule.validator = function (rule, value) {
39
+ if (!isNullValue(value) && !validate[rule.type](value)) {
40
+ return Promise.reject(new Error(rule.message || message));
41
+ }
42
+ return Promise.resolve();
43
+ };
44
+ }
42
45
  }
43
- }
44
- return rule;
45
- });
46
+ return rule;
47
+ });
48
+ }
46
49
  if ((names === null || names === void 0 ? void 0 : names.length) && (required === null || required === void 0 ? void 0 : required.length)) {
47
50
  var customRequired = {
48
51
  validator: function validator(rules, value) {
package/lib/ProEditTable/utils/getDefaultProps.js CHANGED
@@ -1,9 +1,11 @@
1
1
  "use strict";
2
2
 
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
3
4
  Object.defineProperty(exports, "__esModule", {
4
5
  value: true
5
6
  });
6
7
  exports.getDefaultProps = void 0;
8
+ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
7
9
  var _lodash = require("lodash");
8
10
  var defaultPropsMap = {
9
11
  ProSelect: function ProSelect(props) {
@@ -15,7 +17,7 @@ var defaultPropsMap = {
15
17
  var defaultProps = {};
16
18
  // formList场景传入列表过滤时
17
19
  if (filterInList && namePath && name) {
18
- var _namePath = namePath.slice(2, namePath.length - 1);
20
+ var _namePath = (0, _toConsumableArray2.default)(namePath).splice(2, namePath.length - 1);
19
21
  defaultProps.shouldUpdate = function (preValues, curValues) {
20
22
  var _get, _get$map, _get2, _get2$map;
21
23
  var preListValue = (_get = (0, _lodash.get)(preValues, name)) === null || _get === void 0 ? void 0 : (_get$map = _get.map) === null || _get$map === void 0 ? void 0 : _get$map.call(_get, function (item) {
package/lib/ProForm/utils/rulesCreator.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  export declare const rulesCreator: ({ rules, label, isSelect, names, required }: {
2
- rules: any;
2
+ rules?: any[];
3
3
  label: any;
4
4
  isSelect: any;
5
5
  names: any;
package/lib/ProForm/utils/rulesCreator.js CHANGED
@@ -22,35 +22,38 @@ var getNonEmptyValuesByIndex = function getNonEmptyValuesByIndex(required, value
22
22
  };
23
23
  var rulesCreator = exports.rulesCreator = function rulesCreator(_ref) {
24
24
  var _result;
25
- var rules = _ref.rules,
25
+ var _ref$rules = _ref.rules,
26
+ rules = _ref$rules === void 0 ? [] : _ref$rules,
26
27
  label = _ref.label,
27
28
  isSelect = _ref.isSelect,
28
29
  names = _ref.names,
29
30
  required = _ref.required;
30
31
  var message = "".concat(isSelect ? "".concat(_locale.default.ProForm.selectPlaceHolder) : "".concat(_locale.default.ProForm.inputPlaceholder)).concat(_locale.default.ProForm.ruleText).concat((0, _lodash.isString)(label) ? label : '');
31
32
  var result = [];
32
- result = rules.map(function (ruleItem) {
33
- var rule = (0, _objectSpread2.default)({}, ruleItem);
34
- if (rule instanceof Object && 'type' in rule) {
35
- if (Object.keys(_utils.regExp).includes(rule.type)) {
36
- rule.validator = function (rule, value) {
37
- if (!(0, _index.isNullValue)(value) && !_utils.regExp[rule.type].test(value)) {
38
- return Promise.reject(new Error(rule.message || message));
39
- }
40
- return Promise.resolve();
41
- };
42
- }
43
- if (Object.keys(_utils.validate).includes(rule.type)) {
44
- rule.validator = function (rule, value) {
45
- if (!(0, _index.isNullValue)(value) && !_utils.validate[rule.type](value)) {
46
- return Promise.reject(new Error(rule.message || message));
47
- }
48
- return Promise.resolve();
49
- };
33
+ if (Array.isArray(rules)) {
34
+ result = rules.map(function (ruleItem) {
35
+ var rule = (0, _objectSpread2.default)({}, ruleItem);
36
+ if (rule instanceof Object && 'type' in rule) {
37
+ if (Object.keys(_utils.regExp).includes(rule.type)) {
38
+ rule.validator = function (rule, value) {
39
+ if (!(0, _index.isNullValue)(value) && !_utils.regExp[rule.type].test(value)) {
40
+ return Promise.reject(new Error(rule.message || message));
41
+ }
42
+ return Promise.resolve();
43
+ };
44
+ }
45
+ if (Object.keys(_utils.validate).includes(rule.type)) {
46
+ rule.validator = function (rule, value) {
47
+ if (!(0, _index.isNullValue)(value) && !_utils.validate[rule.type](value)) {
48
+ return Promise.reject(new Error(rule.message || message));
49
+ }
50
+ return Promise.resolve();
51
+ };
52
+ }
50
53
  }
51
- }
52
- return rule;
53
- });
54
+ return rule;
55
+ });
56
+ }
54
57
  if ((names === null || names === void 0 ? void 0 : names.length) && (required === null || required === void 0 ? void 0 : required.length)) {
55
58
  var customRequired = {
56
59
  validator: function validator(rules, value) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.7.2-beta.3",
3
+ "version": "3.7.2-beta.5",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",