fix conflicts

Author: AllenFang

CHANGELOG.md

@@ -1,3 +1,44 @@
+<a name="v3.3.7"></a>
+# [v3.3.7](https://github.com/AllenFang/react-bootstrap-table/compare/v3.3.6...v3.3.7) (2017-05-22)
+## Enhancement
+* Allow conditionally specify columns([9b748df](https://github.com/AllenFang/react-bootstrap-table/commit/9b748df5eb11dad1fe9c5c28044007dbae119b02))
+* [#1319](https://github.com/AllenFang/react-bootstrap-table/issues/1319)([338424f](https://github.com/AllenFang/react-bootstrap-table/commit/338424f367b0d233f37c0514daffa4ca043f6f74))
+* Allow date filter to filter string value, `react-bootstrap-table` will convert string to Date([63a022a](https://github.com/AllenFang/react-bootstrap-table/commit/63a022a91c7bd90e1f99013d23e3601f1d5de30e))
+
+<a name="v3.3.6"></a>
+# [v3.3.6](https://github.com/AllenFang/react-bootstrap-table/compare/v3.3.5...v3.3.6) (2017-05-19)
+## Bug fixes
+* Fixed ExpandComponent.js:47 Uncaught TypeError: Cannot read property 'className' of undefined([5618342](https://github.com/AllenFang/react-bootstrap-table/commit/5618342f9f46c2ee577fe03e44c38bd0bd1e9666))
+
+<a name="v3.3.5"></a>
+# [v3.3.5](https://github.com/AllenFang/react-bootstrap-table/compare/v3.3.4...v3.3.5) (2017-05-17)
+## Bug fixes
+* Fix `editable.type` will be ignore if is not `textarea`, `select`, `checkbox`, and `datetime`([e3f87e0](https://github.com/AllenFang/react-bootstrap-table/commit/e3f87e0160ae73e95fa54f4586ab99cfe2cfb720))
+
+## Enhancement
+* Able to set the default value for field in insert model easily([5bd62b4](https://github.com/AllenFang/react-bootstrap-table/commit/5bd62b4acec324f20188104d792285a0d9147204))
+	* Use `editable.defaultValue`
+* Support `options.onExpand` and accept a function which will be called when expand/collapse happen([f54ebc3](https://github.com/AllenFang/react-bootstrap-table/commit/f54ebc38e1f8d93ecb161934e364e72ce7b35c50))
+	* Check [example](https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/expandRow/manage-expanding.js#L62).
+* Allow `selectRow.className` to accept a function for a easy customization reason([440d376](https://github.com/AllenFang/react-bootstrap-table/commit/440d376158a091dee7b6c6b312ed0827ee897c09))
+	* Check [example](https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/selection/select-row-class-table.js#L47)
+* Able to apply custom style on filter([1e8f1f9](https://github.com/AllenFang/react-bootstrap-table/commit/1e8f1f9fbe6d744bd36256e8d5b01dc6c189dc5a))
+	* Check [example](https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/column-filter/filter-style.js#L75)
+
+<a name="v3.3.4"></a>
+# [v3.3.4](https://github.com/AllenFang/react-bootstrap-table/compare/v3.3.3...v3.3.4) (2017-05-13)
+## Bug fiexs
+* Fix `afterSearch` and `afterColumnFilter` doesn't be called when table rerender([24e5b66](https://github.com/AllenFang/react-bootstrap-table/commit/24e5b666c39286faf0b42a64498177f30e6e7b90))
+
+## Enhancement
+* Able to clean sorted table([261c6ea](https://github.com/AllenFang/react-bootstrap-table/commit/261c6ea04c5cc0c06eb3d6182ea17a9ce08c0e6b))
+	* Please check [this](https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/sort/clean-sorted-table.js#L24-L26) example
+
+* Able to configure the text and value of select option in cell editing or insert modal([face547](https://github.com/AllenFang/react-bootstrap-table/commit/face5476351e77db416f1cb27178988367151167))
+	* Please check [this](https://github.com/AllenFang/react-bootstrap-table/blob/master/examples/js/advance/edit-type-table.js#L7-L24) example
+	* It's only for the case of `editable.type` is `select`
+	* Releated issues: [#1031](https://github.com/AllenFang/react-bootstrap-table/issues/1301) and [#243](https://github.com/AllenFang/react-bootstrap-table/pull/243)
+
 <a name="v3.3.3"></a>
 # [v3.3.3](https://github.com/AllenFang/react-bootstrap-table/compare/v3.3.2...v3.3.3) (2017-05-08)
 ## Bug fixes

CONTRIBUTING.md

@@ -1 +1,5 @@
-**I'm busy on my work so maybe will have a long delay to see your guys PR or issues, sorry. I'll back as soon as possible**
+**Currently, I'm busy on my job, so maybe have some delay on you guys's issue.**
+
+* Please make sure your issue wasn't open before
+* Please provide your example code and keep it simple and minimal if necessary
+* Please give a clean steps to show everyone how to reproduce your issus

dist/react-bootstrap-table.js

@@ -1,6 +1,7 @@
 /* eslint max-len: 0 */
 import React from 'react';
 import EditTypeTable from './edit-type-table';
+import InsertDefaultValueTable from './insert-default-value-table';
 import DataInsertTypeTable from './insert-type-table';
 import AutoRowKeyTable from './auto-rowkey-table';
 import ValidatorTable from './validator-table';
@@ -24,7 +25,11 @@ class Demo extends React.Component {
           { renderLinks('advance/insert-type-table.js') }
           <DataInsertTypeTable/>
         </Panel>
-        <Panel header={ 'Hide column on Insert Modal)' }>
+        <Panel header={ 'Default Value on Insert Modal' }>
+          { renderLinks('advance/insert-default-value-table.js') }
+          <InsertDefaultValueTable/>
+        </Panel>
+        <Panel header={ 'Hide column on Insert Modal' }>
           { renderLinks('advance/hide-on-insert-table.js') }
           <h5>This example hide the Job Name field in insert modal</h5>
           <HideOnInsertTable/>

dist/react-bootstrap-table.js.map

@@ -22,6 +22,8 @@ const jobTypes = [ {
   value: 'D',
   text: 'TYPE_D'
 } ];
+// For above example, you can also use textKey and valueKey to change the hard code key for 'text' and 'value'
+// for example, editable={ { type: 'select', options: { values: jobTypes, textKey: 'customTextKey , valueKey: 'customValueKey'} } }
 
 function addJobs(quantity) {
   const startId = jobs.length;

dist/react-bootstrap-table.min.js

@@ -0,0 +1,63 @@
+/* eslint max-len: 0 */
+import React from 'react';
+import { BootstrapTable, TableHeaderColumn } from 'react-bootstrap-table';
+
+
+const jobs = [];
+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;
+  for (let i = 0; i < quantity; i++) {
+    const id = startId + i;
+    jobs.push({
+      id: id,
+      name: 'Item name ' + id,
+      type: 'B',
+      active: i % 2 === 0 ? 'Y' : 'N',
+      datetime: '200' + i + '-12-28T14:57:00'
+    });
+  }
+}
+
+addJobs(5);
+
+const cellEditProp = {
+  mode: 'click',
+  blurToSave: true
+};
+
+export default class InsertDefaultValueTable 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 } insertRow>
+        <TableHeaderColumn dataField='id' isKey={ true }>Job ID</TableHeaderColumn>
+        <TableHeaderColumn dataField='name' editable={ { type: 'textarea', defaultValue: 'Default Job Name' } }>Job Name</TableHeaderColumn>
+        <TableHeaderColumn dataField='type' dataFormat={ this.formatType } editable={ { type: 'select', options: { values: jobTypes }, defaultValue: 'C' } }>Job Type</TableHeaderColumn>
+        <TableHeaderColumn dataField='active' editable={ { type: 'checkbox', options: { values: 'Y:N' }, defaultValue: 'N' } }>Active</TableHeaderColumn>
+        <TableHeaderColumn dataField='datetime' editable={ { type: 'datetime' } }>Date Time</TableHeaderColumn>
+      </BootstrapTable>
+    );
+  }
+}

examples/js/advance/demo.js

@@ -36,6 +36,10 @@ function enumFormatter(cell, row, enumObject) {
 }
 
 function dateFormatter(cell, row) {
+  if (typeof cell !== 'object') {
+    cell = new Date(cell);
+  }
+
   return `${('0' + cell.getDate()).slice(-2)}/${('0' + (cell.getMonth() + 1)).slice(-2)}/${cell.getFullYear()}`;
 }
 

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

@@ -23,6 +23,10 @@ function addProducts(quantity) {
 addProducts(5);
 
 function dateFormatter(cell, row) {
+  if (typeof cell !== 'object') {
+    cell = new Date(cell);
+  }
+
   return `${('0' + cell.getDate()).slice(-2)}/${('0' + (cell.getMonth() + 1)).slice(-2)}/${cell.getFullYear()}`;
 }