Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

修复laydate范围选择的问题 #1088

Merged
merged 3 commits into from
Jul 17, 2022
Merged

修复laydate范围选择的问题 #1088

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f955a75
layer 弹出之后的页面焦点调整
sunxiaobin89 Jul 15, 2022
7cadcb9
Merge branch 'layui:main' into main
sunxiaobin89 Jul 17, 2022
3bec356
回滚layer的修改；
sunxiaobin89 Jul 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
48 changes: 39 additions & 9 deletions src/modules/laydate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,22 +762,29 @@
}

//如果当前日期不在设定的最大小日期区间，则自动纠正在可选区域
var getDateTime = function(obj){
return that.newDate(obj).getTime();
};

//校验主面板是否在可选日期区间
if(getDateTime(dateTime) > getDateTime(options.max)){ //若超出最大日期
if(that.getDateTime(dateTime) > that.getDateTime(options.max)){ //若超出最大日期
dateTime = options.dateTime = lay.extend({}, options.max);
} else if(getDateTime(dateTime) < getDateTime(options.min)){ //若少于最小日期
} else if(that.getDateTime(dateTime) < that.getDateTime(options.min)){ //若少于最小日期
dateTime = options.dateTime = lay.extend({}, options.min);
}

//校验右侧面板是否在可选日期区间
if(options.range){
if(getDateTime(that.endDate) < getDateTime(options.min) || getDateTime(that.endDate) > getDateTime(options.max)){
if(that.getDateTime(that.endDate) < that.getDateTime(options.min) || that.getDateTime(that.endDate) > that.getDateTime(options.max)){
that.endDate = lay.extend({}, options.max);
}
// 有时间范围的情况下初始化startTime和endTime
that.startTime = {
hours: options.dateTime.hours,
minutes: options.dateTime.minutes,
seconds: options.dateTime.seconds,
}
that.endTime = {
hours: that.endDate.hours,
minutes: that.endDate.minutes,
seconds: that.endDate.seconds,
}
}

fn && fn();
Expand Down Expand Up @@ -826,7 +833,7 @@
Class.prototype.limit = function(elem, date, index, time){
var that = this
,options = that.config, timestrap = {}
,dateTime = options[index > 41 ? 'endDate' : 'dateTime']
,dateTime = index > (time ? 0 : 41) ? that.endDate : options.dateTime
,isOut, thisDateTime = lay.extend({}, dateTime, date || {});

lay.each({
Expand Down Expand Up @@ -1284,7 +1291,12 @@
,dateTime.seconds || 0
);
};


//获得指定日期时间对象时间戳
Class.prototype.getDateTime = function(obj){
return this.newDate(obj).getTime();
}

//赋值
Class.prototype.setValue = function(value){
var that = this
Expand Down Expand Up @@ -1390,6 +1402,24 @@
,minutes: i ? 59: 0
,seconds: i ? 59: 0
};
if (index === i) {
// 判断选择之后的是否在范围内，超出则需要调整时分秒
if (that.getDateTime(lay.extend({}, dateTime, that[item])) < that.getDateTime(options.min)) {
that[item] = {
hours: options.min.hours
,minutes: options.min.minutes
,seconds: options.min.seconds
};
lay.extend(dateTime, that[item]);
} else if (that.getDateTime(lay.extend({}, dateTime, that[item])) > that.getDateTime(options.max)) {
that[item] = {
hours: options.max.hours
,minutes: options.max.minutes
,seconds: options.max.seconds
};
lay.extend(dateTime, that[item]);
}
}
});
that.calendar(null, index).done(null, 'change');
} else if(options.position === 'static'){ //直接嵌套的选中
Expand Down