fix #1254

AllenFang · May 1, 2017 · e840849 · e840849
1 parent fa6da83
commit e840849
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/TableEditColumn.js b/src/TableEditColumn.js
@@ -16,6 +16,10 @@ class TableEditColumn extends Component {
     };
   }
 
+  valueShortCircuit(value) {
+    return value === null || typeof value === 'undefined' ? '' : value;
+  }
+
   handleKeyPress = e => {
     if (e.keyCode === 13 || e.keyCode === 9) {
       // Pressed ENTER
@@ -170,18 +174,18 @@ class TableEditColumn extends Component {
     editable.placeholder && (attr.placeholder = editable.placeholder);
 
     const editorClass = classSet({ 'animated': shakeEditor, 'shake': shakeEditor });
+    fieldValue = fieldValue === 0 ? '0' : fieldValue;
     let cellEditor;
     if (customEditor) {
       const customEditorProps = {
         row,
         ...attr,
-        defaultValue: fieldValue || '',
+        defaultValue: this.valueShortCircuit(fieldValue),
         ...customEditor.customEditorParameters
       };
       cellEditor = customEditor.getElement(this.handleCustomUpdate, customEditorProps);
     } else {
-      fieldValue = fieldValue === 0 ? '0' : fieldValue;
-      cellEditor = editor(editable, attr, format, editorClass, fieldValue || '');
+      cellEditor = editor(editable, attr, format, editorClass, this.valueShortCircuit(fieldValue));
     }
 
     if (isFocus) {