diff --git a/components/apolloTable/editFormV3/index.tsx b/components/apolloTable/editFormV3/index.tsx index 348fc1096dd5892271014f88351428acf04f3b4e..70815a92a8c8f8ed5ca7a2325784972d411e3754 100644 --- a/components/apolloTable/editFormV3/index.tsx +++ b/components/apolloTable/editFormV3/index.tsx @@ -29,15 +29,14 @@ class FormWrap extends Component { form.validateFieldsAndScroll((err, values) => { if (!err) { const newValues: any[] = []; - debugger _.keys(values).map((key) => { const item = data.find((temp: any) => { return temp.columnName === key; }); const { columnType, renderEditForm, readOnlyFlag, dynamicCellConfigDTO } = item; - // if (readOnlyFlag || (dynamicCellConfigDTO && dynamicCellConfigDTO.readonlyFlag)) { - // return; - // } + if (readOnlyFlag || (dynamicCellConfigDTO && dynamicCellConfigDTO.readonlyFlag)) { + return; + } let detailConfig: any; if (typeof renderEditForm === 'function') { detailConfig = renderEditForm({ cellData: values[key], rowData, columnConfig: item }); @@ -81,29 +80,6 @@ class FormWrap extends Component { ); }; - validateRequired = (item, rule, value, callback) => { - const { columnAttrObj = {} } = item; - const { validator } = columnAttrObj; - if (!item.requiredFlag) { - callback(); - return; - } - if (!value || value.length === 0) { - callback('必填项不能为空'); - return; - } - const [first] = value; - if (!first.text && first.text !== 0 && !first.value && first.value !== 0) { - callback('必填项不能为空'); - return; - } - if (validator && typeof validator === 'function') { - const values = this.props.form.getFieldsValue(); - callback(validator({ value, values, item })); - } - callback(); - }; - renderEditForm = (item) => { const { getFieldDecorator } = this.props.form; const { rowData } = this.props; @@ -158,7 +134,7 @@ class FormWrap extends Component { }; render() { - const { loading, isShowDelBtn, data, btnWrapStyle, name, colsNum } = this.props; + const { loading, isShowDelBtn, data, btnWrapStyle, name, colsNum, delLabel } = this.props; return ( @@ -193,7 +169,7 @@ class FormWrap extends Component {
{isShowDelBtn ? ( ) : null}