github
/
layui
mirror of https://github.com/layui/layui
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

优化 table 外层容器的高度，不再设置一个固定值，内部元素将根据 `height` 属性值自动撑满

pull/1267/head
贤心 2023-05-29 11:11:15 +08:00
parent 9714360050
commit a4a6a57dc2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/table.js
View File

@ -404,7 +404,7 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
,'style': function(){ ,'style': function(){
var arr = []; var arr = [];
if(options.width) arr.push('width:'+ options.width + 'px;'); if(options.width) arr.push('width:'+ options.width + 'px;');
if(options.height) arr.push('height:'+ options.height + 'px;'); // if(options.height) arr.push('height:'+ options.height + 'px;');
return arr.join('') return arr.join('')
}() }()
}).html(laytpl(TPL_MAIN, { }).html(laytpl(TPL_MAIN, {
@ -1653,11 +1653,11 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
if(that.fullHeightGap){ if(that.fullHeightGap){
height = _WIN.height() - that.fullHeightGap; height = _WIN.height() - that.fullHeightGap;
if(height < 135) height = 135; if(height < 135) height = 135;
that.elem.css('height', height); // that.elem.css('height', height);
} else if (that.parentDiv && that.parentHeightGap) { } else if (that.parentDiv && that.parentHeightGap) {
height = $(that.parentDiv).height() - that.parentHeightGap; height = $(that.parentDiv).height() - that.parentHeightGap;
if (height < 135) height = 135; if (height < 135) height = 135;
that.elem.css("height", height); // that.elem.css("height", height);
} }
// 如果多级表头，则填补表头高度 // 如果多级表头，则填补表头高度