fix #1009

AllenFang · Feb 5, 2017 · 94b4451 · 94b4451
1 parent f3b324d
commit 94b4451
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/src/BootstrapTable.js b/src/BootstrapTable.js
@@ -167,7 +167,8 @@ class BootstrapTable extends Component {
           export: column.props.export,
           expandable: column.props.expandable,
           index: i,
-          attrs: column.props.tdAttr
+          attrs: column.props.tdAttr,
+          style: column.props.tdStyle
         };
       }
     });

diff --git a/src/TableBody.js b/src/TableBody.js
@@ -106,7 +106,8 @@ class TableBody extends Component {
               onEdit={ this.handleEditCell }
               width={ column.width }
               onClick={ this.handleClickCell }
-              attrs={ column.attrs }>
+              attrs={ column.attrs }
+              style={ column.style }>
               { columnChild }
             </TableColumn>
           );

diff --git a/src/TableColumn.js b/src/TableColumn.js
@@ -76,12 +76,14 @@ class TableColumn extends Component {
       dataAlign,
       hidden,
       cellEdit,
-      attrs
+      attrs,
+      style
     } = this.props;
 
     const tdStyle = {
       textAlign: dataAlign,
-      display: hidden ? 'none' : null
+      display: hidden ? 'none' : null,
+      ...style
     };
 
     const opts = {};
@@ -113,7 +115,8 @@ TableColumn.propTypes = {
   columnTitle: PropTypes.string,
   children: PropTypes.node,
   onClick: PropTypes.func,
-  attrs: PropTypes.object
+  attrs: PropTypes.object,
+  style: PropTypes.object
 };
 
 TableColumn.defaultProps = {

diff --git a/src/TableHeaderColumn.js b/src/TableHeaderColumn.js
@@ -96,11 +96,13 @@ class TableHeaderColumn extends Component {
       children,
       caretRender,
       className,
-      isOnlyHead
+      isOnlyHead,
+      thStyle: style
     } = this.props;
     const thStyle = {
       textAlign: headerAlign || dataAlign,
-      display: hidden ? 'none' : null
+      display: hidden ? 'none' : null,
+      ...style
     };
     if (!isOnlyHead) {
       if (sortIndicator) {
@@ -259,7 +261,9 @@ TableHeaderColumn.propTypes = {
   sortIndicator: PropTypes.bool,
   export: PropTypes.bool,
   expandable: PropTypes.bool,
-  tdAttr: PropTypes.object
+  tdAttr: PropTypes.object,
+  tdStyle: PropTypes.Object,
+  thStyle: PropTypes.Object
 };
 
 TableHeaderColumn.defaultProps = {
@@ -291,7 +295,9 @@ TableHeaderColumn.defaultProps = {
   filter: undefined,
   sortIndicator: true,
   expandable: true,
-  tdAttr: undefined
+  tdAttr: undefined,
+  tdStyle: undefined,
+  thStyle: undefined
 };
 
 export default TableHeaderColumn;