mirror of https://github.com/layui/layui
Merge 5948916285
into 77adc3d196
commit
1a9a2ffca6
|
@ -1805,6 +1805,15 @@
|
||||||
that.closeList();
|
that.closeList();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(!options.range){
|
||||||
|
that.limit({
|
||||||
|
type: type,
|
||||||
|
elem: lay(that.footer).find(ELEM_CONFIRM),
|
||||||
|
date: dateTime,
|
||||||
|
disabledType: 'datetime' // 按钮,检测日期和时间
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
that.setBtnStatus(); //同步按钮可点状态
|
that.setBtnStatus(); //同步按钮可点状态
|
||||||
|
|
||||||
//若为月选择器,只有当选择月份时才自动关闭;
|
//若为月选择器,只有当选择月份时才自动关闭;
|
||||||
|
@ -2421,7 +2430,8 @@
|
||||||
options.range || that.limit({
|
options.range || that.limit({
|
||||||
elem: lay(that.footer).find(ELEM_CONFIRM),
|
elem: lay(that.footer).find(ELEM_CONFIRM),
|
||||||
date: {
|
date: {
|
||||||
year: listYM[0]
|
year: listYM[0],
|
||||||
|
month: isYear ? 0 : listYM[1] - 1,
|
||||||
},
|
},
|
||||||
disabledType: 'datetime' // 按钮,检测日期和时间
|
disabledType: 'datetime' // 按钮,检测日期和时间
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue