Commit 2fd4ccc6 authored by zhangwenshuai's avatar zhangwenshuai

Merge branch 'delDetail' into dev

parents 4fdb291a b37a74f0
...@@ -28,6 +28,7 @@ const FormItem = Form.Item; ...@@ -28,6 +28,7 @@ const FormItem = Form.Item;
class FormWrap extends Component { class FormWrap extends Component {
wrapDom: any; wrapDom: any;
handleSubmit = (e) => { handleSubmit = (e) => {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
...@@ -120,27 +121,27 @@ class FormWrap extends Component { ...@@ -120,27 +121,27 @@ class FormWrap extends Component {
const transferColumn = transferAttr(columnType, newProps); const transferColumn = transferAttr(columnType, newProps);
const disabled = readOnlyFlag || (dynamicCellConfigDTO && dynamicCellConfigDTO.readonlyFlag); const disabled = readOnlyFlag || (dynamicCellConfigDTO && dynamicCellConfigDTO.readonlyFlag);
const onBlurFn1 = (changedValue: any, newVal: any) => { const onBlurFn1 = (changedValue: any, newVal: any) => {
validateFieldsAndScroll((err:any) => { if (typeof onBlurFn === 'function') {
// 即时编辑时需要对表单必填等规则校验 let temp: any[] = [];
if (!err) { value.map((item: any) => {
let temp: any[] = []; temp.push({ text: item.text, value: item.value });
value.map((item: any) => { });
temp.push({ text: item.text, value: item.value }); if (temp.length === 0) {
}); temp = emptyModel;
if (temp.length === 0) { }
temp = emptyModel; if (!!item.requiredFlag && Array.isArray(newVal) && !newVal[0].value) {
} return;
if (!!item.requiredFlag && Array.isArray(newVal) && !newVal[0].value) { }
return; if (_.isEqual(temp, newVal)) {
} return;
if (_.isEqual(temp, newVal)) { }
return; validateFieldsAndScroll((err:any) => {
} // 即时编辑时需要对表单必填等规则校验
if (typeof onBlurFn === 'function') { if (!err) {
onBlurFn(changedValue); onBlurFn(changedValue);
} }
} });
}); }
}; };
return ( return (
<FormItem key={columnName} label={this.renderLabel(item)}> <FormItem key={columnName} label={this.renderLabel(item)}>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment