Browse Source

Merge pull request #1078 from sunxiaobin89/main

修复 laydate 在初始值的时分秒存在 00 的情况下无法情况的问题
pull/1080/head
贤心 2 years ago committed by GitHub
parent
commit
7e5acf7f5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 13
      src/modules/laydate.js

13
src/modules/laydate.js

@ -621,9 +621,9 @@
,checkValid = function(dateTime){ ,checkValid = function(dateTime){
if(dateTime.year > LIMIT_YEAR[1]) dateTime.year = LIMIT_YEAR[1], error = true; //不能超过20万年 if(dateTime.year > LIMIT_YEAR[1]) dateTime.year = LIMIT_YEAR[1], error = true; //不能超过20万年
if(dateTime.month > 11) dateTime.month = 11, error = true; if(dateTime.month > 11) dateTime.month = 11, error = true;
if(dateTime.hours > 23) dateTime.hours = 0, error = true;
if(dateTime.minutes > 59) dateTime.minutes = 0, dateTime.hours++, error = true;
if(dateTime.seconds > 59) dateTime.seconds = 0, dateTime.minutes++, error = true; if(dateTime.seconds > 59) dateTime.seconds = 0, dateTime.minutes++, error = true;
if(dateTime.minutes > 59) dateTime.minutes = 0, dateTime.hours++, error = true;
if(dateTime.hours > 23) dateTime.hours = 0, error = true;
//计算当前月的最后一天 //计算当前月的最后一天
thisMaxDate = laydate.getEndDate(dateTime.month + 1, dateTime.year); thisMaxDate = laydate.getEndDate(dateTime.month + 1, dateTime.year);
@ -652,15 +652,18 @@
if(thisv < 1) thisv = 1, error = true; if(thisv < 1) thisv = 1, error = true;
dateTime.date = thisv; dateTime.date = thisv;
} else if(/HH|H/.test(item)){ //时 } else if(/HH|H/.test(item)){ //时
if(thisv < 1) thisv = 0, error = true; if (thisv < 0) thisv = 0, error = true;
if (thisv > 23) thisv = 23, error = true;
dateTime.hours = thisv; dateTime.hours = thisv;
options.range && (that[startEnd[index]].hours = thisv); options.range && (that[startEnd[index]].hours = thisv);
} else if(/mm|m/.test(item)){ //分 } else if(/mm|m/.test(item)){ //分
if(thisv < 1) thisv = 0, error = true; if (thisv < 0) thisv = 0, error = true;
if (thisv > 59) thisv = 59, error = true;
dateTime.minutes = thisv; dateTime.minutes = thisv;
options.range && (that[startEnd[index]].minutes = thisv); options.range && (that[startEnd[index]].minutes = thisv);
} else if(/ss|s/.test(item)){ //秒 } else if(/ss|s/.test(item)){ //秒
if(thisv < 1) thisv = 0, error = true; if (thisv < 0) thisv = 0, error = true;
if (thisv > 59) thisv = 59, error = true;
dateTime.seconds = thisv; dateTime.seconds = thisv;
options.range && (that[startEnd[index]].seconds = thisv); options.range && (that[startEnd[index]].seconds = thisv);
} }

Loading…
Cancel
Save