fix #890

AllenFang · Dec 17, 2016 · 9183e71 · 9183e71
1 parent 460ba53
commit 9183e71
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/src/BootstrapTable.js b/src/BootstrapTable.js
@@ -142,7 +142,7 @@ class BootstrapTable extends Component {
         className: column.props.columnClassName,
         columnTitle: column.props.columnTitle,
         width: column.props.width,
-        text: column.props.children,
+        text: column.props.headerText || column.props.children,
         sortFunc: column.props.sortFunc,
         sortFuncExtraData: column.props.sortFuncExtraData,
         export: column.props.export,
@@ -843,7 +843,7 @@ class BootstrapTable extends Component {
         columns = children.map((column, r) => {
           const { props } = column;
           return {
-            name: props.children,
+            name: props.headerText || props.children,
             field: props.dataField,
             hiddenOnInsert: props.hiddenOnInsert,
             // when you want same auto generate value and not allow edit, example ID field
@@ -857,7 +857,7 @@ class BootstrapTable extends Component {
         });
       } else {
         columns = [ {
-          name: children.props.children,
+          name: children.props.headerText || children.props.children,
           field: children.props.dataField,
           editable: children.props.editable,
           hiddenOnInsert: children.props.hiddenOnInsert

diff --git a/src/TableHeaderColumn.js b/src/TableHeaderColumn.js
@@ -28,35 +28,36 @@ class TableHeaderColumn extends Component {
   }
 
   getFilters() {
+    const { headerText, children } = this.props;
     switch (this.props.filter.type) {
     case Const.FILTER_TYPE.TEXT: {
       return (
         <TextFilter ref='textFilter' { ...this.props.filter }
-          columnName={ this.props.children } filterHandler={ this.handleFilter } />
+          columnName={ headerText || children } filterHandler={ this.handleFilter } />
       );
     }
     case Const.FILTER_TYPE.REGEX: {
       return (
         <RegexFilter ref='regexFilter' { ...this.props.filter }
-          columnName={ this.props.children } filterHandler={ this.handleFilter } />
+          columnName={ headerText || children } filterHandler={ this.handleFilter } />
       );
     }
     case Const.FILTER_TYPE.SELECT: {
       return (
         <SelectFilter ref='selectFilter' { ...this.props.filter }
-          columnName={ this.props.children } filterHandler={ this.handleFilter } />
+          columnName={ headerText || children } filterHandler={ this.handleFilter } />
       );
     }
     case Const.FILTER_TYPE.NUMBER: {
       return (
         <NumberFilter ref='numberFilter' { ...this.props.filter }
-          columnName={ this.props.children } filterHandler={ this.handleFilter } />
+          columnName={ headerText || children } filterHandler={ this.handleFilter } />
       );
     }
     case Const.FILTER_TYPE.DATE: {
       return (
         <DateFilter ref='dateFilter' { ...this.props.filter }
-          columnName={ this.props.children } filterHandler={ this.handleFilter } />
+          columnName={ headerText || children } filterHandler={ this.handleFilter } />
       );
     }
     case Const.FILTER_TYPE.CUSTOM: {
@@ -75,6 +76,7 @@ class TableHeaderColumn extends Component {
   render() {
     let defaultCaret;
     const {
+      headerText,
       dataAlign,
       dataField,
       headerAlign,
@@ -111,7 +113,9 @@ class TableHeaderColumn extends Component {
       typeof className === 'function' ? className() : className,
       dataSort ? 'sort-column' : '');
 
-    const title = headerTitle && typeof children === 'string' ? { title: children } : null;
+    const title = {
+      title: ((headerTitle && typeof children === 'string') ? children : headerText)
+    };
     return (
       <th ref='header-col'
           className={ classes }
@@ -196,6 +200,7 @@ TableHeaderColumn.propTypes = {
   dataAlign: PropTypes.string,
   headerAlign: PropTypes.string,
   headerTitle: PropTypes.bool,
+  headerText: PropTypes.string,
   dataSort: PropTypes.bool,
   onSort: PropTypes.func,
   dataFormat: PropTypes.func,