From cc2c471338a3a3c382065b388728b24f2a157c1b Mon Sep 17 00:00:00 2001 From: 383514580 <383514580@qq.com> Date: Wed, 10 Jul 2019 20:41:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=20=E4=BF=AE=E6=94=B9=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=E6=AD=A3=E5=88=99=E6=9C=88=E4=BB=BD=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=E7=9A=84=E9=94=99=E8=AF=AF(#9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 13 +++++++------ src/RULES.js | 6 +++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index b585bfc..81df1c3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 正则大全 +# 正则大全 图形界面: https://any86.github.io/any-rule/ ## 版本号格式必须为X.Y.Z @@ -103,17 +103,17 @@ ## 一代身份证号(15位数字) ```javascript -/^\d{8}(0\d|11|12)([0-2]\d|30|31)\d{3}$/ +/^\d{8}(0\d|10|11|12)([0-2]\d|30|31)\d{3}$/ ``` ## 二代身份证号(18位数字),最后一位是校验位,可能为数字或字符X ```javascript -/^\d{6}(18|19|20)\d{2}(0\d|11|12)([0-2]\d|30|31)\d{3}(\d|X|x)$/ +/^\d{6}(18|19|20)\d{2}(0\d|10|11|12)([0-2]\d|30|31)\d{3}(\d|X|x)$/ ``` ## 身份证号, 支持1/2代(15位/18位数字) ```javascript -/(^\d{8}(0\d|11|12)([0-2]\d|30|31)\d{3}$)|(^\d{6}(18|19|20)\d{2}(0\d|11|12)([0-2]\d|30|31)\d{3}(\d|X|x)$)/ +/(^\d{8}(0\d|10|11|12)([0-2]\d|30|31)\d{3}$)|(^\d{6}(18|19|20)\d{2}(0\d|10|11|12)([0-2]\d|30|31)\d{3}(\d|X|x)$)/ ``` ## 帐号是否合法(字母开头,允许5-16字节,允许字母数字下划线组合 @@ -210,7 +210,8 @@ ```javascript /[^A-Za-z]$/ ``` + ## 解除注释 ```javascript - -``` \ No newline at end of file +// +``` diff --git a/src/RULES.js b/src/RULES.js index e8712e2..c6e7296 100644 --- a/src/RULES.js +++ b/src/RULES.js @@ -102,17 +102,17 @@ module.exports = [{ }, { title: '一代身份证号(15位数字)', - rule: /^\d{8}(0\d|11|12)([0-2]\d|30|31)\d{3}$/, + rule: /^\d{8}(0\d|10|11|12)([0-2]\d|30|31)\d{3}$/, example: '如: 622001790131123' }, { title: '二代身份证号(18位数字),最后一位是校验位,可能为数字或字符X', - rule: /^\d{6}(18|19|20)\d{2}(0\d|11|12)([0-2]\d|30|31)\d{3}(\d|X|x)$/, + rule: /^\d{6}(18|19|20)\d{2}(0\d|10|11|12)([0-2]\d|30|31)\d{3}(\d|X|x)$/, example: '如: 62222319991205131x' }, { title: '身份证号, 支持1/2代(15位/18位数字)', - rule: /(^\d{8}(0\d|11|12)([0-2]\d|30|31)\d{3}$)|(^\d{6}(18|19|20)\d{2}(0\d|11|12)([0-2]\d|30|31)\d{3}(\d|X|x)$)/, + rule: /(^\d{8}(0\d|10|11|12)([0-2]\d|30|31)\d{3}$)|(^\d{6}(18|19|20)\d{2}(0\d|10|11|12)([0-2]\d|30|31)\d{3}(\d|X|x)$)/, example: '如: 622223199912051311' }, {