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

fix:异步加载data，固定列错行问题

This commit is contained in:
yangchch6 2019-12-17 11:28:06 +08:00
parent c73ad007b6
commit 7871086349
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build/Table.js
View File

@ -434,20 +434,17 @@ var Table = function (_Component) {
if (this.scrollbarWidth <= 0 && this.props.scroll.y) { if (this.scrollbarWidth <= 0 && this.props.scroll.y) {
this.scrollbarWidth = (0, _utils.measureScrollbar)(); this.scrollbarWidth = (0, _utils.measureScrollbar)();
} }
if (this.columnManager.isAnyColumnsFixed()) {
this.syncFixedTableRowHeight();
}
// console.log('this.scrollTop**********',this.scrollTop); // console.log('this.scrollTop**********',this.scrollTop);
}; };
Table.prototype.componentDidUpdate = function componentDidUpdate(prevProps, prevState) { Table.prototype.componentDidUpdate = function componentDidUpdate(prevProps, prevState) {
// 展开行后追加了新的DOM，必须在此阶段同步高度并重新渲染 // todo: IE 大数据渲染，行高不固定，且设置了 heightConsistent={true} 时，滚动加载操作会导致 ie11 浏览器崩溃
if (this.state.expandedRowKeys.length > 0) { // https://github.com/tinper-bee/bee-table/commit/bd2092cdbaad236ff89477304e58dea93325bf09
if (this.columnManager.isAnyColumnsFixed()) { if (this.columnManager.isAnyColumnsFixed()) {
this.syncFixedTableRowHeight(); this.syncFixedTableRowHeight();
} }
}
//适应模态框中表格、以及父容器宽度变化的情况 //适应模态框中表格、以及父容器宽度变化的情况
if (typeof this.props.scroll.x !== 'number' && this.contentTable.getBoundingClientRect().width !== this.contentDomWidth && this.firstDid) { if (typeof this.props.scroll.x !== 'number' && this.contentTable.getBoundingClientRect().width !== this.contentDomWidth && this.firstDid) {
this.computeTableWidth(); this.computeTableWidth();

9
src/Table.js
View File

@ -235,21 +235,18 @@ class Table extends Component {
if(this.scrollbarWidth<=0 && this.props.scroll.y){ if(this.scrollbarWidth<=0 && this.props.scroll.y){
this.scrollbarWidth = measureScrollbar(); this.scrollbarWidth = measureScrollbar();
} }
if (this.columnManager.isAnyColumnsFixed()) {
this.syncFixedTableRowHeight();
}
// console.log('this.scrollTop**********',this.scrollTop); // console.log('this.scrollTop**********',this.scrollTop);
} }
componentDidUpdate(prevProps, prevState) { componentDidUpdate(prevProps, prevState) {
// 展开行后追加了新的DOM，必须在此阶段同步高度并重新渲染 // todo: IE 大数据渲染，行高不固定，且设置了 heightConsistent={true} 时，滚动加载操作会导致 ie11 浏览器崩溃
if (this.state.expandedRowKeys.length > 0) { // https://github.com/tinper-bee/bee-table/commit/bd2092cdbaad236ff89477304e58dea93325bf09
if(this.columnManager.isAnyColumnsFixed()) { if(this.columnManager.isAnyColumnsFixed()) {
this.syncFixedTableRowHeight(); this.syncFixedTableRowHeight();
} }
}
//适应模态框中表格、以及父容器宽度变化的情况 //适应模态框中表格、以及父容器宽度变化的情况
if (typeof (this.props.scroll.x) !== 'number' && this.contentTable.getBoundingClientRect().width !== this.contentDomWidth && this.firstDid) { if (typeof (this.props.scroll.x) !== 'number' && this.contentTable.getBoundingClientRect().width !== this.contentDomWidth && this.firstDid) {
this.computeTableWidth(); this.computeTableWidth();