p47502813
/
bee-table
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: css update

This commit is contained in:
gx-mac 2021-03-04 10:19:18 +08:00
parent 43193e089b
commit 290ba7aed8
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/Table.js
View File

@ -514,7 +514,7 @@ var Table = function (_Component) {
this.isShowScrollY(); this.isShowScrollY();
if (this.bodyTable) { if (this.bodyTable) {
var currentOverflowX = window.getComputedStyle(this.bodyTable).overflowX; var currentOverflowX = window.getComputedStyle(this.bodyTable).overflowX;
if ((!this.props.scroll.x || this.props.scroll.x === '100%') && currentOverflowX === 'scroll') { if ((!this.props.scroll.x || this.props.scroll.x === '100%') && currentOverflowX !== 'hidden') {
this.bodyTable.style.overflowX = 'hidden'; this.bodyTable.style.overflowX = 'hidden';
} }
if (this.props.scroll.x && this.props.scroll.x !== '100%' && currentOverflowX !== 'scroll') { if (this.props.scroll.x && this.props.scroll.x !== '100%' && currentOverflowX !== 'scroll') {
@ -1229,6 +1229,8 @@ var Table = function (_Component) {
innerBodyStyle.overflowY = bodyStyle.overflowY || 'scroll'; innerBodyStyle.overflowY = bodyStyle.overflowY || 'scroll';
if (scroll.x && scroll.x !== '100%') { if (scroll.x && scroll.x !== '100%') {
innerBodyStyle.overflowX = 'scroll'; innerBodyStyle.overflowX = 'scroll';
} else {
innerBodyStyle.overflowX = 'hidden';
} }
} else { } else {
bodyStyle.maxHeight = bodyStyle.maxHeight || scroll.y; bodyStyle.maxHeight = bodyStyle.maxHeight || scroll.y;

4
src/Table.js
View File

@ -298,7 +298,7 @@ class Table extends Component {
this.isShowScrollY(); this.isShowScrollY();
if (this.bodyTable) { if (this.bodyTable) {
const currentOverflowX = window.getComputedStyle(this.bodyTable).overflowX const currentOverflowX = window.getComputedStyle(this.bodyTable).overflowX
if ((!this.props.scroll.x || this.props.scroll.x === '100%') && currentOverflowX === 'scroll') { if ((!this.props.scroll.x || this.props.scroll.x === '100%') && currentOverflowX !== 'hidden') {
this.bodyTable.style.overflowX = 'hidden'; this.bodyTable.style.overflowX = 'hidden';
} }
if ((this.props.scroll.x && this.props.scroll.x !== '100%') && currentOverflowX !== 'scroll') { if ((this.props.scroll.x && this.props.scroll.x !== '100%') && currentOverflowX !== 'scroll') {
@ -1038,6 +1038,8 @@ class Table extends Component {
innerBodyStyle.overflowY = bodyStyle.overflowY || 'scroll'; innerBodyStyle.overflowY = bodyStyle.overflowY || 'scroll';
if (scroll.x && scroll.x !== '100%') { if (scroll.x && scroll.x !== '100%') {
innerBodyStyle.overflowX = 'scroll'; innerBodyStyle.overflowX = 'scroll';
} else {
innerBodyStyle.overflowX = 'hidden';
} }
} else { } else {
bodyStyle.maxHeight = bodyStyle.maxHeight || scroll.y; bodyStyle.maxHeight = bodyStyle.maxHeight || scroll.y;