Merge branch 'yakirg-v4.0.0-dev' into v4.0.0-dev

Author: AllenFang

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

@@ -32,7 +32,8 @@ function addJobs(quantity) {
     jobs.push({
       id: id,
       name: 'Item name ' + id,
-      type: 'B',
+      type1: 'A',
+      type2: 'B',
       active: i % 2 === 0 ? 'Y' : 'N',
       datetime: '200' + i + '-12-28T14:57:00'
     });
@@ -56,12 +57,21 @@ export default class EditTypeTable extends React.Component {
     return `TYPE_${cell}`;
   }
 
+  jobTypes(row) {
+    if (row.id > 2) {
+      return [ 'A', 'B' ];
+    } else {
+      return [ 'B', 'C', 'D', 'E' ];
+    }
+  }
+
   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' dataFormat={ this.formatType } editable={ { type: 'select', options: { values: jobTypes } } }>Job Type</TableHeaderColumn>
+        <TableHeaderColumn dataField='type1' dataFormat={ this.formatType } editable={ { type: 'select', options: { values: jobTypes } } }>Job Type1</TableHeaderColumn>
+        <TableHeaderColumn dataField='type2' editable={ { type: 'select', options: { values: this.jobTypes } } }>Job Type2</TableHeaderColumn>
         <TableHeaderColumn dataField='active' editable={ { type: 'checkbox', options: { values: 'Y:N' } } }>Active</TableHeaderColumn>
         <TableHeaderColumn dataField='datetime' editable={ { type: 'datetime' } }>Date Time</TableHeaderColumn>
       </BootstrapTable>

src/Editor.js

@@ -1,6 +1,7 @@
+import Utils from './util';
 import React from 'react';
 
-const editor = function(editable, attr, format, editorClass, defaultValue, ignoreEditable) {
+const editor = function(editable, attr, format, editorClass, defaultValue, ignoreEditable, row) {
   if (editable === true ||
     (editable === false && ignoreEditable) ||
     typeof editable === 'string') { // simple declare
@@ -35,7 +36,11 @@ const editor = function(editable, attr, format, editorClass, defaultValue, ignor
 
     if (editable.type === 'select') {// process select input
       let options = [];
-      const { values, textKey, valueKey } = editable.options;
+      let { values } = editable.options;
+      const { textKey, valueKey } = editable.options;
+      if (Utils.isFunction(values)) {
+        values = values(row);
+      }
       if (Array.isArray(values)) {// only can use arrray data for options
         let text;
         let value;
@@ -50,7 +55,8 @@ const editor = function(editable, attr, format, editorClass, defaultValue, ignor
           return (
             <option key={ 'option' + i } value={ value }>{ text }</option>
           );
-        });
+        }
+        );
       }
       return (
         <select { ...attr } defaultValue={ defaultValue }>

src/TableEditColumn.js

@@ -192,7 +192,8 @@ class TableEditColumn extends Component {
       };
       cellEditor = customEditor.getElement(this.handleCustomUpdate, customEditorProps);
     } else {
-      cellEditor = editor(editable, attr, format, editorClass, this.valueShortCircuit(fieldValue));
+      cellEditor = editor(editable, attr, format, editorClass, this.valueShortCircuit(fieldValue),
+          null, row);
     }
 
     if (isFocus) {