github
/
layui
mirror of https://github.com/layui/layui
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1186 from layui/main 

修复 v2.8.0-rc.3 升级导致的问题
pull/1187/head
贤心 2022-12-12 22:53:53 +08:00 committed by GitHub
parent 7b4e81c080 69fee7146d
commit 04ada93093
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/modules/laydate.js
View File

@ -977,7 +977,7 @@
that.startDate = that.startDate || value && lay.extend({}, options.dateTime); // 有默认值才初始化startDate that.startDate = that.startDate || value && lay.extend({}, options.dateTime); // 有默认值才初始化startDate
that.autoCalendarModel.auto && that.autoCalendarModel(); that.autoCalendarModel.auto && that.autoCalendarModel();
that.endState = !that.rangeLinked || !!(that.startDate && that.endDate); // 初始化选中范围状态 that.endState = !options.range || !that.rangeLinked || !!(that.startDate && that.endDate); // 初始化选中范围状态
fn && fn(); fn && fn();
return that; return that;
@ -1401,7 +1401,6 @@
} }
} else { } else {
that.checkDate('limit').calendar(dateTime, index, 'init'); // 重新渲染一下两个面板 that.checkDate('limit').calendar(dateTime, index, 'init'); // 重新渲染一下两个面板
that.rangeLinked || that.choose(lay(elemCont).find('td.layui-this'), index);
that.closeList(); that.closeList();
} }
@ -1415,8 +1414,8 @@
that.setValue(that.parse()).done().remove(); that.setValue(that.parse()).done().remove();
} }
} }
that.done(null, 'change'); (that.autoCalendarModel.auto && !that.rangeLinked) ? that.choose(lay(elemCont).find('td.layui-this'), index) : (that.endState && that.done(null, 'change'));
lay(that.footer).find('.'+ ELEM_TIME_BTN).removeClass(DISABLED); lay(that.footer).find('.'+ ELEM_TIME_BTN).removeClass(DISABLED);
}); });
} else { //时间选择面板 - 选择事件 } else { //时间选择面板 - 选择事件
@ -1603,14 +1602,17 @@
,value = options.range ? ((that.rangeLinked ? 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({ var oldValue = elemPreview.html();
elemPreview.html(value);
oldValue && // 如果一开始有内容的时候才需要有一个变化过程
(elemPreview.css({
'color': '#5FB878' 'color': '#5FB878'
}); }),
setTimeout(function(){ setTimeout(function(){
elemPreview.css({ elemPreview.css({
'color': '#666' 'color': '#666'
}); });
}, 300); }, 300));
}; };
// 附加的渲染处理，在 ready 和 change 的时候调用 // 附加的渲染处理，在 ready 和 change 的时候调用
@ -1946,8 +1948,8 @@
} else { } else {
dateTime.year--; dateTime.year--;
that.checkDate('limit').calendar(null, index); that.checkDate('limit').calendar(null, index);
that.choose(lay(elemCont).find('td.layui-this'), index); // 面板自动切换的模式下重新判定是否发生模式转换等细节处理
that.done(null, 'change'); that.autoCalendarModel.auto ? that.choose(lay(elemCont).find('td.layui-this'), index) : that.done(null, 'change');
} }
} }
,prevMonth: function(){ ,prevMonth: function(){
@ -1962,8 +1964,7 @@
that.checkDate('limit').calendar(null, null, 'init'); that.checkDate('limit').calendar(null, null, 'init');
if (!that.rangeLinked) { if (!that.rangeLinked) {
that.choose(lay(elemCont).find('td.layui-this'), index); that.autoCalendarModel.auto ? that.choose(lay(elemCont).find('td.layui-this'), index) : that.done(null, 'change');
that.done(null, 'change');
} }
} }
,nextMonth: function(){ ,nextMonth: function(){
@ -1978,8 +1979,7 @@
that.checkDate('limit').calendar(null, null, 'init'); that.checkDate('limit').calendar(null, null, 'init');
if (!that.rangeLinked) { if (!that.rangeLinked) {
that.choose(lay(elemCont).find('td.layui-this'), index); that.autoCalendarModel.auto ? that.choose(lay(elemCont).find('td.layui-this'), index) : that.done(null, 'change');
that.done(null, 'change');
} }
} }
,nextYear: function(){ ,nextYear: function(){
@ -1990,8 +1990,7 @@
} else { } else {
dateTime.year++; dateTime.year++;
that.checkDate('limit').calendar(null, index); that.checkDate('limit').calendar(null, index);
that.choose(lay(elemCont).find('td.layui-this'), index); that.autoCalendarModel.auto ? that.choose(lay(elemCont).find('td.layui-this'), index) : that.done(null, 'change');
that.done(null, 'change');
} }
} }
}; };