forgetest5
/
bee-table6
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

支持隐藏表体滚动条

This commit is contained in:
wanghaoo 2018-11-30 14:10:12 +08:00
parent ebd0111c36
commit 1e42317091
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/Table.js
View File

@ -745,7 +745,8 @@ var Table = function (_Component) {
scroll = _props3$scroll === undefined ? {} : _props3$scroll, scroll = _props3$scroll === undefined ? {} : _props3$scroll,
getBodyWrapper = _props3.getBodyWrapper, getBodyWrapper = _props3.getBodyWrapper,
footerScroll = _props3.footerScroll, footerScroll = _props3.footerScroll,
headerScroll = _props3.headerScroll; headerScroll = _props3.headerScroll,
hideBodyScroll = _props3.hideBodyScroll;
var useFixedHeader = this.props.useFixedHeader; var useFixedHeader = this.props.useFixedHeader;
var bodyStyle = _extends({}, this.props.bodyStyle); var bodyStyle = _extends({}, this.props.bodyStyle);
@ -781,7 +782,6 @@ var Table = function (_Component) {
//显示表头滚动条 //显示表头滚动条
if (headerScroll) { if (headerScroll) {
if (fixed) { if (fixed) {
if (this.domWidthDiff <= 0) { if (this.domWidthDiff <= 0) {
headStyle.marginBottom = scrollbarWidth + 'px'; headStyle.marginBottom = scrollbarWidth + 'px';
bodyStyle.marginBottom = '-' + scrollbarWidth + 'px'; bodyStyle.marginBottom = '-' + scrollbarWidth + 'px';
@ -792,6 +792,8 @@ var Table = function (_Component) {
//内容少，不用显示滚动条 //内容少，不用显示滚动条
if (this.domWidthDiff > 0) { if (this.domWidthDiff > 0) {
headStyle.overflowX = 'hidden'; headStyle.overflowX = 'hidden';
} else if (hideBodyScroll) {
bodyStyle.overflowX = 'hidden';
} }
headStyle.marginBottom = '0px'; headStyle.marginBottom = '0px';
} }

6
src/Table.js
View File

@ -646,7 +646,7 @@ class Table extends Component {
getTable(options = {}) { getTable(options = {}) {
const { columns, fixed } = options; const { columns, fixed } = options;
const { clsPrefix, scroll = {}, getBodyWrapper, footerScroll,headerScroll } = this.props; const { clsPrefix, scroll = {}, getBodyWrapper, footerScroll,headerScroll,hideBodyScroll } = this.props;
let { useFixedHeader } = this.props; let { useFixedHeader } = this.props;
const bodyStyle = { ...this.props.bodyStyle }; const bodyStyle = { ...this.props.bodyStyle };
const headStyle = {}; const headStyle = {};
@ -681,7 +681,6 @@ class Table extends Component {
//显示表头滚动条 //显示表头滚动条
if(headerScroll){ if(headerScroll){
if(fixed){ if(fixed){
if(this.domWidthDiff <= 0){ if(this.domWidthDiff <= 0){
headStyle.marginBottom = `${scrollbarWidth}px`; headStyle.marginBottom = `${scrollbarWidth}px`;
bodyStyle.marginBottom = `-${scrollbarWidth}px`; bodyStyle.marginBottom = `-${scrollbarWidth}px`;
@ -692,9 +691,12 @@ class Table extends Component {
//内容少，不用显示滚动条 //内容少，不用显示滚动条
if(this.domWidthDiff > 0){ if(this.domWidthDiff > 0){
headStyle.overflowX = 'hidden'; headStyle.overflowX = 'hidden';
}else if(hideBodyScroll){
bodyStyle.overflowX = 'hidden';
} }
headStyle.marginBottom = `0px`; headStyle.marginBottom = `0px`;
} }
}else{ }else{
if(fixed){ if(fixed){
if(this.domWidthDiff > 0){ if(this.domWidthDiff > 0){