Skip to content

Commit 683c81c

Browse files
ChanceYuChanceYu
committed
fix: 修复 bug
1 parent 6ddd062 commit 683c81c

6 files changed

Lines changed: 42 additions & 30 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
## Released
66

77

8+
### [v2.1.16](https://github.com/ChanceYu/we-validator/releases/tag/v2.1.16)
9+
- 修复：错误 message 的显示优化[pull](https://github.com/ChanceYu/we-validator/pull/16)
10+
- 修复：修改空指针和语法修改[pull](https://github.com/ChanceYu/we-validator/pull/17)
11+
- 修复：required: false 不进行“必须”验证[pull](https://github.com/ChanceYu/we-validator/pull/18)
12+
13+
814
### [v2.1.15](https://github.com/ChanceYu/we-validator/releases/tag/v2.1.15)
915
- 修复：部分ts定义错误[issue](https://github.com/ChanceYu/we-validator/issues/15)
1016

‎dist/we-validator.js‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* we-validator
3-
* version: 2.1.15
3+
* version: 2.1.16
44
* address: https://github.com/ChanceYu/we-validator#readme
55
* author: ChanceYu <i.fish@foxmail.com>
66
* license: MIT
@@ -238,7 +238,7 @@ var WeValidator = function () {
238238
var messages = this.options.messages;
239239
var defaultMessage = WeValidator.RULES[ruleName].message;
240240

241-
if (messages.hasOwnProperty(attr) && messages[attr][ruleName]) {
241+
if (messages && messages.hasOwnProperty(attr) && messages[attr][ruleName]) {
242242
defaultMessage = messages[attr][ruleName];
243243
}
244244

@@ -354,7 +354,9 @@ var WeValidator = function () {
354354
}
355355

356356
if (!multiCheck) {
357-
errorParam && this._showErrorMessage(errorParam, onMessage);
357+
if (errorParam) {
358+
this._showErrorMessage(errorParam, onMessage);
359+
}
358360
return false;
359361
}
360362
}
@@ -484,7 +486,7 @@ WeValidator.checkValue = function (ruleName, value, param, skip) {
484486

485487
if (isFunction(rule)) {
486488
if (ruleName === 'required') {
487-
return requiredFn(value);
489+
return param && requiredFn(value);
488490
} else {
489491
if (skip) {
490492
return !requiredFn(value) || rule.call(this, value, param);
@@ -542,7 +544,7 @@ module.exports = {
542544
* 手机号码
543545
*/
544546
mobile: {
545-
message: '请输入11位的手机号码',
547+
message: '请输入 11 位的手机号码',
546548
rule: /^1[3456789]\d{9}$/
547549
},
548550
/**
@@ -563,7 +565,7 @@ module.exports = {
563565
* 身份证号
564566
*/
565567
idcard: {
566-
message: '请输入18位的有效身份证',
568+
message: '请输入 18 位的有效身份证',
567569
rule: /^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/
568570
},
569571
/**
@@ -737,21 +739,21 @@ module.exports = {
737739
* 日期（ISO标准格式）例如：2019-09-19，2019/09/19
738740
*/
739741
dateISO: {
740-
message: '请输入有效的日期（ISO标准格式）',
742+
message: '请输入有效的日期（ISO 标准格式）',
741743
rule: /^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$/
742744
},
743745
/**
744746
* ipv4地址
745747
*/
746748
ipv4: {
747-
message: '请输入有效的IPv4地址',
749+
message: '请输入有效的 IPv4 地址',
748750
rule: /^(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)$/i
749751
},
750752
/**
751753
* ipv6地址
752754
*/
753755
ipv6: {
754-
message: '请输入有效的IPv6地址',
756+
message: '请输入有效的 IPv6 地址',
755757
rule: /^((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))$/i
756758
}
757759
};

‎dist/we-validator.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎example/wechat/js/we-validator.js‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* we-validator
3-
* version: 2.1.15
3+
* version: 2.1.16
44
* address: https://github.com/ChanceYu/we-validator#readme
55
* author: ChanceYu <i.fish@foxmail.com>
66
* license: MIT
@@ -238,7 +238,7 @@ var WeValidator = function () {
238238
var messages = this.options.messages;
239239
var defaultMessage = WeValidator.RULES[ruleName].message;
240240

241-
if (messages.hasOwnProperty(attr) && messages[attr][ruleName]) {
241+
if (messages && messages.hasOwnProperty(attr) && messages[attr][ruleName]) {
242242
defaultMessage = messages[attr][ruleName];
243243
}
244244

@@ -354,7 +354,9 @@ var WeValidator = function () {
354354
}
355355

356356
if (!multiCheck) {
357-
errorParam && this._showErrorMessage(errorParam, onMessage);
357+
if (errorParam) {
358+
this._showErrorMessage(errorParam, onMessage);
359+
}
358360
return false;
359361
}
360362
}
@@ -484,7 +486,7 @@ WeValidator.checkValue = function (ruleName, value, param, skip) {
484486

485487
if (isFunction(rule)) {
486488
if (ruleName === 'required') {
487-
return requiredFn(value);
489+
return param && requiredFn(value);
488490
} else {
489491
if (skip) {
490492
return !requiredFn(value) || rule.call(this, value, param);
@@ -542,7 +544,7 @@ module.exports = {
542544
* 手机号码
543545
*/
544546
mobile: {
545-
message: '请输入11位的手机号码',
547+
message: '请输入 11 位的手机号码',
546548
rule: /^1[3456789]\d{9}$/
547549
},
548550
/**
@@ -563,7 +565,7 @@ module.exports = {
563565
* 身份证号
564566
*/
565567
idcard: {
566-
message: '请输入18位的有效身份证',
568+
message: '请输入 18 位的有效身份证',
567569
rule: /^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/
568570
},
569571
/**
@@ -737,21 +739,21 @@ module.exports = {
737739
* 日期（ISO标准格式）例如：2019-09-19，2019/09/19
738740
*/
739741
dateISO: {
740-
message: '请输入有效的日期（ISO标准格式）',
742+
message: '请输入有效的日期（ISO 标准格式）',
741743
rule: /^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$/
742744
},
743745
/**
744746
* ipv4地址
745747
*/
746748
ipv4: {
747-
message: '请输入有效的IPv4地址',
749+
message: '请输入有效的 IPv4 地址',
748750
rule: /^(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)$/i
749751
},
750752
/**
751753
* ipv6地址
752754
*/
753755
ipv6: {
754-
message: '请输入有效的IPv6地址',
756+
message: '请输入有效的 IPv6 地址',
755757
rule: /^((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))$/i
756758
}
757759
};

‎lib/we-validator.js‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* we-validator
3-
* version: 2.1.15
3+
* version: 2.1.16
44
* address: https://github.com/ChanceYu/we-validator#readme
55
* author: ChanceYu <i.fish@foxmail.com>
66
* license: MIT
@@ -238,7 +238,7 @@ var WeValidator = function () {
238238
var messages = this.options.messages;
239239
var defaultMessage = WeValidator.RULES[ruleName].message;
240240

241-
if (messages.hasOwnProperty(attr) && messages[attr][ruleName]) {
241+
if (messages && messages.hasOwnProperty(attr) && messages[attr][ruleName]) {
242242
defaultMessage = messages[attr][ruleName];
243243
}
244244

@@ -354,7 +354,9 @@ var WeValidator = function () {
354354
}
355355

356356
if (!multiCheck) {
357-
errorParam && this._showErrorMessage(errorParam, onMessage);
357+
if (errorParam) {
358+
this._showErrorMessage(errorParam, onMessage);
359+
}
358360
return false;
359361
}
360362
}
@@ -484,7 +486,7 @@ WeValidator.checkValue = function (ruleName, value, param, skip) {
484486

485487
if (isFunction(rule)) {
486488
if (ruleName === 'required') {
487-
return requiredFn(value);
489+
return param && requiredFn(value);
488490
} else {
489491
if (skip) {
490492
return !requiredFn(value) || rule.call(this, value, param);
@@ -542,7 +544,7 @@ module.exports = {
542544
* 手机号码
543545
*/
544546
mobile: {
545-
message: '请输入11位的手机号码',
547+
message: '请输入 11 位的手机号码',
546548
rule: /^1[3456789]\d{9}$/
547549
},
548550
/**
@@ -563,7 +565,7 @@ module.exports = {
563565
* 身份证号
564566
*/
565567
idcard: {
566-
message: '请输入18位的有效身份证',
568+
message: '请输入 18 位的有效身份证',
567569
rule: /^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/
568570
},
569571
/**
@@ -737,21 +739,21 @@ module.exports = {
737739
* 日期（ISO标准格式）例如：2019-09-19，2019/09/19
738740
*/
739741
dateISO: {
740-
message: '请输入有效的日期（ISO标准格式）',
742+
message: '请输入有效的日期（ISO 标准格式）',
741743
rule: /^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$/
742744
},
743745
/**
744746
* ipv4地址
745747
*/
746748
ipv4: {
747-
message: '请输入有效的IPv4地址',
749+
message: '请输入有效的 IPv4 地址',
748750
rule: /^(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)$/i
749751
},
750752
/**
751753
* ipv6地址
752754
*/
753755
ipv6: {
754-
message: '请输入有效的IPv6地址',
756+
message: '请输入有效的 IPv6 地址',
755757
rule: /^((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))$/i
756758
}
757759
};

‎src/we-validator.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class WeValidator {
7070

7171
if(isFunction(rule)){
7272
if(ruleName === 'required'){
73-
return requiredFn(value)
73+
return param && requiredFn(value)
7474
}else{
7575
if(skip){
7676
return !requiredFn(value) || rule.call(this, value, param)

0 commit comments

Comments
 (0)