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

fix: version update

This commit is contained in:
gx-mac 2021-03-03 22:09:20 +08:00
parent 3c0aa855a7
commit 43193e089b
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build/Table.js
View File

@ -514,10 +514,10 @@ 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 && currentOverflowX === 'scroll') { if ((!this.props.scroll.x || this.props.scroll.x === '100%') && currentOverflowX === 'scroll') {
this.bodyTable.style.overflowX = 'hidden'; this.bodyTable.style.overflowX = 'hidden';
} }
if (this.props.scroll.x && currentOverflowX !== 'scroll') { if (this.props.scroll.x && this.props.scroll.x !== '100%' && currentOverflowX !== 'scroll') {
this.bodyTable.style.overflowX = 'scroll'; this.bodyTable.style.overflowX = 'scroll';
} }
} }
@ -1215,7 +1215,7 @@ var Table = function (_Component) {
if (this.props.data.length == 0 && this.props.headerScroll) { if (this.props.data.length == 0 && this.props.headerScroll) {
bodyStyle.overflowX = 'hidden'; bodyStyle.overflowX = 'hidden';
} }
if (!footerScroll) { if (!footerScroll && scroll.x !== '100%') {
bodyStyle.overflowX = bodyStyle.overflowX || 'auto'; bodyStyle.overflowX = bodyStyle.overflowX || 'auto';
} }
} }
@ -1227,7 +1227,7 @@ var Table = function (_Component) {
// bodyStyle.height = bodyStyle.height || scroll.y; // bodyStyle.height = bodyStyle.height || scroll.y;
innerBodyStyle.maxHeight = bodyStyle.maxHeight || scroll.y; innerBodyStyle.maxHeight = bodyStyle.maxHeight || scroll.y;
innerBodyStyle.overflowY = bodyStyle.overflowY || 'scroll'; innerBodyStyle.overflowY = bodyStyle.overflowY || 'scroll';
if (scroll.x) { if (scroll.x && scroll.x !== '100%') {
innerBodyStyle.overflowX = 'scroll'; innerBodyStyle.overflowX = 'scroll';
} }
} else { } else {
@ -1362,6 +1362,9 @@ var Table = function (_Component) {
} }
delete bodyStyle.overflowX; delete bodyStyle.overflowX;
delete bodyStyle.overflowY; delete bodyStyle.overflowY;
if (scroll.x === '100%') {
delete bodyStyle.marginBottom;
}
BodyTable = _react2["default"].createElement( BodyTable = _react2["default"].createElement(
'div', 'div',
{ {

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "bee-table", "name": "bee-table",
"version": "2.3.15-beta.3", "version": "2.3.15-beta.4",
"description": "Table ui component for react", "description": "Table ui component for react",
"keywords": [ "keywords": [
"react", "react",