From 8fbea1ab6af931ff46552bec86cdf178854a817b Mon Sep 17 00:00:00 2001 From: sunxiaobin89 <470459819@qq.com> Date: Thu, 1 Dec 2022 22:35:29 +0800 Subject: [PATCH 1/5] =?UTF-8?q?form=E4=BF=AE=E5=A4=8Dform.val=E4=B8=AD?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E7=9A=84=E5=80=BC=E4=B8=8D=E5=9C=A8=E5=8F=AF?= =?UTF-8?q?=E9=80=89=E8=8C=83=E5=9B=B4=E7=9A=84=E6=97=B6=E5=80=99=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E4=B8=8B=E6=8B=89=E7=9A=84title=E5=BC=B9=E5=87=BA?= =?UTF-8?q?=E7=9A=84=E9=80=89=E9=A1=B9=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD?= =?UTF-8?q?=E6=9C=80=E5=90=8E=E4=B8=80=E9=A1=B9=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/form.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/form.js b/src/modules/form.js index fa174f7b..8dad2fb9 100644 --- a/src/modules/form.js +++ b/src/modules/form.js @@ -259,6 +259,7 @@ layui.define(['layer', 'util'], function(exports){ ,dlHeight = dl.outerHeight(); index = select[0].selectedIndex; // 获取最新的 selectedIndex + index === -1 && (index = 0); reElem.addClass(CLASS+'ed'); dds.removeClass(HIDE); dts.removeClass(HIDE); From 370f56c24ca69cf3ebb5c3e8dbc0b20c592ac687 Mon Sep 17 00:00:00 2001 From: sunxiaobin89 <470459819@qq.com> Date: Sat, 3 Dec 2022 18:40:07 +0800 Subject: [PATCH 2/5] =?UTF-8?q?laydate=20calendarLinkage=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E6=94=B9=E5=90=8D=E4=B8=BArangeLinked=EF=BC=8C=E6=94=B9?= =?UTF-8?q?=E8=BF=9Bauto=E6=A8=A1=E5=BC=8F=E7=9A=84=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E5=88=A4=E5=AE=9A=EF=BC=8C=E5=A6=82=E6=9E=9C=E7=A9=BA?= =?UTF-8?q?=E5=80=BC=E5=88=9D=E5=A7=8B=E5=8C=96=E9=9D=A2=E6=9D=BF=E4=B8=BA?= =?UTF-8?q?=E8=81=94=E5=8A=A8=E7=9A=84=E5=B9=B6=E4=B8=94=E4=B8=8D=E4=BC=9A?= =?UTF-8?q?=E6=9C=89=E4=B8=80=E4=B8=AA=E9=BB=98=E8=AE=A4=E7=9A=84=E5=8C=BA?= =?UTF-8?q?=E9=97=B4=EF=BC=8C=E5=8E=BB=E6=8E=89=E7=9B=B8=E4=BA=92=E7=8B=AC?= =?UTF-8?q?=E7=AB=8B=E9=9D=A2=E6=9D=BF=E7=9A=84=E9=80=89=E4=B8=AD=E8=8C=83?= =?UTF-8?q?=E5=9B=B4=E6=A0=87=E8=AF=86=EF=BC=8C=E4=BF=9D=E6=8C=81=E8=B7=9F?= =?UTF-8?q?=E4=B9=8B=E5=89=8D=E7=9B=B8=E4=BA=92=E7=8B=AC=E7=AB=8B=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E7=9A=84=E6=95=88=E6=9E=9C=E4=B8=80=E8=87=B4=EF=BC=8C?= =?UTF-8?q?=E8=AE=A9=E4=B8=A4=E8=80=85=E7=9A=84=E7=89=B9=E6=80=A7=E6=9B=B4?= =?UTF-8?q?=E5=8A=A0=E6=98=8E=E6=98=BE=E5=AE=B9=E6=98=93=E8=BE=A8=E5=88=AB?= =?UTF-8?q?=E4=B8=8D=E4=BC=9A=E6=90=9E=E6=B7=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/css/modules/laydate.css | 16 +++---- src/modules/laydate.js | 85 +++++++++++++++++-------------------- 2 files changed, 47 insertions(+), 54 deletions(-) diff --git a/src/css/modules/laydate.css b/src/css/modules/laydate.css index 580c5820..1276221a 100644 --- a/src/css/modules/laydate.css +++ b/src/css/modules/laydate.css @@ -113,8 +113,8 @@ html #layuicss-laydate{display: none; position: absolute; width: 1989px;} .layui-laydate-content{border-top: none 0; border-bottom: none 0;} .layui-laydate-content th{color: #333;} .layui-laydate-content td{color: #666;} -.layui-laydate-content td.laydate-selected>div{background-color: #00F7DE;} -.laydate-selected:hover>div{background-color: #00F7DE !important;} +.layui-laydate-linkage .layui-laydate-content td.laydate-selected>div{background-color: #00F7DE;} +.layui-laydate-linkage .laydate-selected:hover>div{background-color: #00F7DE !important;} .layui-laydate-content td>div:hover, .layui-laydate-list li:hover, .layui-laydate-shortcut>li:hover{background-color: #eee; color: #333;} @@ -123,8 +123,8 @@ html #layuicss-laydate{display: none; position: absolute; width: 1989px;} .laydate-time-list>li:hover{background: none;} .layui-laydate-content .laydate-day-prev, .layui-laydate-content .laydate-day-next{color: #d2d2d2;} -.laydate-selected.laydate-day-prev>div, -.laydate-selected.laydate-day-next>div{background-color: #f8f8f8 !important;} +.layui-laydate-linkage .laydate-selected.laydate-day-prev>div, +.layui-laydate-linkage .laydate-selected.laydate-day-next>div{background-color: #f8f8f8 !important;} .layui-laydate-footer{border-top: 1px solid #e2e2e2;} .layui-laydate-hint{color: #FF5722;} .laydate-day-mark::after{background-color: #5FB878;} @@ -153,10 +153,10 @@ html #layuicss-laydate{display: none; position: absolute; width: 1989px;} .laydate-theme-grid .layui-laydate-content thead, .laydate-theme-grid .laydate-year-list>li, .laydate-theme-grid .laydate-month-list>li{border: 1px solid #e2e2e2;} -.laydate-theme-grid .laydate-selected, -.laydate-theme-grid .laydate-selected:hover{background-color: #f2f2f2 !important; color: #009688 !important;} -.laydate-theme-grid .laydate-selected.laydate-day-prev, -.laydate-theme-grid .laydate-selected.laydate-day-next{color: #d2d2d2 !important;} +.layui-laydate-linkage.laydate-theme-grid .laydate-selected, +.layui-laydate-linkage.laydate-theme-grid .laydate-selected:hover{background-color: #f2f2f2 !important; color: #009688 !important;} +.layui-laydate-linkage.laydate-theme-grid .laydate-selected.laydate-day-prev, +.layui-laydate-linkage.laydate-theme-grid .laydate-selected.laydate-day-next{color: #d2d2d2 !important;} .laydate-theme-grid .laydate-year-list, .laydate-theme-grid .laydate-month-list{margin: 1px 0 0 1px;} .laydate-theme-grid .laydate-year-list>li, diff --git a/src/modules/laydate.js b/src/modules/laydate.js index 631d6365..ae6bbd44 100644 --- a/src/modules/laydate.js +++ b/src/modules/laydate.js @@ -27,6 +27,7 @@ v: '5.4.0' // layDate 版本号 ,config: { weekStart: 0, // 默认周日一周的开始 + // rangeLinked: true // 日历面板默认为联动的方式 } // 全局配置项 ,index: (window.laydate && window.laydate.v) ? 100000 : 0 ,path: GLOBAL.laydate_dir || ready.getPath @@ -247,19 +248,19 @@ ) : ''; //日期范围的日历面板是否联动 - that.calendarLinkage = !!(options.range && options.calendarLinkage && (options.type === 'date' || options.type === 'datetime')) + that.rangeLinked = !!(options.range && options.rangeLinked && (options.type === 'date' || options.type === 'datetime')) //切换日历联动方式 that.autoCalendarModel = function () { - var state = that.calendarLinkage; - that.calendarLinkage = (options.range && (options.type === 'date' || options.type === 'datetime')) - && that.startDate && that.endDate && that.startDate.year === that.endDate.year && that.startDate.month === that.endDate.month; - lay(that.elem)[that.calendarLinkage ? 'addClass' : 'removeClass']('layui-laydate-linkage'); - return that.calendarLinkage != state; // 返回发生了变化 + var state = that.rangeLinked; + that.rangeLinked = (options.range && (options.type === 'date' || options.type === 'datetime')) + && ((!that.startDate || !that.endDate) || (that.startDate && that.endDate && that.startDate.year === that.endDate.year && that.startDate.month === that.endDate.month)); + lay(that.elem)[that.rangeLinked ? 'addClass' : 'removeClass']('layui-laydate-linkage'); + return that.rangeLinked != state; // 返回发生了变化 }; //是否自动切换 - that.autoCalendarModel.auto = that.calendarLinkage && options.calendarLinkage === 'auto'; + that.autoCalendarModel.auto = that.rangeLinked && options.rangeLinked === 'auto'; //若 range 参数为数组，则表示为开始日期和结束日期的 input 对象 if(layui.type(options.range) === 'array'){ @@ -409,7 +410,7 @@ ,"class": [ 'layui-laydate' ,options.range ? ' layui-laydate-range' : '' - ,that.calendarLinkage ? ' layui-laydate-linkage' : '' + ,that.rangeLinked ? ' layui-laydate-linkage' : '' ,isStatic ? (' '+ ELEM_STATIC) : '' ,options.fullPanel ? ' laydate-theme-fullpanel' : '' // 全面版 // ,options.theme && options.theme !== 'default' && !/^#/.test(options.theme) ? (' laydate-theme-' + options.theme) : '' @@ -582,14 +583,15 @@ seconds: dateTime.seconds, } } + if (i === 0) { // 第一个值作为startDate + that.startDate = lay.extend({}, dateTime); + } else { + that.endState = true; + } if (type === 'year' || type === 'month' || type === 'time') { that.listYM[i] = [dateTime.year, dateTime.month + 1]; - } else { - if (i === 0) { // 第一个值作为startDate - that.startDate = lay.extend({}, dateTime); - } else { - that.autoCalendarModel.auto && that.autoCalendarModel(); - } + } else if (i) { + that.autoCalendarModel.auto && that.autoCalendarModel(); } }); that.checkDate('limit').calendar(null, null, 'init'); @@ -839,7 +841,7 @@ if(fn === 'limit') { if (options.range) { - checkValid(that.calendarLinkage ? that.startDate : dateTime); // 校验开始时间 + checkValid(that.rangeLinked ? that.startDate : dateTime); // 校验开始时间 that.endDate && checkValid(that.endDate); // 校验结束时间 } else { checkValid(dateTime); @@ -970,9 +972,9 @@ that.hint('value ' + lang.invalidDate + lang.formatError[1]); } - that.startDate = that.startDate || lay.extend({}, options.dateTime); - that.endState = !that.calendarLinkage || !!(that.startDate && that.endDate); // 初始化选中范围状态 + that.startDate = that.startDate || value && lay.extend({}, options.dateTime); // 有默认值才初始化startDate that.autoCalendarModel.auto && that.autoCalendarModel(); + that.endState = !that.rangeLinked || !!(that.startDate && that.endDate); // 初始化选中范围状态 fn && fn(); return that; @@ -1096,7 +1098,7 @@ YMD = that.getAsYM(dateTime.year, dateTime.month, 'sub'); } else if(index_ >= startWeek && index_ < thisMaxDate + startWeek){ st = index_ - startWeek; - if (!that.calendarLinkage) { + if (!that.rangeLinked) { st + 1 === dateTime.date && item.addClass(THIS); } } else { @@ -1133,15 +1135,6 @@ //初始默认选择器 if(isAlone){ //年、月等独立选择器 if(options.range){ - // if (that.calendarLinkage) { - // value ? that.endDate = (that.endDate || { - // year: dateTime.year + (options.type === 'year' ? 1 : 0) - // ,month: dateTime.month + (options.type === 'month' ? 0 : -1) - // }) : (that.startDate = that.startDate || { - // year: dateTime.year - // ,month: dateTime.month - // }); - // } if(value || type !== 'init'){ // 判断是否需要显示年月时间列表 that.listYM = [ [(that.startDate || options.dateTime).year, (that.startDate || options.dateTime).month + 1] @@ -1164,7 +1157,7 @@ //初始赋值双日历 if(options.range && type === 'init'){ //执行渲染第二个日历 - if (that.calendarLinkage) { + if (that.rangeLinked) { var EYM = that.getAsYM(dateTime.year, dateTime.month, index ? 'sub' : null) that.calendar(lay.extend({}, dateTime, { year: EYM[0] @@ -1210,7 +1203,7 @@ Class.prototype.list = function(type, index){ var that = this ,options = that.config - ,dateTime = that.calendarLinkage ? options.dateTime : [options.dateTime, that.endDate][index] + ,dateTime = that.rangeLinked ? options.dateTime : [options.dateTime, that.endDate][index] ,lang = that.lang() ,isAlone = options.range && options.type !== 'date' && options.type !== 'datetime' //独立范围选择器 @@ -1382,7 +1375,7 @@ lay(ul).find('li').on('click', function(){ var ym = lay(this).attr('lay-ym') | 0; if(lay(this).hasClass(DISABLED)) return; - if (that.calendarLinkage) { + if (that.rangeLinked) { lay.extend(dateTime, { year: type === 'year' ? ym : listYM[0] ,month: type === 'year' ? listYM[1] - 1 : ym @@ -1405,7 +1398,7 @@ } } else { that.checkDate('limit').calendar(dateTime, index, 'init'); // 重新渲染一下两个面板 - that.calendarLinkage || that.choose(lay(elemCont).find('td.layui-this'), index); + that.rangeLinked || that.choose(lay(elemCont).find('td.layui-this'), index); that.closeList(); } @@ -1503,7 +1496,7 @@ ,lang = that.lang() ,isOut, elemBtn = lay(that.footer).find(ELEM_CONFIRM); if(options.range && options.type !== 'time'){ - start = start || (that.calendarLinkage ? that.startDate : options.dateTime); + start = start || (that.rangeLinked ? that.startDate : options.dateTime); end = end || that.endDate; isOut = that.newDate(start).getTime() > that.newDate(end).getTime(); @@ -1531,7 +1524,7 @@ ? lay.extend({}, that.endDate, that.endTime) : ( options.range - ? lay.extend({}, that.calendarLinkage ? that.startDate : options.dateTime, that.startTime) + ? lay.extend({}, that.rangeLinked ? that.startDate : options.dateTime, that.startTime) : options.dateTime) ) ,format = laydate.parse(dateTime, that.format, 1); @@ -1604,7 +1597,7 @@ if(!options.isPreview) return; var elemPreview = lay(that.elem).find('.'+ ELEM_PREVIEW) - ,value = options.range ? ((that.calendarLinkage ? that.endState : that.endDate) ? that.parse() : '') : that.parse(); + ,value = options.range ? ((that.rangeLinked ? that.endState : that.endDate) ? that.parse() : '') : that.parse(); //显示预览 elemPreview.html(value).css({ @@ -1632,7 +1625,7 @@ Class.prototype.stampRange = function(){ var that = this ,options = that.config - ,startTime = that.calendarLinkage ? that.startDate : options.dateTime, endTime + ,startTime = that.rangeLinked ? that.startDate : options.dateTime, endTime ,tds = lay(that.elem).find('td'); if(options.range && !that.endState) lay(that.footer).find(ELEM_CONFIRM).addClass(DISABLED); @@ -1661,7 +1654,7 @@ }).getTime(); lay(item).removeClass(ELEM_SELECTED + ' ' + THIS); if(thisTime === startTime || thisTime === endTime){ - (that.calendarLinkage || (!that.calendarLinkage && (i < 42 ? thisTime === startTime : thisTime === endTime))) && + (that.rangeLinked || (!that.rangeLinked && (i < 42 ? thisTime === startTime : thisTime === endTime))) && lay(item).addClass( lay(item).hasClass(ELEM_PREV) || lay(item).hasClass(ELEM_NEXT) ? ELEM_SELECTED @@ -1704,7 +1697,7 @@ var that = this ,options = that.config; - if (that.calendarLinkage) { + if (that.rangeLinked) { if (that.endState || !that.startDate) { // 重新选择或者第一次选择 index = 0; @@ -1767,8 +1760,8 @@ if (that.endState && that.autoCalendarModel.auto) { isChange = that.autoCalendarModel(); } - var isSameDate = that.startDate.year === that.endDate.year && that.startDate.month === that.endDate.month && that.startDate.date === that.endDate.date; - if (that.calendarLinkage && that.endState && that.newDate(that.startDate) > that.newDate(that.endDate)) { + if (that.rangeLinked && that.endState && that.newDate(that.startDate) > that.newDate(that.endDate)) { + var isSameDate = that.startDate.year === that.endDate.year && that.startDate.month === that.endDate.month && that.startDate.date === that.endDate.date; // 判断是否反选 var startDate = that.startDate; that.startDate = lay.extend({}, that.endDate, isSameDate ? {} : that.startTime); @@ -1782,7 +1775,7 @@ } isChange && (options.dateTime = lay.extend({}, that.startDate)); } - that.calendar(null, that.calendarLinkage ? null : index, isChange || that.calendarLinkage ? 'init' : null).done(null, 'change'); + that.calendar(null, that.rangeLinked ? null : index, isChange || that.rangeLinked ? 'init' : null).done(null, 'change'); } else if(options.position === 'static'){ //直接嵌套的选中 that.calendar().done().done(null, 'change'); //同时执行 done 和 change 回调 } else if(options.type === 'date'){ @@ -1912,7 +1905,7 @@ return { prevYear: function(){ if(addSubYeay('sub')) return; - if (that.calendarLinkage) { + if (that.rangeLinked) { options.dateTime.year--; that.checkDate('limit').calendar(null, null, 'init'); } else { @@ -1923,7 +1916,7 @@ } } ,prevMonth: function(){ - if (that.calendarLinkage) { + if (that.rangeLinked) { dateTime = options.dateTime; } var YM = that.getAsYM(dateTime.year, dateTime.month, 'sub'); @@ -1933,13 +1926,13 @@ }); that.checkDate('limit').calendar(null, null, 'init'); - if (!that.calendarLinkage) { + if (!that.rangeLinked) { that.choose(lay(elemCont).find('td.layui-this'), index); that.done(null, 'change'); } } ,nextMonth: function(){ - if (that.calendarLinkage) { + if (that.rangeLinked) { dateTime = options.dateTime; } var YM = that.getAsYM(dateTime.year, dateTime.month); @@ -1949,14 +1942,14 @@ }); that.checkDate('limit').calendar(null, null, 'init'); - if (!that.calendarLinkage) { + if (!that.rangeLinked) { that.choose(lay(elemCont).find('td.layui-this'), index); that.done(null, 'change'); } } ,nextYear: function(){ if(addSubYeay()) return; - if (that.calendarLinkage) { + if (that.rangeLinked) { options.dateTime.year++; that.checkDate('limit').calendar(null, 0, 'init'); } else { From eff6fffdd051c9c8585ee97c37160af2dc5055b0 Mon Sep 17 00:00:00 2001 From: sunxiaobin89 <470459819@qq.com> Date: Sat, 3 Dec 2022 18:40:50 +0800 Subject: [PATCH 3/5] =?UTF-8?q?laydate=20calendarLinkage=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E6=94=B9=E5=90=8D=E4=B8=BArangeLinked=EF=BC=8C=E6=94=B9?= =?UTF-8?q?=E8=BF=9Bauto=E6=A8=A1=E5=BC=8F=E7=9A=84=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E5=88=A4=E5=AE=9A=EF=BC=8C=E5=A6=82=E6=9E=9C=E7=A9=BA?= =?UTF-8?q?=E5=80=BC=E5=88=9D=E5=A7=8B=E5=8C=96=E9=9D=A2=E6=9D=BF=E4=B8=BA?= =?UTF-8?q?=E8=81=94=E5=8A=A8=E7=9A=84=E5=B9=B6=E4=B8=94=E4=B8=8D=E4=BC=9A?= =?UTF-8?q?=E6=9C=89=E4=B8=80=E4=B8=AA=E9=BB=98=E8=AE=A4=E7=9A=84=E5=8C=BA?= =?UTF-8?q?=E9=97=B4=EF=BC=8C=E5=8E=BB=E6=8E=89=E7=9B=B8=E4=BA=92=E7=8B=AC?= =?UTF-8?q?=E7=AB=8B=E9=9D=A2=E6=9D=BF=E7=9A=84=E9=80=89=E4=B8=AD=E8=8C=83?= =?UTF-8?q?=E5=9B=B4=E6=A0=87=E8=AF=86=EF=BC=8C=E4=BF=9D=E6=8C=81=E8=B7=9F?= =?UTF-8?q?=E4=B9=8B=E5=89=8D=E7=9B=B8=E4=BA=92=E7=8B=AC=E7=AB=8B=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E7=9A=84=E6=95=88=E6=9E=9C=E4=B8=80=E8=87=B4=EF=BC=8C?= =?UTF-8?q?=E8=AE=A9=E4=B8=A4=E8=80=85=E7=9A=84=E7=89=B9=E6=80=A7=E6=9B=B4?= =?UTF-8?q?=E5=8A=A0=E6=98=8E=E6=98=BE=E5=AE=B9=E6=98=93=E8=BE=A8=E5=88=AB?= =?UTF-8?q?=E4=B8=8D=E4=BC=9A=E6=90=9E=E6=B7=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/laydate.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/modules/laydate.js b/src/modules/laydate.js index ae6bbd44..8d058739 100644 --- a/src/modules/laydate.js +++ b/src/modules/laydate.js @@ -27,7 +27,6 @@ v: '5.4.0' // layDate 版本号 ,config: { weekStart: 0, // 默认周日一周的开始 - // rangeLinked: true // 日历面板默认为联动的方式 } // 全局配置项 ,index: (window.laydate && window.laydate.v) ? 100000 : 0 ,path: GLOBAL.laydate_dir || ready.getPath From 0a4bb74c5774923f965959326f45967024d513ba Mon Sep 17 00:00:00 2001 From: sunxiaobin89 <470459819@qq.com> Date: Sat, 3 Dec 2022 19:27:29 +0800 Subject: [PATCH 4/5] =?UTF-8?q?form=E4=BF=AE=E5=A4=8D=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E9=80=89=E4=B8=AD=E7=9A=84index=E4=B8=8D?= =?UTF-8?q?=E5=9C=A8=E5=BD=93=E5=89=8Doption=E7=9A=84=E8=8C=83=E5=9B=B4?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD?= =?UTF-8?q?=E4=BA=86=E6=9C=80=E5=90=8E=E4=B8=80=E4=B8=AA=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/form.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/form.js b/src/modules/form.js index 8dad2fb9..252915ab 100644 --- a/src/modules/form.js +++ b/src/modules/form.js @@ -259,14 +259,14 @@ layui.define(['layer', 'util'], function(exports){ ,dlHeight = dl.outerHeight(); index = select[0].selectedIndex; // 获取最新的 selectedIndex - index === -1 && (index = 0); reElem.addClass(CLASS+'ed'); dds.removeClass(HIDE); dts.removeClass(HIDE); nearElem = null; // 初始选中样式 - dds.eq(index).addClass(THIS).siblings().removeClass(THIS); + dds.removeClass(THIS); + index >= 0 && dds.eq(index).addClass(THIS); // 上下定位识别 if(top + dlHeight > $win.height() && top >= dlHeight){ From 47c45ac4a3fabe7c5a71e16d38375168ad0279d0 Mon Sep 17 00:00:00 2001 From: sunxiaobin89 <470459819@qq.com> Date: Sat, 3 Dec 2022 20:11:55 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E7=9A=84=E6=8F=90=E4=BA=A4=E5=AF=BC=E8=87=B4=E8=8C=83=E5=9B=B4?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=9A=84=E6=97=B6=E5=80=99=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E5=B9=B4=E6=9C=88=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/laydate.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/modules/laydate.js b/src/modules/laydate.js index 8d058739..0af5d9b8 100644 --- a/src/modules/laydate.js +++ b/src/modules/laydate.js @@ -786,6 +786,9 @@ //校验日期有效数字 ,checkValid = function(dateTime){ + if (!dateTime) { + return; + } 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.seconds > 59) dateTime.seconds = 0, dateTime.minutes++, error = true;