Follow up on PR AllenFang#418

rebased the code on latest master
added support for search
updated example to show filtering and search

Author: jfremy

examples/js/custom-data-access/custom-data-access.js

@@ -15,7 +15,7 @@ function addProducts(quantity) {
       price: 2100 + i,
       category: {
         id: 20 + i,
-        name: 'Category name ' + i
+        name: 'Category name ' + (quantity + i)
       }
     });
   }
@@ -30,10 +30,10 @@ function categoryName(product) {
 export default class TrClassStringTable extends React.Component {
   render() {
     return (
-      <BootstrapTable data={ products }>
+      <BootstrapTable data={ products } search={ true } >
           <TableHeaderColumn dataField='id' isKey={ true }>Product ID</TableHeaderColumn>
           <TableHeaderColumn dataField='name'>Product Name</TableHeaderColumn>
-          <TableHeaderColumn dataField='price' dataAccess={ categoryName }>Category name</TableHeaderColumn>
+          <TableHeaderColumn dataField='price' dataAccess={ categoryName } filter={ { type: 'TextFilter' } }>Category name</TableHeaderColumn>
       </BootstrapTable>
     );
   }

src/store/TableDataStore.js

@@ -427,7 +427,7 @@ export class TableDataStore {
         if (this.colInfos[key]) {
           const { format, filterFormatted, formatExtraData } = this.colInfos[key];
           if (filterFormatted && format) {
-            targetVal = format(row[key], row, formatExtraData);
+            targetVal = format(targetVal, row, formatExtraData);
           }
         }
 
@@ -480,7 +480,9 @@ export class TableDataStore {
         const key = keys[i];
         if (this.colInfos[key] && row[key]) {
           const { format, filterFormatted, formatExtraData, searchable } = this.colInfos[key];
-          let targetVal = row[key];
+          let targetVal = typeof this.colInfos[key].dataAccess === 'function' ?
+            this.colInfos[key].dataAccess(row) :
+            row[key];
           if (searchable) {
             if (filterFormatted && format) {
               targetVal = format(targetVal, row, formatExtraData);