Merge branch 'bennnjamin-master'

Author: AllenFang

.gitignore

@@ -7,4 +7,4 @@ node_modules
 *.iml
 lib/
 npm-debug.log
-.vscode
+.vscode

dist/react-bootstrap-table-all.min.css

@@ -6,6 +6,7 @@ import AutoRowKeyTable from './auto-rowkey-table';
 import ValidatorTable from './validator-table';
 import HideOnInsertTable from './hide-on-insert-table';
 import DisableToastrTable from './disable-toastr-table';
+import EditTypeReadOnlyTable from './validator-table-read-only';
 
 import renderLinks from '../utils';
 
@@ -40,6 +41,10 @@ class Demo extends React.Component {
           { renderLinks('advance/disable-toastr-table.js') }
           <DisableToastrTable/>
         </Panel>
+        <Panel header={ 'Custom Display Validating Message(Job Name column is read only)' }>
+          { renderLinks('advance/validator-table-read-only.js') }
+          <EditTypeReadOnlyTable/>
+        </Panel>
       </Col>
     );
   }

dist/react-bootstrap-table.js

@@ -0,0 +1,68 @@
+/* eslint max-len: 0 */
+/* eslint no-unused-vars: 0 */
+import React from 'react';
+import { BootstrapTable, TableHeaderColumn } from 'react-bootstrap-table';
+
+
+const jobs = [];
+const jobTypes = [ 'A', 'B', 'C', 'D' ];
+
+function addJobs(quantity) {
+  const startId = jobs.length;
+  for (let i = 0; i < quantity; i++) {
+    const id = startId + i;
+    jobs.push({
+      id: id,
+      status: '200',
+      name: 'Item name ' + id,
+      type: 'B',
+      active: i % 2 === 0 ? 'Y' : 'N'
+    });
+  }
+}
+
+addJobs(5);
+
+const cellEditProp = {
+  mode: 'click',
+  blurToSave: true
+};
+
+// validator function pass the user input value and row object. In addition, a bool return value is expected
+function jobNameValidator(value, row) {
+  const response = { isValid: true, notification: { type: 'success', msg: '', title: '' } };
+  if (!value) {
+    response.isValid = false;
+    response.notification.type = 'error';
+    response.notification.msg = 'Value must be inserted';
+    response.notification.title = 'Requested Value';
+  } else if (value.length < 10) {
+    response.isValid = false;
+    response.notification.type = 'error';
+    response.notification.msg = 'Value must have 10+ characters';
+    response.notification.title = 'Invalid Value';
+  }
+  return response;
+}
+
+function jobStatusValidator(value, row) {
+  const nan = isNaN(parseInt(value, 10));
+  if (nan) {
+    return 'Job Status must be a integer!';
+  }
+  return true;
+}
+
+export default class EditTypeReadOnlyTable extends React.Component {
+  render() {
+    return (
+      <BootstrapTable data={ jobs } cellEdit={ cellEditProp } insertRow={ true }>
+        <TableHeaderColumn dataField='id' isKey={ true }>Job ID</TableHeaderColumn>
+        <TableHeaderColumn dataField='status' editable={ { validator: jobStatusValidator } }>Job Status</TableHeaderColumn>
+        <TableHeaderColumn dataField='name' editable={ { type: 'textarea', validator: jobNameValidator, readOnly: true } }>Job Name</TableHeaderColumn>
+        <TableHeaderColumn dataField='type' editable={ { type: 'select', options: { values: jobTypes } } }>Job Type</TableHeaderColumn>
+        <TableHeaderColumn dataField='active' editable={ { type: 'checkbox', options: { values: 'Y:N' } } }>Active</TableHeaderColumn>
+      </BootstrapTable>
+    );
+  }
+}

dist/react-bootstrap-table.js.map

@@ -58,6 +58,7 @@ class TableBody extends Component {
         const isFocusCell = r === y && i === x;
         if (column.name !== this.props.keyField && // Key field can't be edit
           column.editable && // column is editable? default is true, user can set it false
+          column.editable.readOnly !== true &&
           this.state.currEditCell !== null &&
           this.state.currEditCell.rid === r &&
           this.state.currEditCell.cid === i &&
@@ -386,8 +387,10 @@ class TableBody extends Component {
       if (isFun(column.editable)) {
         editable = column.editable(column, row, nextRIndex, nextCIndex);
       }
-      if (editable && !column.hidden && keyField !== column.name) break;
-      else {
+      if (editable && editable.readOnly !== true &&
+        !column.hidden && keyField !== column.name) {
+        break;
+      } else {
         nextCIndex++;
       }
     } while (row);