修改bug

one_stop_public/Table/index.jsx

@@ -98,7 +98,7 @@ export default class ZdyTable extends Component {
           isRowCol: this.props.table ? obj.datas[val.formKey].isRowCol : xxx.isRowCol,
           mapData,
           currentFormKey: fk,
-          currentFormTitle:getCurrentFormTitle(obj,fk),
+          currentFormTitle:this.getCurrentFormTitle(obj,fk),
           sqlData,
           isEdit: !this.props.formKey,
           items: this.props.table ? obj.datas[val.formKey].items : xxx.items,
@@ -150,7 +150,7 @@ export default class ZdyTable extends Component {
           datas: obj.datas,
           isEdit: !this.props.formKey,
           currentFormKey: obj.init,
-          currentFormTitle:getCurrentFormTitle(obj,obj.init),
+          currentFormTitle:this.getCurrentFormTitle(obj,obj.init),
           width: xxx.width,
           isBorder: xxx.isBorder,
           isRowCol: xxx.isRowCol,
@@ -215,7 +215,7 @@ export default class ZdyTable extends Component {
           defaultValues: val.unifiedServicePatternModel.defaultValues,
           isEdit: !this.props.formKey,
           currentFormKey: fk,
-          currentFormTitle:getCurrentFormTitle(obj,fk),
+          currentFormTitle:this.getCurrentFormTitle(obj,fk),
           defaultBinds: this.props.table
             ? obj.datas[val.taskFormKey].defaultBinds
             : xxx.defaultBinds,

one_stop_public/libs/ChildForm.jsx

@@ -125,7 +125,6 @@ export default class ChildForm extends React.Component {
     if (datas == null) {
       return <div>还没有配置子表单key</div>;
     }
-
     if (isMobile) {
       return (
         <WingBlank size="lg">

one_stop_public/tableCompon/index.jsx

@@ -341,7 +341,7 @@ export default class tableCom extends Component {
         return false;
       }
     }
-    console.log('这不是个字符串');
+
   };
   /**
    * 上传文件输入
@@ -1108,6 +1108,7 @@ export default class tableCom extends Component {
         fun,
       );
       let obj;
+    
       if (!this.props.isEdit && this.props.fatherCode) {
         obj = {
           ...this.props.fatherObj,
@@ -1116,12 +1117,13 @@ export default class tableCom extends Component {
         };
       } else {
         obj = {
+          ...(this.props.fatherObj?this.props.fatherObj:{}),
           ...this.props.obj,
           ...this.props.form.getFieldsValue(),
           ...this.props.defaultValues[this.props.formKey],
         };
       }
-
+    
       const value = fun1(
         obj,
         this.props.init,
@@ -2172,7 +2174,7 @@ export default class tableCom extends Component {
         case 'ChildForm':
           const xxxxx = obj[dataColumn.base52];
           if (xxxxx == null) {
-            cm = <></>;
+            cm = <></>;Chil
             break;
           }
           if (Object.keys(xxxxx).length > 0) {
@@ -2917,6 +2919,7 @@ export default class tableCom extends Component {
             <ChildForm
               rights={json.rights || []}
               isMobile={get === 'mobile'}
+              fatherObj={obj}
               isPreview={isPreview}
               num={json.num}
               min={json.min}