github
/
laydate
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge 44b3729b7d into bfc0c1bf6d

pull/82/merge
gjianbo 2019-04-04 05:37:10 +00:00 committed by GitHub
parent bfc0c1bf6d 44b3729b7d
commit 1c35940164
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 2774 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/laydate.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/theme/default/laydate.css vendored
View File

File diff suppressed because one or more lines are too long

2763
package-lock.json generated Normal file
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@ -1,4 +1,4 @@
{ {
"name": "layui-laydate", "name": "layui-laydate",
"realname": "laydate", "realname": "laydate",
"version": "5.0.9", "version": "5.0.9",

13
src/laydate.js
View File

@ -391,6 +391,9 @@
,zIndex: null //控件层叠顺序 ,zIndex: null //控件层叠顺序
,done: null //控件选择完毕后的回调，点击清空/现在/确定也均会触发 ,done: null //控件选择完毕后的回调，点击清空/现在/确定也均会触发
,change: null //日期时间改变后的回调 ,change: null //日期时间改变后的回调
,yearChange:true //年切换时触发事件
,monthChange:true //月切换时触发事件
}; };
//多语言 //多语言
@ -1668,7 +1671,7 @@
year: listYM[0] year: listYM[0]
}); });
if(isAlone) that[startEnd].year = listYM[0]; if(isAlone) that[startEnd].year = listYM[0];
options.range || that.done(null, 'change'); options.range || (options.yearChange && that.done(null, 'change'));
that.setBtnStatus(); that.setBtnStatus();
options.range || that.limit(lay(that.footer).find(ELEM_CONFIRM), { options.range || that.limit(lay(that.footer).find(ELEM_CONFIRM), {
year: listYM[0] year: listYM[0]
@ -1682,7 +1685,7 @@
if(addSubYeay('sub')) return; if(addSubYeay('sub')) return;
dateTime.year--; dateTime.year--;
that.checkDate('limit').calendar(); that.checkDate('limit').calendar();
options.range || that.done(null, 'change'); options.range || (options.yearChange && that.done(null, 'change'));
} }
,prevMonth: function(){ ,prevMonth: function(){
var YM = that.getAsYM(dateTime.year, dateTime.month, 'sub'); var YM = that.getAsYM(dateTime.year, dateTime.month, 'sub');
@ -1691,7 +1694,7 @@
,month: YM[1] ,month: YM[1]
}); });
that.checkDate('limit').calendar(); that.checkDate('limit').calendar();
options.range || that.done(null, 'change'); options.range || (options.monthChange && that.done(null, 'change'));
} }
,nextMonth: function(){ ,nextMonth: function(){
var YM = that.getAsYM(dateTime.year, dateTime.month); var YM = that.getAsYM(dateTime.year, dateTime.month);
@ -1700,13 +1703,13 @@
,month: YM[1] ,month: YM[1]
}); });
that.checkDate('limit').calendar(); that.checkDate('limit').calendar();
options.range || that.done(null, 'change'); options.range || (options.monthChange && that.done(null, 'change'));
} }
,nextYear: function(){ ,nextYear: function(){
if(addSubYeay()) return; if(addSubYeay()) return;
dateTime.year++ dateTime.year++
that.checkDate('limit').calendar(); that.checkDate('limit').calendar();
options.range || that.done(null, 'change'); options.range || (options.yearChange && that.done(null, 'change'));
} }
}; };
}; };