fix conflicts

Author: AllenFang

dist/react-bootstrap-table.js

@@ -4,7 +4,24 @@ import { BootstrapTable, TableHeaderColumn } from 'react-bootstrap-table';
 
 
 const jobs = [];
-const jobTypes = [ 'A', 'B', 'C', 'D' ];
+// editable, select type also accept a string array
+// it's most simple case for using select, but the text and value will all be the value in array
+// const jobTypes = [ 'A', 'B', 'C', 'D' ];
+//
+// Following case will be more easy to control the text and value in select.
+const jobTypes = [ {
+  value: 'A',
+  text: 'TYPE_A'
+}, {
+  value: 'B',
+  text: 'TYPE_B'
+}, {
+  value: 'C',
+  text: 'TYPE_C'
+}, {
+  value: 'D',
+  text: 'TYPE_D'
+} ];
 
 function addJobs(quantity) {
   const startId = jobs.length;
@@ -28,12 +45,21 @@ const cellEditProp = {
 };
 
 export default class EditTypeTable extends React.Component {
+  constructor(props) {
+    super(props);
+    this.formatType = this.formatType.bind(this);
+  }
+
+  formatType(cell) {
+    return `TYPE_${cell}`;
+  }
+
   render() {
     return (
       <BootstrapTable data={ jobs } cellEdit={ cellEditProp }>
         <TableHeaderColumn dataField='id' isKey={ true }>Job ID</TableHeaderColumn>
         <TableHeaderColumn dataField='name' editable={ { type: 'textarea' } }>Job Name</TableHeaderColumn>
-        <TableHeaderColumn dataField='type' editable={ { type: 'select', options: { values: jobTypes } } }>Job Type</TableHeaderColumn>
+        <TableHeaderColumn dataField='type' dataFormat={ this.formatType } editable={ { type: 'select', options: { values: jobTypes } } }>Job Type</TableHeaderColumn>
         <TableHeaderColumn dataField='active' editable={ { type: 'checkbox', options: { values: 'Y:N' } } }>Active</TableHeaderColumn>
         <TableHeaderColumn dataField='datetime' editable={ { type: 'datetime' } }>Date Time</TableHeaderColumn>
       </BootstrapTable>

dist/react-bootstrap-table.js.map

@@ -22,32 +22,43 @@ addProducts(100);
 export default class ExternallyManagedSelection extends React.Component {
   constructor(props) {
     super(props);
+    this.onSelectAll = this.onSelectAll.bind(this);
+    this.onRowSelect = this.onRowSelect.bind(this);
     this.state = {
       selected: [],
       currPage: 1
     };
   }
 
+  onRowSelect({ id }, isSelected) {
+    if (isSelected && this.state.selected.length !== 2) {
+      this.setState({
+        selected: [ ...this.state.selected, id ].sort(),
+        currPage: this.refs.table.state.currPage
+      });
+    } else {
+      this.setState({ selected: this.state.selected.filter(it => it !== id) });
+    }
+    return false;
+  }
+
+  onSelectAll(isSelected) {
+    if (!isSelected) {
+      this.setState({ selected: [] });
+    }
+    return false;
+  }
+
   render() {
     const {
       currPage
     } = this.state;
-    const onRowSelect = ({ id }, isSelected) => {
-      if (isSelected && this.state.selected.length !== 2) {
-        this.setState({
-          selected: [ ...this.state.selected, id ].sort(),
-          currPage: this.refs.table.state.currPage
-        });
-      } else {
-        this.setState({ selected: this.state.selected.filter(it => it !== id) });
-      }
-      return false;
-    };
 
     const selectRowProp = {
       mode: 'checkbox',
       clickToSelect: true,
-      onSelect: onRowSelect,
+      onSelect: this.onRowSelect,
+      onSelectAll: this.onSelectAll,
       selected: this.state.selected
     };
 

dist/react-bootstrap-table.min.js

@@ -0,0 +1,40 @@
+/* eslint max-len: 0 */
+import React from 'react';
+import { BootstrapTable, TableHeaderColumn } from 'react-bootstrap-table';
+
+
+const products = [];
+
+function addProducts(quantity) {
+  const startId = products.length;
+  for (let i = 0; i < quantity; i++) {
+    const id = startId + i;
+    products.push({
+      id: id,
+      name: 'Item name ' + id,
+      price: 2100 + i
+    });
+  }
+}
+
+addProducts(5);
+
+export default class CleanSortedTable extends React.Component {
+
+  cleanSort = () => {
+    this.refs.table.cleanSort();
+  }
+
+  render() {
+    return (
+      <div>
+        <button className='btn btn-default' onClick={ this.cleanSort }>Clean Sort</button>
+        <BootstrapTable ref='table' data={ products }>
+            <TableHeaderColumn dataField='id' isKey dataSort>Product ID</TableHeaderColumn>
+            <TableHeaderColumn dataField='name' dataSort>Product Name</TableHeaderColumn>
+            <TableHeaderColumn dataField='price'>Product Price</TableHeaderColumn>
+        </BootstrapTable>
+      </div>
+    );
+  }
+}

examples/js/advance/edit-type-table.js

@@ -12,6 +12,7 @@ import DisableSortIndicatorTable from './disable-sort-indicator-table';
 import CustomCaretSortTable from './custom-caret-sort-table';
 import ExternalMultiSort from './manage-multi-sort-external-table';
 import DefaultASCSortTable from './default-asc-sort-table';
+import CleanSortedTable from './clean-sorted-table';
 
 class Demo extends React.Component {
   render() {
@@ -125,6 +126,15 @@ class Demo extends React.Component {
             </div>
           </div>
         </div>
+        <div className='col-md-offset-1 col-md-8'>
+          <div className='panel panel-default'>
+            <div className='panel-heading'>Clean Sorted Table</div>
+            <div className='panel-body'>
+              <h5>Source in /examples/js/sort/clean-sorted-table.js</h5>
+              <CleanSortedTable />
+            </div>
+          </div>
+        </div>
       </div>
     );
   }

examples/js/selection/externally-managed-selection.js

@@ -480,6 +480,13 @@ class BootstrapTable extends Component {
     });
   }
 
+  cleanSort() {
+    this.store.cleanSortInfo();
+    this.setState({
+      reset: false
+    });
+  }
+
   handleSort = (order, sortField) => {
     if (this.props.options.onSortChange) {
       this.props.options.onSortChange(sortField, order, this.props);

examples/js/sort/clean-sorted-table.js

@@ -37,11 +37,18 @@ const editor = function(editable, attr, format, editorClass, defaultValue, ignor
       let options = [];
       const values = editable.options.values;
       if (Array.isArray(values)) {// only can use arrray data for options
-        let rowValue;
-        options = values.map((d, i) => {
-          rowValue = format ? format(d) : d;
+        let text;
+        let value;
+        options = values.map((option, i) => {
+          if (typeof option === 'object') {
+            text = option.text;
+            value = option.value;
+          } else {
+            text = format ? format(option) : option;
+            value = option;
+          }
           return (
-            <option key={ 'option' + i } value={ d }>{ rowValue }</option>
+            <option key={ 'option' + i } value={ value }>{ text }</option>
           );
         });
       }

examples/js/sort/demo.js

@@ -115,6 +115,10 @@ export class TableDataStore {
     }
   }
 
+  cleanSortInfo() {
+    this.sortList = [];
+  }
+
   setSelectedRowKey(selectedRowKeys) {
     this.selected = selectedRowKeys;
   }