Merge remote-tracking branch 'origin/master'

one_stop_public/tableCompon/index.jsx

@@ -1120,7 +1120,7 @@ export default class tableCom extends Component {
       if(!this.props.isEdit&&this.props.fatherCode){
        
         obj = { ...this.props.fatherObj, ...this.props.form.getFieldsValue(), ...this.props.defaultValues[this.props.formKey] }
-        console.log("xxxxxxxxxxxxxxxxxxxxxxxxxxxttttttttt",this.props.fatherObj)
+       
       }else{
         obj = { ...this.props.obj, ...this.props.form.getFieldsValue(), ...this.props.defaultValues[this.props.formKey] }
       }
@@ -1699,17 +1699,12 @@ export default class tableCom extends Component {
 
 
 
-    if (this.props.fatherCode == null) {
-      if (dataColumn == null) {
+    if (this.props.fatherCode == null&&dataColumn == null) {
       dataColumn = { base52: this.props.uuid }
-        required = false;
-      } else {
+    }
     if (!dataColumn.isNull) {
       required = true;
     }
-      }
-    }
-
 
     var title = json.label || (dataColumn && dataColumn.title)
     var initValue;
@@ -2611,10 +2606,17 @@ export default class tableCom extends Component {
           </Form.Item>
         );
       } else {
+        
         return cm
       }
     } else {
-      return cm;
+      return (
+        <Form.Item
+        
+        >
+          {cm}
+        </Form.Item>
+      );
     }
   }
 }