fix #1108

AllenFang · Apr 1, 2017 · 136dec9 · 136dec9
1 parent 87158e0
commit 136dec9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/src/BootstrapTable.js b/src/BootstrapTable.js
@@ -1270,7 +1270,7 @@ BootstrapTable.propTypes = {
       Const.ROW_SELECT_MULTI
     ]),
     customComponent: PropTypes.func,
-    bgColor: PropTypes.string,
+    bgColor: PropTypes.oneOfType([ PropTypes.string, PropTypes.func ]),
     selected: PropTypes.array,
     onSelect: PropTypes.func,
     onSelectAll: PropTypes.func,

diff --git a/src/TableBody.js b/src/TableBody.js
@@ -153,6 +153,7 @@ class TableBody extends Component {
       }
       const result = [ <TableRow isSelected={ selected } key={ key } className={ trClassName }
         index={ r }
+        row={ data }
         selectRow={ isSelectRowDefined ? this.props.selectRow : undefined }
         enableCellEdit={ cellEdit.mode !== Const.CELL_EDIT_NONE }
         onRowClick={ this.handleRowClick }

diff --git a/src/TableRow.js b/src/TableRow.js
@@ -1,3 +1,4 @@
+/* eslint no-nested-ternary: 0 */
 import classSet from 'classnames';
 import React, { Component, PropTypes } from 'react';
 
@@ -71,12 +72,18 @@ class TableRow extends Component {
 
   render() {
     this.clickNum = 0;
+    const { selectRow, row, isSelected } = this.props;
+    let backgroundColor = null;
+
+    if (selectRow) {
+      backgroundColor = typeof selectRow.bgColor === 'function' ?
+        selectRow.bgColor(row, isSelected) : ( isSelected ? selectRow.bgColor : null);
+    }
+
     const trCss = {
-      style: {
-        backgroundColor: this.props.isSelected ? this.props.selectRow.bgColor : null
-      },
+      style: { backgroundColor },
       className: classSet(
-        this.props.isSelected ? this.props.selectRow.className : null,
+        isSelected ? selectRow.className : null,
         this.props.className
       )
     };
@@ -92,6 +99,7 @@ class TableRow extends Component {
 }
 TableRow.propTypes = {
   index: PropTypes.number,
+  row: PropTypes.any,
   isSelected: PropTypes.bool,
   enableCellEdit: PropTypes.bool,
   onRowClick: PropTypes.func,