no more expand row props resolver

This commit is contained in:
AllenFang 2018-08-19 13:07:10 +08:00
parent dee92bd53d
commit 2da6c8c622
3 changed files with 5 additions and 23 deletions

View File

@ -55,7 +55,8 @@ class BootstrapTable extends PropsBaseResolver(Component) {
rowClasses,
wrapperClasses,
rowEvents,
selectRow
selectRow,
expandRow
} = this.props;
const tableWrapperClass = cs('react-bootstrap-table', wrapperClasses);
@ -68,7 +69,6 @@ class BootstrapTable extends PropsBaseResolver(Component) {
}, classes);
const tableCaption = (caption && <Caption>{ caption }</Caption>);
const expandRow = this.resolveExpandRowProps();
return (
<div className={ tableWrapperClass }>
@ -193,7 +193,8 @@ BootstrapTable.defaultProps = {
},
expandRow: {
renderer: undefined,
expanded: []
expanded: [],
nonExpandable: []
}
};

View File

@ -1,17 +0,0 @@
export default ExtendBase =>
class ExpandRowResolver extends ExtendBase {
resolveExpandRowProps() {
const { expandRow, expanded, onRowExpand, onAllRowExpand, isAnyExpands } = this.props;
if (expandRow) {
return {
...expandRow,
expanded,
onRowExpand,
onAllRowExpand,
isAnyExpands,
nonExpandable: expandRow.nonExpandable || []
};
}
return null;
}
};

View File

@ -1,9 +1,7 @@
import ColumnResolver from './column-resolver';
import ExpandRowResolver from './expand-row-resolver';
export default ExtendBase =>
class TableResolver extends
ExpandRowResolver(ColumnResolver(ExtendBase)) {
class TableResolver extends ColumnResolver(ExtendBase) {
validateProps() {
const { keyField } = this.props;
if (!keyField) {