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

增强 table height 选项，支持函数 

close https://gitee.com/layui/layui/issues/I8KR5U
pull/1437/head
sight 2023-12-01 11:17:29 +08:00
parent d8895a7b5d
commit 7c1a9a050d
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/modules/table.js
View File

@ -360,6 +360,9 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
that.parentHeightGap = parentDiv.pop(); that.parentHeightGap = parentDiv.pop();
that.parentDiv = parentDiv.join("-"); that.parentDiv = parentDiv.join("-");
options.height = $(that.parentDiv).height() - (parseFloat(that.parentHeightGap) || 0); options.height = $(that.parentDiv).height() - (parseFloat(that.parentHeightGap) || 0);
} else if (typeof options.height === "function"){
that.customHeightFunc = options.height;
options.height = that.customHeightFunc();
} }
// 开始插入替代元素 // 开始插入替代元素
@ -1727,15 +1730,19 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
var options = that.config; var options = that.config;
var height = options.height; var height = options.height;
var bodyHeight; var bodyHeight;
var MIN_HEIGHT = 135;
if(that.fullHeightGap){ if(that.fullHeightGap){
height = _WIN.height() - that.fullHeightGap; height = _WIN.height() - that.fullHeightGap;
if(height < 135) height = 135; if(height < MIN_HEIGHT) height = MIN_HEIGHT;
// 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 < MIN_HEIGHT) height = MIN_HEIGHT;
// that.elem.css("height", height); // that.elem.css("height", height);
} else if (that.customHeightFunc) {
height = that.customHeightFunc();
if(height < MIN_HEIGHT) height = MIN_HEIGHT;
} }
// 如果多级表头，则填补表头高度 // 如果多级表头，则填补表头高度