theluyuan/layui-js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

未修复高度

Browse Source
This commit is contained in:
Theluyuan 2022-11-11 09:25:45 +08:00
parent ee757f7f07
commit 2ae835ecfe
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dist/layui.js vendored
View File

File diff suppressed because one or more lines are too long

7
gulpfile.js
View File

@ -49,12 +49,7 @@ const js = () => {
let src = [ let src = [
'./src/**/{layui,layui.all,'+ config.modules +'}.js' './src/**/{layui,layui.all,'+ config.modules +'}.js'
]; ];
return gulp.src(src).pipe(uglify({ return gulp.src(src).pipe(concat('layui.js', {newLine: ''}))
output: {
ascii_only: true //escape Unicode characters in strings and regexps
},
ie: true
})).pipe(concat('layui.js', {newLine: ''}))
.pipe(header.apply(null, config.comment)) .pipe(header.apply(null, config.comment))
.pipe(gulp.dest(dest)); .pipe(gulp.dest(dest));
}; };

9
src/modules/table.js
View File

@ -356,7 +356,9 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
othis.after(reElem); othis.after(reElem);
//各级容器 //各级容器
that.layTool = reElem.find(ELEM_TOOL); that.layTool = reElem.find(ELEM_TOOL);
that.layBorderBox = reElem;
that.layBox = reElem.find(ELEM_BOX); that.layBox = reElem.find(ELEM_BOX);
that.layHeader = reElem.find(ELEM_HEADER); that.layHeader = reElem.find(ELEM_HEADER);
that.layMain = reElem.find(ELEM_MAIN); that.layMain = reElem.find(ELEM_MAIN);
@ -1336,7 +1338,6 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
,options = that.config ,options = that.config
,height = options.height ,height = options.height
,bodyHeight; ,bodyHeight;
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;
@ -1362,6 +1363,12 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
if(options.page){ if(options.page){
bodyHeight -= (that.layPage.outerHeight() || 41); bodyHeight -= (that.layPage.outerHeight() || 41);
} }
console.log(bodyHeight,"bodyHeight")
let h = bodyHeight - 2 - parseFloat(that.layMain.css('height'));
// console.log(h)
// that.layBody.css("height", parseFloat(that.layBody.css("height")) + h);
// that.layBorderBox.css("height", parseFloat(that.layBorderBox.css("height")) + h);
console.log(this.config)
that.layMain.css('height', bodyHeight - 2); that.layMain.css('height', bodyHeight - 2);
}; };