From 65b30b7cac0a3fdcb8cec19c73411af0e2858766 Mon Sep 17 00:00:00 2001
From: 离歌笑 <137273278@qq.com>
Date: 星期二, 22 十月 2019 16:46:20 +0800
Subject: [PATCH] Merge branch 'tlhhup'
---
WebService/src/main/resources/static/js/vc-validate.js | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/WebService/src/main/resources/static/js/vc-validate.js b/WebService/src/main/resources/static/js/vc-validate.js
index 142dadc..5344d4b 100644
--- a/WebService/src/main/resources/static/js/vc-validate.js
+++ b/WebService/src/main/resources/static/js/vc-validate.js
@@ -98,12 +98,16 @@
* @param {鏍￠獙鏂囨湰} text
*/
num:function(text){
- var regNum = /^[0-9]+$/;
+ var regNum = /^[1-9][0-9]*$/;
return regNum.test(text);
},
date:function(str) {
var regDate = /^(\d{4})-(\d{2})-(\d{2})$/;
return regDate.test(str);
+ },
+ dateTime:function(str){
+ var reDateTime = /^[1-9]\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])\s+(20|21|22|23|[0-1]\d):[0-5]\d:[0-5]\d$/;
+ return reDateTime.test(str);
},
/**
閲戦鏍￠獙
@@ -208,6 +212,9 @@
if(configObj.limit == 'date'){
validate.setState(validate.date(tmpDataObj),configObj.errInfo);
}
+ if(configObj.limit == 'dateTime'){
+ validate.setState(validate.dateTime(tmpDataObj),configObj.errInfo);
+ }
if(configObj.limit == 'money'){
validate.setState(validate.money(tmpDataObj),configObj.errInfo);
--
Gitblit v1.8.0