Merge branch 'master' into release/4.9.2
Showing
2 changed files
with
9 additions
and
8 deletions
@@ -78,13 +78,14 @@ function isValidate(rules, datas) { | @@ -78,13 +78,14 @@ function isValidate(rules, datas) { | ||
78 | message = rule.name + '不可为空'; | 78 | message = rule.name + '不可为空'; |
79 | break; | 79 | break; |
80 | } | 80 | } |
81 | - if (rule.regex) { | ||
82 | - reg = $.trim(data).match(rule.regex); | ||
83 | - if (!reg || (reg && !reg.length)) { | ||
84 | - message = rule.msg; | ||
85 | - break; | ||
86 | - } | ||
87 | - } | 81 | + |
82 | + // if (rule.regex) { | ||
83 | + // reg = $.trim(data).match(rule.regex); | ||
84 | + // if (!reg || (reg && !reg.length)) { | ||
85 | + // message = rule.msg; | ||
86 | + // break; | ||
87 | + // } | ||
88 | + // } | ||
88 | if (rule.is !== void (0) && data !== rule.is) { | 89 | if (rule.is !== void (0) && data !== rule.is) { |
89 | message = rule.msg; | 90 | message = rule.msg; |
90 | } | 91 | } |
-
Please register or login to post a comment