diff --git a/packages/ncform-common/test/unit/ncform-utils.js b/packages/ncform-common/test/unit/ncform-utils.js index 3dc43ce..def23b0 100755 --- a/packages/ncform-common/test/unit/ncform-utils.js +++ b/packages/ncform-common/test/unit/ncform-utils.js @@ -332,7 +332,6 @@ describe('/src/ncform-utils.js', () => { } }; ncformUtils.setValueToSchema(value, formSchema); - console.log(formSchema); assert(formSchema.properties.name.value === value.name); }); it("setValueToSchema - nested object", () => { @@ -355,7 +354,6 @@ describe('/src/ncform-utils.js', () => { } }; ncformUtils.setValueToSchema(value, formSchema); - console.log(JSON.stringify(formSchema, null, 2)); assert( formSchema.properties.name.properties.firstname.value === value.name.firstname @@ -381,7 +379,6 @@ describe('/src/ncform-utils.js', () => { } }; ncformUtils.setValueToSchema(value, formSchema); - console.log(JSON.stringify(formSchema, null, 2)); assert(formSchema.properties.name.value === value.name); }); it("setValueToSchema - nested array of objects and then objects", () => { @@ -410,7 +407,6 @@ describe('/src/ncform-utils.js', () => { } }; ncformUtils.setValueToSchema(value, formSchema); - console.log(JSON.stringify(formSchema, null, 2)); assert( JSON.stringify(formSchema.properties.user.value) === JSON.stringify(value.user) @@ -425,7 +421,6 @@ describe('/src/ncform-utils.js', () => { } }; ncformUtils.setValueToSchema(value, formSchema); - console.log(JSON.stringify(formSchema, null, 2)); assert(formSchema.value === value); }); it("setValueToSchema - nested array", () => { @@ -440,7 +435,6 @@ describe('/src/ncform-utils.js', () => { } }; ncformUtils.setValueToSchema(value, formSchema); - console.log(JSON.stringify(formSchema, null, 2)); assert(formSchema.value === value); }); it("setValueToSchema - non-schema object", () => { diff --git a/packages/ncform/src/regular-validation.js b/packages/ncform/src/regular-validation.js index 76f6a5c..5a3b5bd 100755 --- a/packages/ncform/src/regular-validation.js +++ b/packages/ncform/src/regular-validation.js @@ -71,7 +71,7 @@ class RegularValidation { if (!this.allRules[keys[i]]) { resolve({ result: false, - errMsg: `不存在验证规则${keys[i]}` + errMsg: `No validation rule for ${keys[i]}` }); } diff --git a/packages/ncform/src/rules/tel.js b/packages/ncform/src/rules/tel.js index 51e5054..8ae6b93 100755 --- a/packages/ncform/src/rules/tel.js +++ b/packages/ncform/src/rules/tel.js @@ -12,7 +12,7 @@ class TelRule extends ValidationRule { validateLogic(val, ruleVal) { if (!ruleVal) return true; if (typeof val !== "string") return true; - return /^1[3|4|5|7|8][0-9]\d{4,8}$/.test(val); + return /\+?[1-9]?([\ \.\-]?)\(?([0-9]{3})\)?([\ \.\-]?)([0-9]{3})([\ \.\-]?)([0-9]{4})/i.test(val); } }