mirror of https://github.com/layui/layui
laydate 修复快捷栏的一些问题
parent
118cd98c9f
commit
22a9b7d0b5
|
@ -93,6 +93,7 @@
|
||||||
var ELEM_TIME_TEXT = 'laydate-time-text';
|
var ELEM_TIME_TEXT = 'laydate-time-text';
|
||||||
var ELEM_TIME_BTN = 'laydate-btns-time';
|
var ELEM_TIME_BTN = 'laydate-btns-time';
|
||||||
var ELEM_PREVIEW = 'layui-laydate-preview';
|
var ELEM_PREVIEW = 'layui-laydate-preview';
|
||||||
|
var ELEM_MAIN = 'layui-laydate-main';
|
||||||
|
|
||||||
// 组件构造器
|
// 组件构造器
|
||||||
var Class = function(options){
|
var Class = function(options){
|
||||||
|
@ -497,7 +498,7 @@
|
||||||
divContent.appendChild(table);
|
divContent.appendChild(table);
|
||||||
|
|
||||||
elemMain[i] = lay.elem('div', {
|
elemMain[i] = lay.elem('div', {
|
||||||
"class": 'layui-laydate-main laydate-main-list-'+ i
|
"class": ELEM_MAIN + ' laydate-main-list-'+ i
|
||||||
});
|
});
|
||||||
|
|
||||||
elemMain[i].appendChild(divHeader);
|
elemMain[i].appendChild(divHeader);
|
||||||
|
@ -543,16 +544,50 @@
|
||||||
if (!layui.isArray(value)) {
|
if (!layui.isArray(value)) {
|
||||||
value = [value];
|
value = [value];
|
||||||
}
|
}
|
||||||
|
var type = options.type;
|
||||||
lay.each(value, function (i, item) {
|
lay.each(value, function (i, item) {
|
||||||
lay.extend([options.dateTime, that.endDate][i], that.systemDate(layui.type(item) === 'date' ? item : new Date(item)))
|
var dateTime = [options.dateTime, that.endDate][i];
|
||||||
that.checkDate('limit').calendar(null,i);
|
if (type === 'time' && layui.type(item) !== 'date') {
|
||||||
|
if (that.EXP_IF.test(item)) {
|
||||||
|
item = (item.match(that.EXP_SPLIT) || []).slice(1);
|
||||||
|
lay.extend(dateTime, {hours: item[0] | 0, minutes: item[2] | 0, seconds: item[4] | 0})
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
lay.extend(dateTime, that.systemDate(layui.type(item) === 'date' ? item : new Date(item)))
|
||||||
|
}
|
||||||
|
|
||||||
|
if (type === 'time') {
|
||||||
|
that[['startTime', 'endTime'][i]] = {
|
||||||
|
hours: dateTime.hours,
|
||||||
|
minutes: dateTime.minutes,
|
||||||
|
seconds: dateTime.seconds,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (type === 'year' || type === 'month' || type === 'time') {
|
||||||
|
that.listYM[i] = [dateTime.year, dateTime.month + 1];
|
||||||
|
that.checkDate('limit').calendar(null,i);
|
||||||
|
that.list(type, i);
|
||||||
|
} else {
|
||||||
|
that.checkDate('limit').calendar(null,i);
|
||||||
|
that.closeList();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
that.closeList();
|
|
||||||
var timeBtn = lay(that.footer).find('.'+ ELEM_TIME_BTN).removeClass(DISABLED);
|
var timeBtn = lay(that.footer).find('.'+ ELEM_TIME_BTN).removeClass(DISABLED);
|
||||||
timeBtn.attr('lay-type') === 'date' && timeBtn.click();
|
timeBtn && timeBtn.attr('lay-type') === 'date' && timeBtn[0].click();
|
||||||
that.done(null, 'change');
|
that.done(null, 'change');
|
||||||
|
|
||||||
lay(this).addClass(THIS);
|
lay(this).addClass(THIS);
|
||||||
|
|
||||||
|
if (options.position !== 'static' && !options.range) {
|
||||||
|
if (type === 'date') {
|
||||||
|
that.choose(lay(elem).find('td.layui-this'))
|
||||||
|
} else if (type === 'year' || type === 'month') {
|
||||||
|
if(lay(elemMain[0]).find('.' + ELEM_MAIN + ' li.' + THIS + ':not(.laydate-disabled)')[0]) {
|
||||||
|
that.setValue(that.parse()).remove().done();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue