Skip to content

Commit

Permalink
fix #930
Browse files Browse the repository at this point in the history
  • Loading branch information
AllenFang committed Jan 7, 2017
1 parent 7987f39 commit aeb7125
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions src/BootstrapTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class BootstrapTable extends Component {
this.state = {
data: this.getTableData(),
currPage: currPage,
expanding: [],
expanding: this.props.options.expanding || [],
sizePerPage: this.props.options.sizePerPage || Const.SIZE_PER_PAGE_LIST[0],
selectedRowKeys: this.store.getSelectedRowKeys()
};
Expand Down Expand Up @@ -1141,7 +1141,8 @@ BootstrapTable.propTypes = {
ignoreEditable: PropTypes.bool,
defaultSearch: PropTypes.string,
expandRowBgColor: PropTypes.string,
expandBy: PropTypes.string
expandBy: PropTypes.string,
expanding: PropTypes.array
}),
fetchInfo: PropTypes.shape({
dataTotalSize: PropTypes.number
Expand Down Expand Up @@ -1243,7 +1244,8 @@ BootstrapTable.defaultProps = {
ignoreEditable: false,
defaultSearch: '',
expandRowBgColor: undefined,
expandBy: Const.EXPAND_BY_ROW
expandBy: Const.EXPAND_BY_ROW,
expanding: []
},
fetchInfo: {
dataTotalSize: 0
Expand Down

0 comments on commit aeb7125

Please sign in to comment.