Merge branch 'madeinfree-fixed-#578'

Author: AllenFang

src/BootstrapTable.js

@@ -880,7 +880,8 @@ class BootstrapTable extends Component {
   }
 
   _adjustHeight = () => {
-    if (this.props.height.indexOf('%') === -1) {
+    if ((typeof this.props.height === 'number' && !isNaN(this.props.height)) ||
+      this.props.height.indexOf('%') === -1) {
       this.refs.body.refs.container.style.height =
         parseFloat(this.props.height, 10) - this.refs.header.refs.container.offsetHeight + 'px';
     }
@@ -912,8 +913,8 @@ class BootstrapTable extends Component {
 
 BootstrapTable.propTypes = {
   keyField: PropTypes.string,
-  height: PropTypes.string,
-  maxHeight: PropTypes.string,
+  height: PropTypes.oneOfType([ PropTypes.string, PropTypes.number ]),
+  maxHeight: PropTypes.oneOfType([ PropTypes.string, PropTypes.number ]),
   data: PropTypes.oneOfType([ PropTypes.array, PropTypes.object ]),
   remote: PropTypes.bool, // remote data, default is false
   striped: PropTypes.bool,