Merge 4b6ca67f3d
into bfc0c1bf6d
commit
5dfd461431
File diff suppressed because one or more lines are too long
|
@ -1466,7 +1466,8 @@
|
||||||
lay.each([start, end], function(i, item){
|
lay.each([start, end], function(i, item){
|
||||||
if(!('month' in item)) return;
|
if(!('month' in item)) return;
|
||||||
lay.extend(item, {
|
lay.extend(item, {
|
||||||
month: item.month + 1
|
month: item.month + 1,
|
||||||
|
value: that.formatDate(item)
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -1475,7 +1476,15 @@
|
||||||
|
|
||||||
return that;
|
return that;
|
||||||
};
|
};
|
||||||
|
// 格式化为时间对象
|
||||||
|
Class.prototype.formatDate = function(timeObj){
|
||||||
|
var date = new Date()
|
||||||
|
for(var i in timeObj){
|
||||||
|
var setValue = i.replace(/^[a-z]/, function(h){ return h.toUpperCase() })
|
||||||
|
date['set' + setValue](timeObj[i])
|
||||||
|
}
|
||||||
|
return date
|
||||||
|
}
|
||||||
//选择日期
|
//选择日期
|
||||||
Class.prototype.choose = function(td){
|
Class.prototype.choose = function(td){
|
||||||
var that = this
|
var that = this
|
||||||
|
@ -1631,7 +1640,7 @@
|
||||||
} else {
|
} else {
|
||||||
if(lay(btn).hasClass(DISABLED)) return that.hint('不在有效日期或时间范围内');
|
if(lay(btn).hasClass(DISABLED)) return that.hint('不在有效日期或时间范围内');
|
||||||
}
|
}
|
||||||
that.done();
|
that.done(null, 'confirm');
|
||||||
that.setValue(that.parse()).remove()
|
that.setValue(that.parse()).remove()
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue