Merge branch 'develop'

2025-07-14 15:38:58 +08:00 · 2020-07-18 23:54:07 +08:00 · 2020-07-18 23:54:07 +08:00 · d9c9b89bcb
commit d9c9b89bcb
parent 8e3df6b324 4077842ef2
5 changed files with 34 additions and 16 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,6 +1,10 @@
 # 更新日志
 🚀 [提交问题](https://github.com/any86/any-rule/issues/new)

+### 0.3.5(2020-07-18)
+- 修复"车牌号"可以通过"浙苏H6F681"的问题
+- 新增"数字和英文字母组成，并且同时含有数字和英文字母"
+
 ### 0.3.4(2020-06-14)
 - 修正"车牌号(新能源+非新能源)"未对长度进行限制.
 - 修正"身份证"中月份可以匹配00月的bug.
--- a/README.md
+++ b/README.md
@ -1,4 +1,4 @@
-# 正则大全  ![已收录64条](https://img.shields.io/badge/已收录-64条-673ab7.svg) [![版本](https://badgen.net/vs-marketplace/v/russell.any-rule)](https://marketplace.visualstudio.com/items?itemName=russell.any-rule) [![安装量](https://badgen.net/vs-marketplace/i/russell.any-rule)](https://marketplace.visualstudio.com/items?itemName=russell.any-rule) [![下载量](https://badgen.net/vs-marketplace/d/russell.any-rule)](https://marketplace.visualstudio.com/items?itemName=russell.any-rule) ![MIT](https://img.shields.io/badge/license-MIT-F44336.svg) [![CircleCI](https://badgen.net/github/status/any86/any-rule/master/ci/circleci)](https://circleci.com/gh/any86/any-rule)
+# 正则大全  ![已收录65条](https://img.shields.io/badge/已收录-65条-673ab7.svg) [![版本](https://badgen.net/vs-marketplace/v/russell.any-rule)](https://marketplace.visualstudio.com/items?itemName=russell.any-rule) [![安装量](https://badgen.net/vs-marketplace/i/russell.any-rule)](https://marketplace.visualstudio.com/items?itemName=russell.any-rule) [![下载量](https://badgen.net/vs-marketplace/d/russell.any-rule)](https://marketplace.visualstudio.com/items?itemName=russell.any-rule) ![MIT](https://img.shields.io/badge/license-MIT-F44336.svg) [![CircleCI](https://badgen.net/github/status/any86/any-rule/master/ci/circleci)](https://circleci.com/gh/any86/any-rule)

 🦕支持**web** / **vscode** / **idea** / **Alfred Workflow**多平台

@ -97,7 +97,7 @@ vscode应用商店中搜索"**any-rule**".

 ### 网址(url,支持端口和"?+参数"和"#+参数)
 ```javascript
-/^(((ht|f)tps?):\/\/)?[\w-]+(\.[\w-]+)+([\w.,@?^=%&:/~+#-]*[\w@?^=%&/~+#-])?$/
+/^(((ht|f)tps?):\/\/)?[\w-]+(\.[\w-]+)+([\w.,@?^=%&:\/~+#-]*[\w@?^=%&\/~+#-])?$/
 ```

 ### 统一社会信用代码
@ -127,17 +127,17 @@ vscode应用商店中搜索"**any-rule**".

 ### linux"隐藏文件"路径
 ```javascript
-/^\/(?:[^/]+\/)*\.[^/]*/
+/^\/(?:[^\/]+\/)*\.[^\/]*/
 ```

 ### linux文件夹路径
 ```javascript
-/^\/(?:[^/]+\/)*$/
+/^\/(?:[^\/]+\/)*$/
 ```

 ### linux文件路径
 ```javascript
-/^\/(?:[^/]+\/)*[^/]+$/
+/^\/(?:[^\/]+\/)*[^\/]+$/
 ```

 ### window"文件夹"路径
@ -197,7 +197,7 @@ vscode应用商店中搜索"**any-rule**".

 ### base64格式
 ```javascript
-/^\s*data:(?:[a-z]+\/[a-z0-9-+.]+(?:;[a-z-]+=[a-z0-9-]+)?)?(?:;base64)?,([a-z0-9!$&',()*+;=\-._~:@/?%\s]*?)\s*$/i
+/^\s*data:(?:[a-z]+\/[a-z0-9-+.]+(?:;[a-z-]+=[a-z0-9-]+)?)?(?:;base64)?,([a-z0-9!$&',()*+;=\-._~:@\/?%\s]*?)\s*$/i
 ```

 ### 数字/货币金额（支持负数、千分位分隔符）
@ -227,17 +227,17 @@ vscode应用商店中搜索"**any-rule**".

 ### 车牌号(新能源)
 ```javascript
-/[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领 A-Z]{1}[A-HJ-NP-Z]{1}(([0-9]{5}[DF])|([DF][A-HJ-NP-Z0-9][0-9]{4}))$/
+/^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领]{1}[A-HJ-NP-Z]{1}(([0-9]{5}[DF])|([DF][A-HJ-NP-Z0-9][0-9]{4}))$/
 ```

 ### 车牌号(非新能源)
 ```javascript
-/^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领 A-Z]{1}[A-HJ-NP-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1}$/
+/^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领]{1}[A-HJ-NP-Z]{1}[A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳]{1}$/
 ```

 ### 车牌号(新能源+非新能源)
 ```javascript
-/^(?:[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领 A-Z]{1}[A-HJ-NP-Z]{1}(?:(?:[0-9]{5}[DF])|(?:[DF](?:[A-HJ-NP-Z0-9])[0-9]{4})))$|(?:[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领 A-Z]{1}[A-Z]{1}[A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9 挂学警港澳]{1})$/
+/^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领]{1}[A-HJ-NP-Z]{1}(?:(([0-9]{5}[DF])|([DF][A-HJ-NP-Z0-9][0-9]{4}))|[A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳]{1})$/
 ```

 ### 手机号(mobile phone)中国(严谨), 根据工信部2019年最新公布的手机号段
@ -399,3 +399,8 @@ vscode应用商店中搜索"**any-rule**".
 ```javascript
 /(.)\1+/
 ```
+
+### 数字和英文字母组成，并且同时含有数字和英文字母
+```javascript
+/^(?=.*[a-zA-Z])(?=.*\d).+$/
+```
--- a/package-lock.json
+++ b/package-lock.json
@ -1,6 +1,6 @@
 {
    "name": "any-rule",
-    "version": "0.3.4",
+    "version": "0.3.5",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
--- a/package.json
+++ b/package.json
@ -3,7 +3,7 @@
    "publisher": "russell",
    "displayName": "any-rule",
    "description": "你要的\"正则\"都在这!",
-    "version": "0.3.4",
+    "version": "0.3.5",
    "husky": {
        "hooks": {
            "pre-push": "npm run test:rules && npm run build:md && git add README.md && git commit -m 'docs: 更新文档'"
@ -317,9 +317,13 @@
                "command": "extension.rule63",
                "title": "$(rocket) zz: 匹配连续重复的字符"
            },
+            {
+                "command": "extension.rule64",
+                "title": "$(rocket) zz: 数字和英文字母组成，并且同时含有数字和英文字母"
+            },
            {
                "command": "extension.rule.callByMenu",
-                "title": "🦕正则大全(64条)"
+                "title": "🦕正则大全(65条)"
            }
        ]
    },
--- a/packages/www/src/RULES.js
+++ b/packages/www/src/RULES.js
@ -151,19 +151,19 @@ module.exports = [{
    },
    {
        title: '车牌号(新能源)',
-        rule: /[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领 A-Z]{1}[A-HJ-NP-Z]{1}(([0-9]{5}[DF])|([DF][A-HJ-NP-Z0-9][0-9]{4}))$/,
+        rule: /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领]{1}[A-HJ-NP-Z]{1}(([0-9]{5}[DF])|([DF][A-HJ-NP-Z0-9][0-9]{4}))$/,
        examples: ['京AD92035', '甘G23459F'],
    },
    {
        title: '车牌号(非新能源)',
-        rule: /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领 A-Z]{1}[A-HJ-NP-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1}$/,
+        rule: /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领]{1}[A-HJ-NP-Z]{1}[A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳]{1}$/,
        examples: ['京A00599', '黑D23908']
    },
    {
        title: '车牌号(新能源+非新能源)',
-        rule: /^(?:[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领 A-Z]{1}[A-HJ-NP-Z]{1}(?:(?:[0-9]{5}[DF])|(?:[DF](?:[A-HJ-NP-Z0-9])[0-9]{4})))$|(?:[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领 A-Z]{1}[A-Z]{1}[A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9 挂学警港澳]{1})$/,
+        rule: /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领]{1}[A-HJ-NP-Z]{1}(?:(([0-9]{5}[DF])|([DF][A-HJ-NP-Z0-9][0-9]{4}))|[A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳]{1})$/,
        examples: ['京A12345D', '京A00599'],
-        counterExamples: ['宁AD1234555555']
+        counterExamples: ['宁AD1234555555', '浙苏H6F681']
    },
    {
        title: '手机号(mobile phone)中国(严谨), 根据工信部2019年最新公布的手机号段',
@ -325,5 +325,10 @@ module.exports = [{
        title: '匹配连续重复的字符',
        rule: /(.)\1+/,
        examples: ['我我我', '112233', '11234']
+    },
+    {
+        title:'数字和英文字母组成，并且同时含有数字和英文字母',
+        rule:/^(?=.*[a-zA-Z])(?=.*\d).+$/,
+        examples: ['我a我1我', 'a对1']
    }
 ];