cvitool 1.0.763 → 1.0.765

package/build/src/cutil.d.ts

@@ -32,7 +32,10 @@ interface validateParams {
     subValidate?: {
         [key: string]: validateParams;
     };
-    func?: (value: any) => boolean;
+    func?: (value: any) => {
+        pass: boolean;
+        message?: string;
+    };
 }
 declare const RegStr: {
     zzs: string;
@@ -48,6 +51,9 @@ declare const RegStr: {
     idNumber: string;
     mongoId: string;
     ratio: string;
+    date: string;
+    time: string;
+    dateTime: string;
 };
 /**
  * 获取一个随机字符串
@@ -146,7 +152,10 @@ declare function validate(value: {
     [key: string]: any;
 }, rule: {
     [key: string]: validateParams;
-}, finalFunc?: (value: any) => boolean): {
+}, finalFunc?: (value: any) => {
+    pass: boolean;
+    message?: string;
+}): {
     message: string;
     field: string;
     pass: boolean;

package/build/src/cutil.js

@@ -42,7 +42,10 @@ const RegStr = {
     mobilePhoneNumber: '^1[3-9]\\d{9}$',
     idNumber: '^\\d{17}[\\dXx]$',
     mongoId: '^[a-f\\d]{24}$',
-    ratio: '^[1-9]\\d?:[1-9]\\d?$'
+    ratio: '^[1-9]\\d?:[1-9]\\d?$',
+    date: '^\\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[12]\\d|3[01])$',
+    time: '^([01]\\d|2[0-3]):[0-5]\\d:[0-5]\\d$',
+    dateTime: '^\\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[12]\\d|3[01]) ([01]\\d|2[0-3]):[0-5]\\d:[0-5]\\d$'
 };
 exports.RegStr = RegStr;
 /**
@@ -550,8 +553,9 @@ function validate(value, rule, finalFunc) {
     if (funcs.length) {
         for (const funcReg of funcs) {
             const { fieldName, fieldValue, func } = funcReg;
-            if (!func(fieldValue)) {
-                result.message = 'field value not pass validate';
+            const execFuncRes = func(fieldValue);
+            if (!execFuncRes.pass) {
+                result.message = execFuncRes.message || 'field value not pass validate';
                 result.field = fieldName;
                 result.pass = false;
                 return result;
@@ -559,8 +563,9 @@ function validate(value, rule, finalFunc) {
         }
     }
     if (finalFunc) {
-        if (!finalFunc(value)) {
-            result.message = 'params not pass validate';
+        const execFuncRes = finalFunc(value);
+        if (!execFuncRes.pass) {
+            result.message = execFuncRes.message || 'params not pass validate';
             result.field = '';
             result.pass = false;
             return result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cvitool",
-  "version": "1.0.763",
+  "version": "1.0.765",
   "description": "cvitool",
   "main": "index.js",
   "scripts": {

package/src/cutil.ts

@@ -47,7 +47,7 @@ interface validateParams {
     subRange?: [number, number],
     subLength?: number,
     subValidate?: { [key: string]: validateParams },
-    func?: (value: any) => boolean
+    func?: (value: any) => { pass: boolean, message?: string }
 }
 
 const RegStr = {
@@ -63,7 +63,10 @@ const RegStr = {
     mobilePhoneNumber: '^1[3-9]\\d{9}$',
     idNumber: '^\\d{17}[\\dXx]$',
     mongoId: '^[a-f\\d]{24}$',
-    ratio: '^[1-9]\\d?:[1-9]\\d?$'
+    ratio: '^[1-9]\\d?:[1-9]\\d?$',
+    date: '^\\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[12]\\d|3[01])$',
+    time: '^([01]\\d|2[0-3]):[0-5]\\d:[0-5]\\d$',
+    dateTime: '^\\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[12]\\d|3[01]) ([01]\\d|2[0-3]):[0-5]\\d:[0-5]\\d$'
 };
 
 /**
@@ -425,13 +428,13 @@ function uuid() {
  * @param rule
  * @returns
  */
-function validate(value: { [key: string]: any }, rule: { [key: string]: validateParams }, finalFunc?: (value: any) => boolean): { message: string, field: string, pass: boolean } {
+function validate(value: { [key: string]: any }, rule: { [key: string]: validateParams }, finalFunc?: (value: any) => { pass: boolean, message?: string }): { message: string, field: string, pass: boolean } {
     const result = {
         message: '',
         field: '',
         pass: true
     };
-    const funcs: { fieldName: string, fieldValue: any, func: (value: any) => boolean }[] = [];
+    const funcs: { fieldName: string, fieldValue: any, func: (value: any) => { pass: boolean, message?: string } }[] = [];
     for (const fieldName in rule) {
         const fieldValidate = rule[fieldName];
         const fieldValue = value[fieldName];
@@ -576,8 +579,9 @@ function validate(value: { [key: string]: any }, rule: { [key: string]: validate
     if (funcs.length) {
         for (const funcReg of funcs) {
             const { fieldName, fieldValue, func } = funcReg;
-            if (!func(fieldValue)) {
-                result.message = 'field value not pass validate';
+            const execFuncRes = func(fieldValue);
+            if (!execFuncRes.pass) {
+                result.message = execFuncRes.message || 'field value not pass validate';
                 result.field = fieldName;
                 result.pass = false;
                 return result;
@@ -585,8 +589,9 @@ function validate(value: { [key: string]: any }, rule: { [key: string]: validate
         }
     }
     if (finalFunc) {
-        if (!finalFunc(value)) {
-            result.message = 'params not pass validate';
+        const execFuncRes = finalFunc(value);
+        if (!execFuncRes.pass) {
+            result.message = execFuncRes.message || 'params not pass validate';
             result.field = '';
             result.pass = false;
             return result;