fixed wrong conflict fixs for #514

This commit is contained in:
AllenFang 2018-09-05 23:20:36 +08:00
parent 8c10867b8c
commit 52fc84899b

View File

@ -3,8 +3,8 @@ import React from 'react';
import { Consumer } from './context';
import createEditingCell from './editing-cell';
export default (_) => {
const EditingCell = createEditingCell(_);
export default (_, onStartEdit) => {
const EditingCell = createEditingCell(_, onStartEdit);
const renderWithEditingCell = (props, cellEdit) => {
const content = _.get(props.row, props.column.dataField);
let editCellstyle = props.column.editCellStyle || {};