rxtutils 1.1.2-beta.18 → 1.1.2-beta.19
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.
|
@@ -26,7 +26,7 @@ var BaseValidator = /** @class */ (function () {
|
|
|
26
26
|
BaseValidator.prototype.validate = function (itemKey, itemAll) {
|
|
27
27
|
if (itemAll === void 0) { itemAll = false; }
|
|
28
28
|
var validatorMap = this[this.__keySymbol];
|
|
29
|
-
var errors =
|
|
29
|
+
var errors = {};
|
|
30
30
|
// 校验每个 key
|
|
31
31
|
var validators = validatorMap[itemKey];
|
|
32
32
|
if (!validators) {
|
|
@@ -36,7 +36,12 @@ var BaseValidator = /** @class */ (function () {
|
|
|
36
36
|
var validator = validators_1[_i];
|
|
37
37
|
var res = validator(this[itemKey]);
|
|
38
38
|
if (!res.status) {
|
|
39
|
-
|
|
39
|
+
if (Array.isArray(errors[res.name])) {
|
|
40
|
+
errors[res.name].push(res.message);
|
|
41
|
+
}
|
|
42
|
+
else {
|
|
43
|
+
errors[res.name] = [res.message];
|
|
44
|
+
}
|
|
40
45
|
if (!itemAll)
|
|
41
46
|
break;
|
|
42
47
|
}
|
|
@@ -57,7 +62,7 @@ var BaseValidator = /** @class */ (function () {
|
|
|
57
62
|
if (itemAll === void 0) { itemAll = false; }
|
|
58
63
|
if (everyItem === void 0) { everyItem = false; }
|
|
59
64
|
var validatorMap = this[this.__keySymbol];
|
|
60
|
-
var errors =
|
|
65
|
+
var errors = {};
|
|
61
66
|
// 校验每个 key
|
|
62
67
|
var keys = order || Object.keys(validatorMap);
|
|
63
68
|
for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
|
|
@@ -69,7 +74,12 @@ var BaseValidator = /** @class */ (function () {
|
|
|
69
74
|
var fn = fns_1[_a];
|
|
70
75
|
var res = fn(value);
|
|
71
76
|
if (!res.status) {
|
|
72
|
-
|
|
77
|
+
if (Array.isArray(errors[res.name])) {
|
|
78
|
+
errors[res.name].push(res.message);
|
|
79
|
+
}
|
|
80
|
+
else {
|
|
81
|
+
errors[res.name] = [res.message];
|
|
82
|
+
}
|
|
73
83
|
if (!itemAll)
|
|
74
84
|
break;
|
|
75
85
|
}
|
|
@@ -130,7 +140,7 @@ var BaseValidator = /** @class */ (function () {
|
|
|
130
140
|
var validator = function (val) {
|
|
131
141
|
var validateStatus = func(val, value, context);
|
|
132
142
|
if (validateStatus) {
|
|
133
|
-
return { status: true };
|
|
143
|
+
return { name: name, status: true };
|
|
134
144
|
}
|
|
135
145
|
else {
|
|
136
146
|
var msg = "";
|
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
* @returns 包含验证状态和可选错误消息的对象
|
|
5
5
|
*/
|
|
6
6
|
type Validator = (val: any) => {
|
|
7
|
+
name: string;
|
|
7
8
|
status: boolean;
|
|
8
9
|
message?: string;
|
|
9
10
|
};
|
|
@@ -35,10 +36,7 @@ declare class BaseValidator {
|
|
|
35
36
|
* @param itemAll 是否验证所有规则，为true时会验证该字段的所有规则，为false时遇到第一个失败的规则就停止
|
|
36
37
|
* @returns 验证错误数组，如果没有错误则返回null
|
|
37
38
|
*/
|
|
38
|
-
validate(itemKey: string, itemAll?: boolean):
|
|
39
|
-
status: boolean;
|
|
40
|
-
message?: string;
|
|
41
|
-
}[];
|
|
39
|
+
validate(itemKey: string, itemAll?: boolean): Record<string, string[]>;
|
|
42
40
|
/**
|
|
43
41
|
* 验证多个或所有字段
|
|
44
42
|
* @param itemAll 是否验证每个字段的所有规则，为true时会验证字段的所有规则，为false时遇到第一个失败的规则就停止
|
|
@@ -46,10 +44,7 @@ declare class BaseValidator {
|
|
|
46
44
|
* @param order 验证字段的顺序，可以指定验证的字段名数组及其顺序
|
|
47
45
|
* @returns 验证错误数组，如果没有错误则返回null
|
|
48
46
|
*/
|
|
49
|
-
validateAll(itemAll?: boolean, everyItem?: boolean, order?: string[]):
|
|
50
|
-
status: boolean;
|
|
51
|
-
message?: string;
|
|
52
|
-
}[];
|
|
47
|
+
validateAll(itemAll?: boolean, everyItem?: boolean, order?: string[]): Record<string, string[]>;
|
|
53
48
|
/**
|
|
54
49
|
* 装饰器创建器
|
|
55
50
|
* 用于创建属性验证装饰器的工厂函数
|
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
* @returns 包含验证状态和可选错误消息的对象
|
|
5
5
|
*/
|
|
6
6
|
type Validator = (val: any) => {
|
|
7
|
+
name: string;
|
|
7
8
|
status: boolean;
|
|
8
9
|
message?: string;
|
|
9
10
|
};
|
|
@@ -35,10 +36,7 @@ declare class BaseValidator {
|
|
|
35
36
|
* @param itemAll 是否验证所有规则，为true时会验证该字段的所有规则，为false时遇到第一个失败的规则就停止
|
|
36
37
|
* @returns 验证错误数组，如果没有错误则返回null
|
|
37
38
|
*/
|
|
38
|
-
validate(itemKey: string, itemAll?: boolean):
|
|
39
|
-
status: boolean;
|
|
40
|
-
message?: string;
|
|
41
|
-
}[];
|
|
39
|
+
validate(itemKey: string, itemAll?: boolean): Record<string, string[]>;
|
|
42
40
|
/**
|
|
43
41
|
* 验证多个或所有字段
|
|
44
42
|
* @param itemAll 是否验证每个字段的所有规则，为true时会验证字段的所有规则，为false时遇到第一个失败的规则就停止
|
|
@@ -46,10 +44,7 @@ declare class BaseValidator {
|
|
|
46
44
|
* @param order 验证字段的顺序，可以指定验证的字段名数组及其顺序
|
|
47
45
|
* @returns 验证错误数组，如果没有错误则返回null
|
|
48
46
|
*/
|
|
49
|
-
validateAll(itemAll?: boolean, everyItem?: boolean, order?: string[]):
|
|
50
|
-
status: boolean;
|
|
51
|
-
message?: string;
|
|
52
|
-
}[];
|
|
47
|
+
validateAll(itemAll?: boolean, everyItem?: boolean, order?: string[]): Record<string, string[]>;
|
|
53
48
|
/**
|
|
54
49
|
* 装饰器创建器
|
|
55
50
|
* 用于创建属性验证装饰器的工厂函数
|
|
@@ -24,7 +24,7 @@ var BaseValidator = /** @class */ (function () {
|
|
|
24
24
|
BaseValidator.prototype.validate = function (itemKey, itemAll) {
|
|
25
25
|
if (itemAll === void 0) { itemAll = false; }
|
|
26
26
|
var validatorMap = this[this.__keySymbol];
|
|
27
|
-
var errors =
|
|
27
|
+
var errors = {};
|
|
28
28
|
// 校验每个 key
|
|
29
29
|
var validators = validatorMap[itemKey];
|
|
30
30
|
if (!validators) {
|
|
@@ -34,7 +34,12 @@ var BaseValidator = /** @class */ (function () {
|
|
|
34
34
|
var validator = validators_1[_i];
|
|
35
35
|
var res = validator(this[itemKey]);
|
|
36
36
|
if (!res.status) {
|
|
37
|
-
|
|
37
|
+
if (Array.isArray(errors[res.name])) {
|
|
38
|
+
errors[res.name].push(res.message);
|
|
39
|
+
}
|
|
40
|
+
else {
|
|
41
|
+
errors[res.name] = [res.message];
|
|
42
|
+
}
|
|
38
43
|
if (!itemAll)
|
|
39
44
|
break;
|
|
40
45
|
}
|
|
@@ -55,7 +60,7 @@ var BaseValidator = /** @class */ (function () {
|
|
|
55
60
|
if (itemAll === void 0) { itemAll = false; }
|
|
56
61
|
if (everyItem === void 0) { everyItem = false; }
|
|
57
62
|
var validatorMap = this[this.__keySymbol];
|
|
58
|
-
var errors =
|
|
63
|
+
var errors = {};
|
|
59
64
|
// 校验每个 key
|
|
60
65
|
var keys = order || Object.keys(validatorMap);
|
|
61
66
|
for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
|
|
@@ -67,7 +72,12 @@ var BaseValidator = /** @class */ (function () {
|
|
|
67
72
|
var fn = fns_1[_a];
|
|
68
73
|
var res = fn(value);
|
|
69
74
|
if (!res.status) {
|
|
70
|
-
|
|
75
|
+
if (Array.isArray(errors[res.name])) {
|
|
76
|
+
errors[res.name].push(res.message);
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
errors[res.name] = [res.message];
|
|
80
|
+
}
|
|
71
81
|
if (!itemAll)
|
|
72
82
|
break;
|
|
73
83
|
}
|
|
@@ -128,7 +138,7 @@ var BaseValidator = /** @class */ (function () {
|
|
|
128
138
|
var validator = function (val) {
|
|
129
139
|
var validateStatus = func(val, value, context);
|
|
130
140
|
if (validateStatus) {
|
|
131
|
-
return { status: true };
|
|
141
|
+
return { name: name, status: true };
|
|
132
142
|
}
|
|
133
143
|
else {
|
|
134
144
|
var msg = "";
|