column tilte property

AllenFang · May 4, 2016 · e77bd32 · e77bd32
1 parent f43d265
commit e77bd32
Show file tree

Hide file tree

Showing 8 changed files with 416 additions and 345 deletions.
diff --git a/__tests__/TableHeaderColumn-test.js b/__tests__/TableHeaderColumn-test.js
@@ -30,6 +30,7 @@ describe('TableHeaderColumn Test', function() {
     expect(idHeaderColumn.props.children).toEqual("Product ID");
     expect(idHeaderColumn.props.dataAlign).toEqual("left");
     expect(idHeaderColumn.props.dataSort).toEqual(false);
+    expect(idHeaderColumn.props.columnTitle).toEqual(false);
     expect(idHeaderColumn.props.dataFormat).toBe(undefined);
     expect(idHeaderColumn.props.isKey).toBe(true);
 
@@ -60,6 +61,7 @@ describe('TableHeaderColumn Test', function() {
     expect(idHeaderColumn.props.children).toEqual("Product ID");
     expect(idHeaderColumn.props.dataAlign).toEqual("center");
     expect(idHeaderColumn.props.dataSort).toEqual(false);
+    expect(idHeaderColumn.props.columnTitle).toEqual(false);
     expect(idHeaderColumn.props.dataFormat).toBe(undefined);
     expect(idHeaderColumn.props.isKey).toBe(false);
 
@@ -77,6 +79,7 @@ describe('TableHeaderColumn Test', function() {
     expect(idHeaderColumn.props.children).toEqual("Product ID");
     expect(idHeaderColumn.props.dataAlign).toEqual("left");
     expect(idHeaderColumn.props.dataSort).toEqual(false);
+    expect(idHeaderColumn.props.columnTitle).toEqual(false);
     expect(idHeaderColumn.props.dataFormat).toBe(undefined);
     expect(idHeaderColumn.props.isKey).toBe(true);
   });
@@ -94,10 +97,25 @@ describe('TableHeaderColumn Test', function() {
     expect(idHeaderColumn.props.children).toEqual("Product ID");
     expect(idHeaderColumn.props.dataAlign).toEqual("left");
     expect(idHeaderColumn.props.dataSort).toEqual(false);
+    expect(idHeaderColumn.props.columnTitle).toEqual(false);
     expect(idHeaderColumn.props.dataFormat).toEqual(priceFormatter);
     expect(idHeaderColumn.props.isKey).toBe(false);
   });
 
+  it('A columnTitle header column test', function(){
+    var idHeaderColumn = TestUtils.renderIntoDocument(
+      <TableHeaderColumn dataField="id" columnTitle={ true }>Product ID</TableHeaderColumn>
+    );
+
+    expect(idHeaderColumn.props.dataField).toEqual("id");
+    expect(idHeaderColumn.props.children).toEqual("Product ID");
+    expect(idHeaderColumn.props.dataAlign).toEqual("left");
+    expect(idHeaderColumn.props.dataSort).toEqual(false);
+    expect(idHeaderColumn.props.columnTitle).toEqual(true);
+    expect(idHeaderColumn.props.dataFormat).toEqual(undefined);
+    expect(idHeaderColumn.props.isKey).toBe(false);
+  });
+
   it('A sort header column test', function(){
     var idHeaderColumn = TestUtils.renderIntoDocument(
       <TableHeaderColumn dataField="id" dataSort={true}>Product ID</TableHeaderColumn>

diff --git a/dist/react-bootstrap-table.js b/dist/react-bootstrap-table.js
diff --git a/dist/react-bootstrap-table.js.map b/dist/react-bootstrap-table.js.map
diff --git a/dist/react-bootstrap-table.min.js b/dist/react-bootstrap-table.min.js
diff --git a/src/BootstrapTable.js b/src/BootstrapTable.js
@@ -125,6 +125,7 @@ class BootstrapTable extends Component {
         hidden: column.props.hidden,
         searchable: column.props.searchable,
         className: column.props.columnClassName,
+        columnTitle: column.props.columnTitle,
         width: column.props.width,
         text: column.props.children,
         sortFunc: column.props.sortFunc,

diff --git a/src/TableBody.js b/src/TableBody.js
@@ -63,6 +63,7 @@ class TableBody extends Component {
         } else {
           // add by bluespring for className customize
           let columnChild = fieldValue;
+          let columnTitle = null;
           let tdClassName = column.className;
           if (isFun(column.className)) {
             tdClassName = column.className(fieldValue, data, r, i);
@@ -76,12 +77,16 @@ class TableBody extends Component {
               );
             } else {
               columnChild = formattedValue;
+              columnTitle = column.columnTitle ? formattedValue.toString() : null;
             }
+          } else {
+            columnTitle = column.columnTitle ? fieldValue.toString() : null;
           }
           return (
             <TableColumn key={ i }
               dataAlign={ column.align }
               className={ tdClassName }
+              columnTitle={ columnTitle }
               cellEdit={ this.props.cellEdit }
               hidden={ column.hidden }
               onEdit={ this.handleEditCell }

diff --git a/src/TableColumn.js b/src/TableColumn.js
@@ -74,7 +74,7 @@ class TableColumn extends Component {
       }
     }
     return (
-      <td style={ tdStyle } className={ this.props.className } { ...opts }>
+      <td style={ tdStyle } title={ this.props.columnTitle } className={ this.props.className } { ...opts }>
         { this.props.children }
       </td>
     );
@@ -84,6 +84,7 @@ TableColumn.propTypes = {
   dataAlign: PropTypes.string,
   hidden: PropTypes.bool,
   className: PropTypes.string,
+  columnTitle: PropTypes.string,
   children: PropTypes.node
 };
 

diff --git a/src/TableHeaderColumn.js b/src/TableHeaderColumn.js
@@ -129,6 +129,7 @@ TableHeaderColumn.propTypes = {
   sortFunc: PropTypes.func,
   sortFuncExtraData: PropTypes.any,
   columnClassName: PropTypes.any,
+  columnTitle: PropTypes.bool,
   filterFormatted: PropTypes.bool,
   sort: PropTypes.string,
   caretRender: PropTypes.func,
@@ -159,6 +160,7 @@ TableHeaderColumn.defaultProps = {
   hidden: false,
   searchable: true,
   className: '',
+  columnTitle: false,
   width: null,
   sortFunc: undefined,
   columnClassName: '',