fix #1552

AllenFang · Aug 21, 2017 · 1be402e · 1be402e
1 parent fced9fa
commit 1be402e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/TableBody.js b/src/TableBody.js
@@ -177,7 +177,8 @@ class TableBody extends Component {
         onSelectRow={ this.handleSelectRow }
         onExpandRow={ this.handleClickCell }
         unselectableRow={ disable }
-        style={ trStyle }>
+        style={ trStyle }
+        dbClickToEdit={ cellEdit.mode === Const.CELL_EDIT_DBCLICK } >
         { this.props.expandColumnOptions.expandColumnVisible &&
             this.props.expandColumnOptions.expandColumnBeforeSelectColumn &&
             expandedRowColumn }

diff --git a/src/TableRow.js b/src/TableRow.js
@@ -15,7 +15,9 @@ class TableRow extends Component {
     const rowIndex = this.props.index + 1;
     const cellIndex = e.target.cellIndex;
     if (this.props.onRowClick) this.props.onRowClick(rowIndex, cellIndex);
-    const { selectRow, unselectableRow, isSelected, onSelectRow, onExpandRow } = this.props;
+    const {
+      selectRow, unselectableRow, isSelected, onSelectRow, onExpandRow, dbClickToEdit
+    } = this.props;
     if (selectRow) {
       if (selectRow.clickToSelect && !unselectableRow) {
         onSelectRow(rowIndex, !isSelected, e);
@@ -33,7 +35,9 @@ class TableRow extends Component {
           this.clickNum = 0;
         }, 200);
       } else {
-        this.expandRow(rowIndex, cellIndex);
+        if (dbClickToEdit) {
+          this.expandRow(rowIndex, cellIndex);
+        }
       }
     }
   }