cvitool 1.0.755 → 1.0.756
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.
- package/build/src/cutil.d.ts +2 -1
- package/build/src/cutil.js +3 -2
- package/package.json +1 -1
- package/src/cutil.ts +4 -3
package/build/src/cutil.d.ts
CHANGED
|
@@ -15,7 +15,7 @@ interface getMediaFileTypeRes {
|
|
|
15
15
|
extname: 'jpg' | 'png' | 'webp' | 'bmp' | 'heic' | 'gif' | 'mp3' | 'wav' | 'pcm' | 'flac' | 'm4a' | 'aac' | 'mp4' | 'mov' | 'flv' | 'mkv' | 'avi' | 'webm' | 'ogg' | 'm4v' | 'wmv' | 'unknow';
|
|
16
16
|
}
|
|
17
17
|
interface validateParams {
|
|
18
|
-
required
|
|
18
|
+
required?: boolean;
|
|
19
19
|
type: 'string' | 'number' | 'boolean' | 'object' | 'array';
|
|
20
20
|
allowEmpty?: boolean;
|
|
21
21
|
allowNull?: boolean;
|
|
@@ -39,6 +39,7 @@ declare const RegStr: {
|
|
|
39
39
|
emali: string;
|
|
40
40
|
mobilePhoneNumber: string;
|
|
41
41
|
idNumber: string;
|
|
42
|
+
mongoId: string;
|
|
42
43
|
};
|
|
43
44
|
/**
|
|
44
45
|
* 获取一个随机字符串
|
package/build/src/cutil.js
CHANGED
|
@@ -37,7 +37,8 @@ const RegStr = {
|
|
|
37
37
|
url: '^(https?)://([a-z\\d-]+)(\\.[a-z\\d-]+)*/\\S*$',
|
|
38
38
|
emali: '^\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*$',
|
|
39
39
|
mobilePhoneNumber: '^1[3-9]\\d{9}$',
|
|
40
|
-
idNumber: '^\\d{17}[\\dXx]$'
|
|
40
|
+
idNumber: '^\\d{17}[\\dXx]$',
|
|
41
|
+
mongoId: '^[a-f\\d]{24}$'
|
|
41
42
|
};
|
|
42
43
|
exports.RegStr = RegStr;
|
|
43
44
|
/**
|
|
@@ -405,7 +406,7 @@ function validate(value, rule) {
|
|
|
405
406
|
const filedValidate = rule[filedName];
|
|
406
407
|
const filedValue = value[filedName];
|
|
407
408
|
result.field = filedName;
|
|
408
|
-
const { required, type, allowEmpty = false, allowNull = false, enums = [], regex, subType, subValidate, range } = filedValidate;
|
|
409
|
+
const { required = true, type, allowEmpty = false, allowNull = false, enums = [], regex, subType, subValidate, range } = filedValidate;
|
|
409
410
|
if (required && filedValue === undefined) {
|
|
410
411
|
result.message = 'filed required';
|
|
411
412
|
result.pass = false;
|
package/package.json
CHANGED
package/src/cutil.ts
CHANGED
|
@@ -31,7 +31,7 @@ interface getMediaFileTypeRes {
|
|
|
31
31
|
}
|
|
32
32
|
|
|
33
33
|
interface validateParams {
|
|
34
|
-
required
|
|
34
|
+
required?: boolean,
|
|
35
35
|
type: 'string' | 'number' | 'boolean' | 'object' | 'array',
|
|
36
36
|
allowEmpty?: boolean,
|
|
37
37
|
allowNull?: boolean,
|
|
@@ -53,7 +53,8 @@ const RegStr = {
|
|
|
53
53
|
url: '^(https?)://([a-z\\d-]+)(\\.[a-z\\d-]+)*/\\S*$',
|
|
54
54
|
emali: '^\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*$',
|
|
55
55
|
mobilePhoneNumber: '^1[3-9]\\d{9}$',
|
|
56
|
-
idNumber: '^\\d{17}[\\dXx]$'
|
|
56
|
+
idNumber: '^\\d{17}[\\dXx]$',
|
|
57
|
+
mongoId: '^[a-f\\d]{24}$'
|
|
57
58
|
};
|
|
58
59
|
|
|
59
60
|
/**
|
|
@@ -421,7 +422,7 @@ function validate(value: { [key: string]: any }, rule: { [key: string]: validate
|
|
|
421
422
|
const filedValidate = rule[filedName];
|
|
422
423
|
const filedValue = value[filedName];
|
|
423
424
|
result.field = filedName;
|
|
424
|
-
const { required, type, allowEmpty = false, allowNull = false, enums = [], regex, subType, subValidate, range } = filedValidate;
|
|
425
|
+
const { required = true, type, allowEmpty = false, allowNull = false, enums = [], regex, subType, subValidate, range } = filedValidate;
|
|
425
426
|
if (required && filedValue === undefined) {
|
|
426
427
|
result.message = 'filed required';
|
|
427
428
|
result.pass = false;
|