Skip to content

Commit 51c3217

Browse files
committed
version props to assign the bootstrap version
1 parent 4ff2e5a commit 51c3217

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

src/BootstrapTable.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,7 @@ class BootstrapTable extends Component {
420420
onMouseLeave={ this.handleMouseLeave }>
421421
<TableHeader
422422
ref='header'
423+
version={ this.props.version }
423424
colGroups={ colGroups }
424425
headerContainerClass={ this.props.headerContainerClass }
425426
tableHeaderClass={ this.props.tableHeaderClass }
@@ -1449,6 +1450,7 @@ BootstrapTable.propTypes = {
14491450
height: PropTypes.oneOfType([ PropTypes.string, PropTypes.number ]),
14501451
maxHeight: PropTypes.oneOfType([ PropTypes.string, PropTypes.number ]),
14511452
data: PropTypes.oneOfType([ PropTypes.array, PropTypes.object ]),
1453+
version: PropTypes.string, // bootstrap version
14521454
remote: PropTypes.oneOfType([ PropTypes.bool, PropTypes.func ]), // remote data, default is false
14531455
replace: PropTypes.oneOfType([ PropTypes.bool, PropTypes.func ]),
14541456
scrollTop: PropTypes.oneOfType([ PropTypes.string, PropTypes.number ]),
@@ -1609,6 +1611,7 @@ BootstrapTable.propTypes = {
16091611
})
16101612
};
16111613
BootstrapTable.defaultProps = {
1614+
version: '3',
16121615
replace: false,
16131616
scrollTop: undefined,
16141617
expandComponent: undefined,

src/TableHeader.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class TableHeader extends Component {
6565
!this.props.expandColumnBeforeSelectColumn &&
6666
<ExpandRowHeaderColumn rowCount={ rowCount + 1 }/>
6767
]);
68-
const { sortIndicator, sortList, onSort, reset } = this.props;
68+
const { sortIndicator, sortList, onSort, reset, version } = this.props;
6969

7070
React.Children.forEach(this.props.children, (elm) => {
7171
if (elm === null || elm === undefined) {
@@ -81,11 +81,11 @@ class TableHeader extends Component {
8181
}
8282
if ((rowSpan + rowIndex) === (rowCount + 1)) {
8383
rows[rowIndex].push(React.cloneElement(
84-
elm, { reset, key: rowKey++, onSort, sort, sortIndicator, isOnlyHead: false }
84+
elm, { reset, key: rowKey++, onSort, sort, sortIndicator, isOnlyHead: false, version }
8585
));
8686
} else {
8787
rows[rowIndex].push(React.cloneElement(
88-
elm, { key: rowKey++, isOnlyHead: true }
88+
elm, { key: rowKey++, isOnlyHead: true, version }
8989
));
9090
}
9191
});
@@ -160,7 +160,8 @@ TableHeader.propTypes = {
160160
reset: PropTypes.bool,
161161
expandColumnVisible: PropTypes.bool,
162162
expandColumnComponent: PropTypes.func,
163-
expandColumnBeforeSelectColumn: PropTypes.bool
163+
expandColumnBeforeSelectColumn: PropTypes.bool,
164+
version: PropTypes.string
164165
};
165166

166167
export default TableHeader;

0 commit comments

Comments
 (0)