Skip to content

Commit

Permalink
fix #979
Browse files Browse the repository at this point in the history
  • Loading branch information
AllenFang committed Jan 24, 2017
1 parent 474f05d commit 6e52226
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion src/BootstrapTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -1095,7 +1095,8 @@ BootstrapTable.propTypes = {
clickToSelectAndEditCell: PropTypes.bool,
clickToExpand: PropTypes.bool,
showOnlySelected: PropTypes.bool,
unselectable: PropTypes.array
unselectable: PropTypes.array,
columnWidth: PropTypes.oneOfType([ PropTypes.number, PropTypes.string ])
}),
cellEdit: PropTypes.shape({
mode: PropTypes.string,
Expand Down
4 changes: 2 additions & 2 deletions src/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ export default {
selectRow.mode === Const.ROW_SELECT_MULTI;
if (isSelectRowDefined) {
const style = {
width: 30,
minWidth: 30
width: selectRow.columnWidth || 30,
minWidth: selectRow.columnWidth || 30
};
if (!selectRow.hideSelectColumn) {
selectRowHeader = (<col style={ style } key={ -1 }></col>);
Expand Down

0 comments on commit 6e52226

Please sign in to comment.