提交 5a5e15d8 authored 作者: chscls@163.com's avatar chscls@163.com

修复bug

上级 7049d1d3
...@@ -1120,7 +1120,7 @@ export default class tableCom extends Component { ...@@ -1120,7 +1120,7 @@ export default class tableCom extends Component {
if(!this.props.isEdit&&this.props.fatherCode){ if(!this.props.isEdit&&this.props.fatherCode){
obj = { ...this.props.fatherObj, ...this.props.form.getFieldsValue(), ...this.props.defaultValues[this.props.formKey] } obj = { ...this.props.fatherObj, ...this.props.form.getFieldsValue(), ...this.props.defaultValues[this.props.formKey] }
console.log("xxxxxxxxxxxxxxxxxxxxxxxxxxxttttttttt",this.props.fatherObj)
}else{ }else{
obj = { ...this.props.obj, ...this.props.form.getFieldsValue(), ...this.props.defaultValues[this.props.formKey] } obj = { ...this.props.obj, ...this.props.form.getFieldsValue(), ...this.props.defaultValues[this.props.formKey] }
} }
...@@ -1699,17 +1699,12 @@ export default class tableCom extends Component { ...@@ -1699,17 +1699,12 @@ export default class tableCom extends Component {
if (this.props.fatherCode == null) { if (this.props.fatherCode == null&&dataColumn == null) {
if (dataColumn == null) {
dataColumn = { base52: this.props.uuid } dataColumn = { base52: this.props.uuid }
required = false; }
} else {
if (!dataColumn.isNull) { if (!dataColumn.isNull) {
required = true; required = true;
} }
}
}
var title = json.label || (dataColumn && dataColumn.title) var title = json.label || (dataColumn && dataColumn.title)
var initValue; var initValue;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论