更新版本

pull/63/merge v5.0.9
sentsin 2017-12-05 12:35:36 +08:00
parent 4803de1dba
commit bfc0c1bf6d
4 changed files with 21 additions and 10 deletions

4
dist/laydate.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,7 +1,7 @@
{
"name": "layui-laydate",
"realname": "laydate",
"version": "5.0.85",
"version": "5.0.9",
"description": "日期与时间组件",
"main": "src/laydate.js",
"license": "MIT",

View File

@ -1,6 +1,6 @@
/**
@Name : layDate 5.0.85 日期时间控件
@Name : layDate 5.0.9 日期时间控件
@Author: 贤心
@Sitehttp://www.layui.com/laydate/
@LicenseMIT
@ -12,8 +12,18 @@
var isLayui = window.layui && layui.define, ready = {
getPath: function(){
var js = document.scripts, script = js[js.length - 1], jsPath = script.src;
if(script.getAttribute('merge')) return;
var jsPath = document.currentScript ? document.currentScript.src : function(){
var js = document.scripts
,last = js.length - 1
,src;
for(var i = last; i > 0; i--){
if(js[i].readyState === 'interactive'){
src = js[i].src;
break;
}
}
return src || js[last].src;
}();
return jsPath.substring(0, jsPath.lastIndexOf('/') + 1);
}()
@ -55,7 +65,7 @@
}
,laydate = {
v: '5.0.85'
v: '5.0.9'
,config: {} //全局配置项
,index: (window.laydate && window.laydate.v) ? 100000 : 0
,path: ready.getPath
@ -63,7 +73,7 @@
//设置全局项
,set: function(options){
var that = this;
that.config = ready.extend({}, that.config, options);
that.config = lay.extend({}, that.config, options);
return that;
}
@ -1379,6 +1389,7 @@
//创建指定日期时间对象
Class.prototype.newDate = function(dateTime){
dateTime = dateTime || {};
return new Date(
dateTime.year || 1
,dateTime.month || 0