mirror of https://github.com/layui/layui
修复几个小问题,下拉菜单新增暴露remove方法
parent
3a14f5e662
commit
6977b6573b
|
@ -48,6 +48,9 @@ layui.define(['jquery', 'laytpl', 'lay'], function(exports){
|
|||
,reload: function(options){
|
||||
that.reload.call(that, options);
|
||||
}
|
||||
,remove: function () {
|
||||
that.remove()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -105,7 +105,7 @@
|
|||
var elem = lay(options.elem || that.config.elem);
|
||||
if(elem.length > 1){
|
||||
lay.each(elem, function(){
|
||||
laydate.render(lay.extend({}, that.config, lay.options(this),{
|
||||
laydate.render(lay.extend({}, that.config, {
|
||||
elem: this
|
||||
}));
|
||||
});
|
||||
|
@ -113,7 +113,7 @@
|
|||
}
|
||||
|
||||
// 初始化 id 参数
|
||||
options = that.config;
|
||||
options = lay.extend(that.config, lay.options(elem[0])); // 继承节点上的属性
|
||||
options.id = ('id' in options) ? options.id : that.index;
|
||||
|
||||
// 初始化
|
||||
|
@ -162,6 +162,7 @@
|
|||
,zIndex: null //控件层叠顺序
|
||||
,done: null //控件选择完毕后的回调,点击清空/现在/确定也均会触发
|
||||
,change: null //日期时间改变后的回调
|
||||
,quickConfirm: true //快速确认
|
||||
};
|
||||
|
||||
//多语言
|
||||
|
@ -579,7 +580,7 @@
|
|||
|
||||
lay(this).addClass(THIS);
|
||||
|
||||
if (options.position !== 'static' && !options.range) {
|
||||
if (options.position !== 'static' && !options.range && options.quickConfirm) {
|
||||
if (type === 'date') {
|
||||
that.choose(lay(elem).find('td.layui-this'))
|
||||
} else if (type === 'year' || type === 'month') {
|
||||
|
@ -1352,7 +1353,7 @@
|
|||
//若为月选择器,只有当选择月份时才自动关闭;
|
||||
//若为年选择器,选择年份即自动关闭
|
||||
//且在范围未开启时
|
||||
if(!options.range){
|
||||
if(!options.range && options.quickConfirm){
|
||||
if((options.type === 'month' && type === 'month') || (options.type === 'year' && type === 'year')){
|
||||
that.setValue(that.parse()).remove().done();
|
||||
}
|
||||
|
@ -1640,7 +1641,7 @@
|
|||
} else if(options.position === 'static'){ //直接嵌套的选中
|
||||
that.calendar().done().done(null, 'change'); //同时执行 done 和 change 回调
|
||||
} else if(options.type === 'date'){
|
||||
that.setValue(that.parse()).remove().done();
|
||||
options.quickConfirm ? that.setValue(that.parse()).remove().done() : that.calendar().done(null, 'change');
|
||||
} else if(options.type === 'datetime'){
|
||||
that.calendar().done(null, 'change');
|
||||
}
|
||||
|
|
|
@ -2331,7 +2331,7 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
|
|||
var tableIns = table.render(options);
|
||||
|
||||
//获取表体数据
|
||||
if (trElem.length && !tableIns.config.url) {
|
||||
if (trElem.length && !settings.data && !tableIns.config.url) {
|
||||
var tdIndex = 0;
|
||||
table.eachCols(tableIns.config.id, function (i3, item3) {
|
||||
trElem.each(function(i1){
|
||||
|
|
Loading…
Reference in New Issue