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

table 修复reloadData改变page时候出现的一些异常

pull/1055/head
sunxiaobin89 2022-06-28 18:49:24 +08:00
parent f86ef95201
commit 7b610bfd5a
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/css/layui.css
View File

@ -990,7 +990,7 @@ a cite{font-style: normal; *cursor:pointer;}
.layui-table-page .layui-laypage button{padding: 0 10px;} .layui-table-page .layui-laypage button{padding: 0 10px;}
.layui-table-page select{height: 18px;} .layui-table-page select{height: 18px;}
.layui-table-pagebar{float: right; line-height: 23px;} .layui-table-pagebar{float: right; line-height: 23px;}
.layui-table-pagebar .layui-btn-sm{margin-top: -2px;} .layui-table-pagebar .layui-btn-sm{margin-top: -1px;}
.layui-table-pagebar .layui-btn-xs{margin-top: 2px;} .layui-table-pagebar .layui-btn-xs{margin-top: 2px;}
.layui-table-view select[lay-ignore]{display: inline-block;} .layui-table-view select[lay-ignore]{display: inline-block;}

15
src/modules/table.js
View File

@ -218,11 +218,9 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
,'</div>' ,'</div>'
,'{{# } }}' ,'{{# } }}'
,'{{# if(d.data.page || d.data.pagebar){ }}' ,'<div class="layui-table-column layui-table-page layui-hide">'
,'<div class="layui-table-column layui-table-page">'
,'<div class="layui-inline layui-table-pageview" id="layui-table-page{{=d.index}}"></div>' ,'<div class="layui-inline layui-table-pageview" id="layui-table-page{{=d.index}}"></div>'
,'</div>' ,'</div>'
,'{{# } }}'
,'<style>' ,'<style>'
,'{{# layui.each(d.data.cols, function(i1, item1){' ,'{{# layui.each(d.data.cols, function(i1, item1){'
@ -1015,6 +1013,8 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
.prop('checked', !that.layBody.find('input[name="layTableCheckbox"]:not(:checked)').length)); .prop('checked', !that.layBody.find('input[name="layTableCheckbox"]:not(:checked)').length));
} }
// 因为page参数有可能发生变化 先重新铺满
that.fullSize();
//滚动条补丁 //滚动条补丁
that.haveInit ? that.scrollPatch() : setTimeout(function(){ that.haveInit ? that.scrollPatch() : setTimeout(function(){
that.scrollPatch(); that.scrollPatch();
@ -1034,8 +1034,9 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
that.layTotal[data.length == 0 ? 'addClass' : 'removeClass'](HIDE_V); that.layTotal[data.length == 0 ? 'addClass' : 'removeClass'](HIDE_V);
//显示隐藏分页栏 //显示隐藏分页栏
that.layPage[(options.page || options.pagebar) ? 'removeClass' : 'addClass'](HIDE);
that.layPage.find(ELEM_PAGE_VIEW)[ that.layPage.find(ELEM_PAGE_VIEW)[
(count == 0 || (data.length === 0 && curr == 1)) (!options.page || count == 0 || (data.length === 0 && curr == 1))
? 'addClass' ? 'addClass'
: 'removeClass' : 'removeClass'
](HIDE_V); ](HIDE_V);
@ -1372,11 +1373,11 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
} }
//减去分页栏的高度 //减去分页栏的高度
if(options.page){ if(options.page || options.pagebar){
bodyHeight -= (that.layPage.outerHeight() || 41); bodyHeight -= (that.layPage.outerHeight() || 43);
} }
that.layMain.css('height', bodyHeight - 2); that.layMain.outerHeight(bodyHeight);
}; };
//获取滚动条宽度 //获取滚动条宽度