From ef302550673f5dfd1f4e97599ece4b335d8a7624 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期一, 10 三月 2025 09:48:22 +0800 Subject: [PATCH] Merge branch 'dev-1.1' --- packages/components/src/utils/validator.ts | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/packages/components/src/utils/validator.ts b/packages/components/src/utils/validator.ts index cb4a54b..eecc3e3 100644 --- a/packages/components/src/utils/validator.ts +++ b/packages/components/src/utils/validator.ts @@ -20,6 +20,14 @@ // return Promise.resolve(true); // } + // 韬唤璇佸悗鍏綅 + static validatorIDNumberSix(value: string, ruleCfg: FormItemRuleWithoutValidator) { + if (BoleRegExp.RegIDNumberSix.test(value)) { + return Promise.resolve(true); + } + return Promise.reject(ruleCfg.message); + } + static validatorUrl(value: string, ruleCfg: FormItemRuleWithoutValidator) { if (BoleRegExp.RegUrl.test(value)) { return Promise.resolve(true); @@ -107,6 +115,9 @@ static RegUrl = /^(https?:\/\/)?([\da-z.-]+)\.([a-z.]{2,6})(\/\w+)*\/?$/; + // 韬唤璇佸悗鍏綅 + static RegIDNumberSix = /^\d{5}[X]$|^\d{6}$/; + static RegUrlWithParameter = /^((http|ftp|https):\/\/)?[\w\-_]+(\.[\w\-_]+)+([\w\-\\.,@?^=%&:/~\\+#]*[\w\-\\@?^=%&/~\\+#])?$/; -- Gitblit v1.9.1