@zat-design/sisyphus-react 3.7.2-beta.4 → 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.
|
@@ -22,28 +22,30 @@ export var rulesCreator = function rulesCreator(_ref) {
|
|
|
22
22
|
required = _ref.required;
|
|
23
23
|
var message = "".concat(isSelect ? "".concat(locale.ProForm.selectPlaceHolder) : "".concat(locale.ProForm.inputPlaceholder)).concat(locale.ProForm.ruleText).concat(isString(label) ? label : '');
|
|
24
24
|
var result = [];
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
if (Object
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
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
|
+
}
|
|
43
45
|
}
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
}
|
|
46
|
+
return rule;
|
|
47
|
+
});
|
|
48
|
+
}
|
|
47
49
|
if ((names === null || names === void 0 ? void 0 : names.length) && (required === null || required === void 0 ? void 0 : required.length)) {
|
|
48
50
|
var customRequired = {
|
|
49
51
|
validator: function validator(rules, value) {
|
|
@@ -30,28 +30,30 @@ var rulesCreator = exports.rulesCreator = function rulesCreator(_ref) {
|
|
|
30
30
|
required = _ref.required;
|
|
31
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 : '');
|
|
32
32
|
var result = [];
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
if (Object
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
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
|
+
}
|
|
51
53
|
}
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
}
|
|
54
|
+
return rule;
|
|
55
|
+
});
|
|
56
|
+
}
|
|
55
57
|
if ((names === null || names === void 0 ? void 0 : names.length) && (required === null || required === void 0 ? void 0 : required.length)) {
|
|
56
58
|
var customRequired = {
|
|
57
59
|
validator: function validator(rules, value) {
|