fix: reset scrollbar when the whole width changes
This commit is contained in:
parent
d6e16c2ef1
commit
b0914c928e
|
@ -1245,12 +1245,10 @@ 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 (this.computeWidth > this.contentDomWidth) {
|
||||||
if (this.computeWidth > this.contentDomWidth) {
|
innerBodyStyle.overflowX = 'scroll';
|
||||||
innerBodyStyle.overflowX = 'scroll';
|
} else {
|
||||||
} else {
|
innerBodyStyle.overflowX = 'hidden';
|
||||||
innerBodyStyle.overflowX = 'hidden';
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
bodyStyle.maxHeight = bodyStyle.maxHeight || scroll.y;
|
bodyStyle.maxHeight = bodyStyle.maxHeight || scroll.y;
|
||||||
|
|
|
@ -48307,6 +48307,7 @@
|
||||||
_this.leftColumnsLength; //左侧固定列的长度
|
_this.leftColumnsLength; //左侧固定列的长度
|
||||||
_this.centerColumnsLength; //非固定列的长度
|
_this.centerColumnsLength; //非固定列的长度
|
||||||
_this.columnsChildrenList = []; //复杂表头、所有叶子节点
|
_this.columnsChildrenList = []; //复杂表头、所有叶子节点
|
||||||
|
_this.dataChanged = false; // 数据是否改变
|
||||||
return _this;
|
return _this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -48341,6 +48342,7 @@
|
||||||
showRowNum = _props.showRowNum;
|
showRowNum = _props.showRowNum;
|
||||||
|
|
||||||
if ('data' in nextProps) {
|
if ('data' in nextProps) {
|
||||||
|
this.dataChanged = JSON.stringify(this.props.data) !== JSON.stringify(nextProps.data);
|
||||||
this.setState({
|
this.setState({
|
||||||
data: nextProps.data
|
data: nextProps.data
|
||||||
});
|
});
|
||||||
|
@ -48901,7 +48903,7 @@
|
||||||
var record = data[i];
|
var record = data[i];
|
||||||
var key = this.getRowKey(record, i);
|
var key = this.getRowKey(record, i);
|
||||||
// 兼容 NCC 以前的业务逻辑,支持外部通过 record 中的 isleaf 字段,判断是否为叶子节点
|
// 兼容 NCC 以前的业务逻辑,支持外部通过 record 中的 isleaf 字段,判断是否为叶子节点
|
||||||
record['_isLeaf'] = typeof record['isleaf'] === 'boolean' ? record['isleaf'] : record['_isLeaf'];
|
typeof record['isleaf'] === 'boolean' && (record['_isLeaf'] = record['isleaf']);
|
||||||
// _isLeaf 字段是在 bigData 里添加的,只有层级树大数据场景需要该字段
|
// _isLeaf 字段是在 bigData 里添加的,只有层级树大数据场景需要该字段
|
||||||
// _isLeaf 有三种取值情况:true / false / null。(Table内部字段)
|
// _isLeaf 有三种取值情况:true / false / null。(Table内部字段)
|
||||||
var _isLeaf = typeof record['_isLeaf'] === 'boolean' ? record['_isLeaf'] : null;
|
var _isLeaf = typeof record['_isLeaf'] === 'boolean' ? record['_isLeaf'] : null;
|
||||||
|
@ -49152,12 +49154,10 @@
|
||||||
// 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 (this.computeWidth > this.contentDomWidth) {
|
||||||
if (this.computeWidth > this.contentDomWidth) {
|
innerBodyStyle.overflowX = 'scroll';
|
||||||
innerBodyStyle.overflowX = 'scroll';
|
} else {
|
||||||
} else {
|
innerBodyStyle.overflowX = 'hidden';
|
||||||
innerBodyStyle.overflowX = 'hidden';
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
bodyStyle.maxHeight = bodyStyle.maxHeight || scroll.y;
|
bodyStyle.maxHeight = bodyStyle.maxHeight || scroll.y;
|
||||||
|
@ -49421,8 +49421,9 @@
|
||||||
var headRows = this.headTable ? this.headTable.querySelectorAll('thead') : this.bodyTable.querySelectorAll('thead');
|
var headRows = this.headTable ? this.headTable.querySelectorAll('thead') : this.bodyTable.querySelectorAll('thead');
|
||||||
var expandedRows = this.bodyTable.querySelectorAll('.' + clsPrefix + '-expanded-row') || [];
|
var expandedRows = this.bodyTable.querySelectorAll('.' + clsPrefix + '-expanded-row') || [];
|
||||||
var bodyRows = this.bodyTable.querySelectorAll('.' + clsPrefix + '-row') || [];
|
var bodyRows = this.bodyTable.querySelectorAll('.' + clsPrefix + '-row') || [];
|
||||||
var leftBodyRows = this.refs.fixedColumnsBodyLeft && this.refs.fixedColumnsBodyLeft.querySelectorAll('.' + clsPrefix + '-row') || [];
|
var leftBodyRows = !this.dataChanged && this.refs.fixedColumnsBodyLeft && this.refs.fixedColumnsBodyLeft.querySelectorAll('.' + clsPrefix + '-row') || [];
|
||||||
var rightBodyRows = this.refs.fixedColumnsBodyRight && this.refs.fixedColumnsBodyRight.querySelectorAll('.' + clsPrefix + '-row') || [];
|
var rightBodyRows = !this.dataChanged && this.refs.fixedColumnsBodyRight && this.refs.fixedColumnsBodyRight.querySelectorAll('.' + clsPrefix + '-row') || [];
|
||||||
|
this.dataChanged = false;
|
||||||
var fixedColumnsHeadRowsHeight = [].map.call(headRows, function (row) {
|
var fixedColumnsHeadRowsHeight = [].map.call(headRows, function (row) {
|
||||||
var height = headerHeight;
|
var height = headerHeight;
|
||||||
if (headerHeight) {
|
if (headerHeight) {
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "bee-table",
|
"name": "bee-table",
|
||||||
"version": "2.3.15-beta.9",
|
"version": "2.3.15-beta.10",
|
||||||
"description": "Table ui component for react",
|
"description": "Table ui component for react",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"react",
|
"react",
|
||||||
|
|
10
src/Table.js
10
src/Table.js
|
@ -1043,12 +1043,10 @@ class Table extends 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 (this.computeWidth > this.contentDomWidth) {
|
||||||
if (this.computeWidth > this.contentDomWidth) {
|
innerBodyStyle.overflowX = 'scroll';
|
||||||
innerBodyStyle.overflowX = 'scroll';
|
} else {
|
||||||
} else {
|
innerBodyStyle.overflowX = 'hidden';
|
||||||
innerBodyStyle.overflowX = 'hidden';
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
bodyStyle.maxHeight = bodyStyle.maxHeight || scroll.y;
|
bodyStyle.maxHeight = bodyStyle.maxHeight || scroll.y;
|
||||||
|
|
Loading…
Reference in New Issue