mirror of https://github.com/layui/layui
修复下拉菜单初始化立即显示的时候没有触发ready回调的问题；下拉菜单新增数据disabled禁用部分选项点击的功能；下拉菜单优化在弹出选项的时候如果当前实例有历史的菜单面板直接进行内容替换，不会重新去掉旧面板重新创建一个新面板优化reload的体验；表格修复page开启的时候data模式依旧受limit限制的问题；table修复resize导致在无数据或者请求异常的情况下右固定列显示出来的问题。
sunxb
parent
8aae232eb8
commit
b468fdc463
|
|
@ -177,9 +177,9 @@ layui.define(['jquery', 'laytpl', 'lay'], function(exports){
|
|||
,'-': 'layui-menu-item-divider'
|
||||
};
|
||||
if(isChild || type){
|
||||
return ' class="'+ className[type] +'"';
|
||||
return ' class="'+ className[type] + + '"';
|
||||
}
|
||||
return '';
|
||||
return item.disabled ? ' class="'+STR_DISABLED+'"' : '';
|
||||
}() +'>'
|
||||
|
||||
//标题区
|
||||
|
|
@ -236,27 +236,41 @@ layui.define(['jquery', 'laytpl', 'lay'], function(exports){
|
|||
//判断是否已经打开了下拉菜单面板
|
||||
if(!rerender && options.elem.data(MOD_INDEX +'_opened')) return;
|
||||
|
||||
//记录当前执行的实例索引
|
||||
dropdown.thisId = options.id;
|
||||
|
||||
//记录模板对象
|
||||
that.elemView = $(TPL_MAIN);
|
||||
that.elemView = $('.' + STR_ELEM + '[lay-id="' + options.id + '"]');
|
||||
if (that.elemView.length) {
|
||||
that.elemView.html(options.content || getDefaultView());
|
||||
} else {
|
||||
that.elemView = $(TPL_MAIN).attr('lay-id', options.id);
|
||||
that.elemView.append(options.content || getDefaultView());
|
||||
|
||||
//初始化某些属性
|
||||
if(options.className) that.elemView.addClass(options.className);
|
||||
if(options.style) that.elemView.attr('style', options.style);
|
||||
|
||||
|
||||
//记录当前执行的实例索引
|
||||
dropdown.thisId = options.id;
|
||||
|
||||
//插入视图
|
||||
that.remove(); //移除非当前绑定元素的面板
|
||||
elemBody.append(that.elemView);
|
||||
|
||||
options.elem.data(MOD_INDEX +'_opened', true);
|
||||
|
||||
//遮罩
|
||||
var shade = options.shade ? ('<div class="'+ STR_ELEM_SHADE +'" style="'+ ('z-index:'+ (that.elemView.css('z-index')-1) +'; background-color: ' + (options.shade[1] || '#000') + '; opacity: ' + (options.shade[0] || options.shade)) +'"></div>') : '';
|
||||
that.elemView.before(shade);
|
||||
|
||||
//如果是鼠标移入事件，则鼠标移出时自动关闭
|
||||
if(options.trigger === 'mouseenter'){
|
||||
that.elemView.on('mouseenter', function(){
|
||||
clearTimeout(thisModule.timer);
|
||||
}).on('mouseleave', function(){
|
||||
that.delayRemove();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
//坐标定位
|
||||
that.position();
|
||||
thisModule.prevElem = that.elemView; //记录当前打开的元素，以便在下次关闭
|
||||
|
|
@ -274,7 +288,7 @@ layui.define(['jquery', 'laytpl', 'lay'], function(exports){
|
|||
var isChild = data.child && data.child.length > 0;
|
||||
var isClickAllScope = options.clickScope === 'all'; // 是否所有父子菜单均触发点击事件
|
||||
|
||||
if((!isChild || isClickAllScope) && data.type !== '-'){
|
||||
if((!isChild || isClickAllScope) && data.type !== '-' && !data.disabled){
|
||||
var ret = typeof options.click === 'function' && options.click(data, othis);
|
||||
ret === false || (isChild || that.remove());
|
||||
layui.stope(e);
|
||||
|
|
@ -292,15 +306,8 @@ layui.define(['jquery', 'laytpl', 'lay'], function(exports){
|
|||
}
|
||||
});
|
||||
|
||||
//如果是鼠标移入事件，则鼠标移出时自动关闭
|
||||
if(options.trigger === 'mouseenter'){
|
||||
that.elemView.on('mouseenter', function(){
|
||||
clearTimeout(thisModule.timer);
|
||||
}).on('mouseleave', function(){
|
||||
that.delayRemove();
|
||||
});
|
||||
}
|
||||
|
||||
//组件打开完毕的事件
|
||||
typeof options.ready === 'function' && options.ready(that.elemView, options.elem);
|
||||
};
|
||||
|
||||
//位置定位
|
||||
|
|
@ -361,9 +368,6 @@ layui.define(['jquery', 'laytpl', 'lay'], function(exports){
|
|||
that.e = e;
|
||||
that.render();
|
||||
e.preventDefault();
|
||||
|
||||
//组件打开完毕的时间
|
||||
typeof options.ready === 'function' && options.ready(that.elemView, options.elem, that.e.target);
|
||||
};
|
||||
|
||||
//触发元素事件
|
||||
|
|
|
|||
|
|
@ -987,10 +987,9 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
|
|||
}
|
||||
});
|
||||
} else if(layui.type(options.data) === 'array'){ //已知数据
|
||||
var res = {}
|
||||
,startLimit = curr*options.limit - options.limit
|
||||
var res = {};
|
||||
|
||||
res[response.dataName] = options.data.concat().splice(startLimit, options.limit);
|
||||
res[response.dataName] = options.page ? options.data.concat().splice(curr*options.limit - options.limit, options.limit) : options.data.concat();
|
||||
res[response.countName] = options.data.length;
|
||||
|
||||
//记录合计行数据
|
||||
|
|
@ -1719,8 +1718,8 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
|
|||
,fixHeight = mainHeight - scollHeight;
|
||||
that.layFixed.find(ELEM_BODY).css('height', layMainTable.height() >= fixHeight ? fixHeight : 'auto');
|
||||
|
||||
//表格宽度小于容器宽度时，隐藏固定列
|
||||
that.layFixRight[outWidth > 0 ? 'removeClass' : 'addClass'](HIDE);
|
||||
//表格宽度小于容器宽度时或者数据异常（包括无数据），隐藏固定列
|
||||
that.layFixRight[table.cache[that.key].length && outWidth > 0 ? 'removeClass' : 'addClass'](HIDE);
|
||||
|
||||
//操作栏
|
||||
that.layFixRight.css('right', scollWidth - 1);
|
||||
|
|
|
|||
Loading…
Reference in New Issue