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

fix: Refs Must Have Owner Warning

This commit is contained in:
izbz wh 2019-05-05 14:07:34 +08:00
parent 89f3baa417
commit 90853f05e7
10 changed files with 4910 additions and 18633 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
build/Table.js
View File

@ -347,15 +347,15 @@ var Table = function (_Component) {
} }
if (nextProps.columns && nextProps.columns !== this.props.columns) { if (nextProps.columns && nextProps.columns !== this.props.columns) {
this.columnManager.reset(nextProps.columns); this.columnManager.reset(nextProps.columns);
if (nextProps.columns.length !== this.props.columns.length && this.refs && this.refs.bodyTable) { if (nextProps.columns.length !== this.props.columns.length && this.refs && this.bodyTable) {
this.scrollTop = this.refs.bodyTable.scrollTop; this.scrollTop = this.bodyTable.scrollTop;
} }
} else if (nextProps.children !== this.props.children) { } else if (nextProps.children !== this.props.children) {
this.columnManager.reset(null, nextProps.children); this.columnManager.reset(null, nextProps.children);
} }
//适配lazyload //适配lazyload
if (nextProps.scrollTop > -1) { if (nextProps.scrollTop > -1) {
// this.refs.bodyTable.scrollTop = nextProps.scrollTop; // this.bodyTable.scrollTop = nextProps.scrollTop;
this.scrollTop = nextProps.scrollTop; this.scrollTop = nextProps.scrollTop;
} }
if (!nextProps.originWidth) { if (!nextProps.originWidth) {
@ -382,7 +382,7 @@ var Table = function (_Component) {
if (this.scrollTop > -1) { if (this.scrollTop > -1) {
this.refs.fixedColumnsBodyLeft && (this.refs.fixedColumnsBodyLeft.scrollTop = this.scrollTop); this.refs.fixedColumnsBodyLeft && (this.refs.fixedColumnsBodyLeft.scrollTop = this.scrollTop);
this.refs.fixedColumnsBodyRight && (this.refs.fixedColumnsBodyRight.scrollTop = this.scrollTop); this.refs.fixedColumnsBodyRight && (this.refs.fixedColumnsBodyRight.scrollTop = this.scrollTop);
this.refs.bodyTable.scrollTop = this.scrollTop; this.bodyTable.scrollTop = this.scrollTop;
this.scrollTop = -1; this.scrollTop = -1;
} }
if (prevProps.data.length === 0 || this.props.data.length === 0) { if (prevProps.data.length === 0 || this.props.data.length === 0) {
@ -444,11 +444,11 @@ var Table = function (_Component) {
var props = this.props; var props = this.props;
var y = props.scroll && props.scroll.y; var y = props.scroll && props.scroll.y;
if (y) { if (y) {
var bodyH = this.refs.bodyTable.clientHeight; var bodyH = this.bodyTable.clientHeight;
var bodyContentH = this.refs.bodyTable.querySelector('table').clientHeight; var bodyContentH = this.bodyTable.querySelector('table').clientHeight;
var rightBodyTable = this.refs.fixedColumnsBodyRight; var rightBodyTable = this.refs.fixedColumnsBodyRight;
var overflowy = bodyContentH <= bodyH ? 'auto' : 'scroll'; var overflowy = bodyContentH <= bodyH ? 'auto' : 'scroll';
this.refs.bodyTable.style.overflowY = overflowy; this.bodyTable.style.overflowY = overflowy;
this.refs.headTable.style.overflowY = overflowy; this.refs.headTable.style.overflowY = overflowy;
rightBodyTable && (rightBodyTable.style.overflowY = overflowy); rightBodyTable && (rightBodyTable.style.overflowY = overflowy);
} }
@ -1077,7 +1077,9 @@ var Table = function (_Component) {
{ {
className: clsPrefix + '-body', className: clsPrefix + '-body',
style: bodyStyle, style: bodyStyle,
ref: 'bodyTable', ref: function ref(el) {
_this4.bodyTable = el;
},
onMouseOver: this.detectScrollTarget, onMouseOver: this.detectScrollTarget,
onTouchStart: this.detectScrollTarget, onTouchStart: this.detectScrollTarget,
onScroll: this.handleBodyScroll, onScroll: this.handleBodyScroll,
@ -1191,8 +1193,8 @@ var Table = function (_Component) {
columns = _props7.columns, columns = _props7.columns,
heightConsistent = _props7.heightConsistent; heightConsistent = _props7.heightConsistent;
var headRows = this.refs.headTable ? this.refs.headTable.querySelectorAll('thead') : this.refs.bodyTable.querySelectorAll('thead'); var headRows = this.refs.headTable ? this.refs.headTable.querySelectorAll('thead') : this.bodyTable.querySelectorAll('thead');
var bodyRows = this.refs.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.refs.fixedColumnsBodyLeft && this.refs.fixedColumnsBodyLeft.querySelectorAll('.' + clsPrefix + '-row') || [];
var rightBodyRows = this.refs.fixedColumnsBodyRight && this.refs.fixedColumnsBodyRight.querySelectorAll('.' + clsPrefix + '-row') || []; var rightBodyRows = this.refs.fixedColumnsBodyRight && this.refs.fixedColumnsBodyRight.querySelectorAll('.' + clsPrefix + '-row') || [];
var fixedColumnsHeadRowsHeight = [].map.call(headRows, function (row) { var fixedColumnsHeadRowsHeight = [].map.call(headRows, function (row) {
@ -1237,8 +1239,8 @@ var Table = function (_Component) {
if (this.refs.headTable) { if (this.refs.headTable) {
this.refs.headTable.scrollLeft = 0; this.refs.headTable.scrollLeft = 0;
} }
if (this.refs.bodyTable) { if (this.bodyTable) {
this.refs.bodyTable.scrollLeft = 0; this.bodyTable.scrollLeft = 0;
} }
}; };

2
dist/demo.css.map vendored
View File

File diff suppressed because one or more lines are too long

23105
dist/demo.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/demo.js.map vendored
View File

File diff suppressed because one or more lines are too long

24
src/Table.js
View File

@ -184,15 +184,15 @@ class Table extends Component {
} }
if (nextProps.columns && nextProps.columns !== this.props.columns) { if (nextProps.columns && nextProps.columns !== this.props.columns) {
this.columnManager.reset(nextProps.columns); this.columnManager.reset(nextProps.columns);
if(nextProps.columns.length !== this.props.columns.length && this.refs && this.refs.bodyTable){ if(nextProps.columns.length !== this.props.columns.length && this.refs && this.bodyTable){
this.scrollTop = this.refs.bodyTable.scrollTop; this.scrollTop = this.bodyTable.scrollTop;
} }
} else if (nextProps.children !== this.props.children) { } else if (nextProps.children !== this.props.children) {
this.columnManager.reset(null, nextProps.children); this.columnManager.reset(null, nextProps.children);
} }
//适配lazyload //适配lazyload
if(nextProps.scrollTop > -1){ if(nextProps.scrollTop > -1){
// this.refs.bodyTable.scrollTop = nextProps.scrollTop; // this.bodyTable.scrollTop = nextProps.scrollTop;
this.scrollTop = nextProps.scrollTop; this.scrollTop = nextProps.scrollTop;
} }
if (!nextProps.originWidth) { if (!nextProps.originWidth) {
@ -220,7 +220,7 @@ class Table extends Component {
if(this.scrollTop > -1){ if(this.scrollTop > -1){
this.refs.fixedColumnsBodyLeft && ( this.refs.fixedColumnsBodyLeft.scrollTop = this.scrollTop); this.refs.fixedColumnsBodyLeft && ( this.refs.fixedColumnsBodyLeft.scrollTop = this.scrollTop);
this.refs.fixedColumnsBodyRight && ( this.refs.fixedColumnsBodyRight.scrollTop = this.scrollTop); this.refs.fixedColumnsBodyRight && ( this.refs.fixedColumnsBodyRight.scrollTop = this.scrollTop);
this.refs.bodyTable.scrollTop = this.scrollTop; this.bodyTable.scrollTop = this.scrollTop;
this.scrollTop = -1; this.scrollTop = -1;
} }
if (prevProps.data.length === 0 || this.props.data.length === 0 ) { if (prevProps.data.length === 0 || this.props.data.length === 0 ) {
@ -300,11 +300,11 @@ class Table extends Component {
const props = this.props; const props = this.props;
const y = props.scroll && props.scroll.y; const y = props.scroll && props.scroll.y;
if(y){ if(y){
const bodyH = this.refs.bodyTable.clientHeight; const bodyH = this.bodyTable.clientHeight;
const bodyContentH = this.refs.bodyTable.querySelector('table').clientHeight; const bodyContentH = this.bodyTable.querySelector('table').clientHeight;
const rightBodyTable = this.refs.fixedColumnsBodyRight; const rightBodyTable = this.refs.fixedColumnsBodyRight;
const overflowy = bodyContentH <= bodyH ? 'auto':'scroll'; const overflowy = bodyContentH <= bodyH ? 'auto':'scroll';
this.refs.bodyTable.style.overflowY = overflowy; this.bodyTable.style.overflowY = overflowy;
this.refs.headTable.style.overflowY = overflowy; this.refs.headTable.style.overflowY = overflowy;
rightBodyTable && (rightBodyTable.style.overflowY = overflowy); rightBodyTable && (rightBodyTable.style.overflowY = overflowy);
@ -927,7 +927,7 @@ class Table extends Component {
<div <div
className={`${clsPrefix}-body`} className={`${clsPrefix}-body`}
style={bodyStyle} style={bodyStyle}
ref="bodyTable" ref={(el)=>{this.bodyTable = el}}
onMouseOver={this.detectScrollTarget} onMouseOver={this.detectScrollTarget}
onTouchStart={this.detectScrollTarget} onTouchStart={this.detectScrollTarget}
onScroll={this.handleBodyScroll} onScroll={this.handleBodyScroll}
@ -1020,8 +1020,8 @@ class Table extends Component {
const { clsPrefix, height, headerHeight,columns,heightConsistent } = this.props; const { clsPrefix, height, headerHeight,columns,heightConsistent } = this.props;
const headRows = this.refs.headTable ? const headRows = this.refs.headTable ?
this.refs.headTable.querySelectorAll('thead') : this.refs.headTable.querySelectorAll('thead') :
this.refs.bodyTable.querySelectorAll('thead'); this.bodyTable.querySelectorAll('thead');
const bodyRows = this.refs.bodyTable.querySelectorAll(`.${clsPrefix}-row`) || []; const bodyRows = this.bodyTable.querySelectorAll(`.${clsPrefix}-row`) || [];
const leftBodyRows = this.refs.fixedColumnsBodyLeft && this.refs.fixedColumnsBodyLeft.querySelectorAll(`.${clsPrefix}-row`) || []; const leftBodyRows = this.refs.fixedColumnsBodyLeft && this.refs.fixedColumnsBodyLeft.querySelectorAll(`.${clsPrefix}-row`) || [];
const rightBodyRows = this.refs.fixedColumnsBodyRight && this.refs.fixedColumnsBodyRight.querySelectorAll(`.${clsPrefix}-row`) || []; const rightBodyRows = this.refs.fixedColumnsBodyRight && this.refs.fixedColumnsBodyRight.querySelectorAll(`.${clsPrefix}-row`) || [];
const fixedColumnsHeadRowsHeight = [].map.call( const fixedColumnsHeadRowsHeight = [].map.call(
@ -1069,8 +1069,8 @@ class Table extends Component {
if (this.refs.headTable) { if (this.refs.headTable) {
this.refs.headTable.scrollLeft = 0; this.refs.headTable.scrollLeft = 0;
} }
if (this.refs.bodyTable) { if (this.bodyTable) {
this.refs.bodyTable.scrollLeft = 0; this.bodyTable.scrollLeft = 0;
} }
} }