Merge branch 'master' of http://scjoyedu.eicp.net:9121/front-team/webPublic

one_stop_public/libs/ChildForm.jsx

@@ -26,7 +26,7 @@ export default class ChildForm extends React.Component {
         // Should be a controlled component.
         if ('value' in nextProps) {
             const value = nextProps.value;
-            this.setState(value);
+            this.state=value
         }
     }
     componentDidMount = () => {
@@ -98,18 +98,18 @@ export default class ChildForm extends React.Component {
 
     render() {
         const objs = this.state;
-
         const { form, mapData, sqlData, defaultValues, datas, base52, isEdit, addName, deleteName, obj, isMobile, json,modalInit } = this.props
         const span = json.span || 24
         const gutter = json.gutter != null ? json.gutter : 0
         const rights = this.props.rights
         const xx =  form.getFieldValue(base52)
+        
         if(objs!=null&&xx!=null){
             for(var x in objs){
                 if(xx[x]!=null)objs[x]=xx[x]
             }
         }
-       
+        
         if (datas == null) {
             return (<div>还没有配置子表单key</div>)
         }