修改bug

one_stop_public/Table/isNewMobileTable.jsx

@@ -85,6 +85,7 @@ export default class isNewTable extends Component {
                     >
                       <TableCom
                         taskAssignee={taskAssignee} // 提交人
+                        
                         userId={userId}
                         modalInit={modalInit}
                         formCode={formCode}
@@ -93,15 +94,15 @@ export default class isNewTable extends Component {
                         i={i}
                         j={j}
                         index={index}
-                        getCurrentFormTitle
+                        getCurrentFormTitle={ getCurrentFormTitle}
                         fatherCode={fatherCode}
                         datas={datas}
                         isEdit={isEdit}
                         fatherObj={this.props.fatherObj}
                         formKey={currentFormKey}
-                        currentFormTitle
-                        getCellValue
-                        hfInstance
+                        currentFormTitle={currentFormTitle}
+                        hfInstance={hfInstance}
+                          getCellValue={getCellValue}
                         initExcel={this.props.initExcel}
                         init={init}
                         get={get}
@@ -173,13 +174,13 @@ export default class isNewTable extends Component {
                           fatherCode={fatherCode}
                           datas={datas}
                           isEdit={isEdit}
-                          getCurrentFormTitle
+                          getCurrentFormTitle={getCurrentFormTitle}
                           importExcel={this.props.importExcel}
                           fatherObj={this.props.fatherObj}
                           formKey={currentFormKey}
-                          currentFormTitle
-                          hfInstance
-                          getCellValue
+                          currentFormTitle={currentFormTitle}
+                          hfInstance={hfInstance}
+                          getCellValue={getCellValue}
                           init={init}
                           get={get}
                           key={j}
@@ -222,13 +223,13 @@ export default class isNewTable extends Component {
                         datas={datas}
                         modalInit={modalInit}
                         isEdit={isEdit}
-                        getCurrentFormTitle
+                        getCurrentFormTitle={getCurrentFormTitle}
                         fatherObj={this.props.fatherObj}
                         formKey={currentFormKey}
                         importExcel={this.props.importExcel}
-                        currentFormTitle
-                        hfInstance
-                        getCellValue
+                        currentFormTitle={currentFormTitle}
+                        hfInstance={hfInstance}
+                        getCellValue={getCellValue}
                         init={init}
                         get={get}
                         key={j}

one_stop_public/libs/ChildForm.jsx

@@ -116,6 +116,9 @@ export default class ChildForm extends React.Component {
       json,
       modalInit,
       isPreview,
+      hfInstance,
+      getCurrentFormTitle,
+      getCellValue
     } = this.props;
     
     const span = json.span || 24;
@@ -146,6 +149,11 @@ export default class ChildForm extends React.Component {
                         <ZdyTable
                           key={r}
                           modalInit={modalInit}
+                          hfInstance={hfInstance}
+                          currentFormTitle={getCurrentFormTitle?getCurrentFormTitle(json.childFormKey):null}
+                          getCellValue={getCellValue}
+                          hfInstance={hfInstance}
+                          getCellValue={getCellValue}
                           formCode={this.props.formCode}
                           formId={this.props.formId}
                           isPreview={isPreview}
@@ -216,6 +224,9 @@ export default class ChildForm extends React.Component {
               <Col span={span}>
                 <ZdyTable
                   modalInit={modalInit}
+                  hfInstance={hfInstance}
+                  currentFormTitle={getCurrentFormTitle?getCurrentFormTitle(json.childFormKey):null}
+                  getCellValue={getCellValue}
                   formConfig={datas}
                   key={r}
                   fatherCode={base52}

one_stop_public/tableCompon/index.jsx

@@ -1485,7 +1485,7 @@ export default class tableCom extends Component {
       if (formKey == fk) {
         return <>片段表单key不能和自身相同</>;
       }
-      
+     
       return (
         <>
           {this.props.form.getFieldDecorator(this.props.uuid, {
@@ -1493,7 +1493,7 @@ export default class tableCom extends Component {
           })(<Input type="hidden" />)}{' '}
           <ZdyTable
             hfInstance={this.props.hfInstance}
-            currentFormTitle={this.props.getCurrentFormTitle(fk)}
+            currentFormTitle={this.props.getCurrentFormTitle?this.props.getCurrentFormTitle(fk):null}
             getCellValue={getCellValue}
             taskAssignee={taskAssignee}
             isWebPrint={this.props.isWebPrint || false}
@@ -2202,6 +2202,10 @@ export default class tableCom extends Component {
             <ChildForm
               modalInit={modalInit}
               isPreview={isPreview}
+              hfInstance={this.props.hfInstance}
+              getCurrentFormTitle={this.props.getCurrentFormTitle}
+              getCellValue={getCellValue}
+
               fatherObj={obj}
               json={json}
               rights={json.rights || ['add', 'delete']}
@@ -2934,6 +2938,9 @@ export default class tableCom extends Component {
           })(
             <ChildForm
               rights={json.rights || []}
+              hfInstance={this.props.hfInstance}
+              getCurrentFormTitle={this.props.getCurrentFormTitle}
+              getCellValue={getCellValue}
               isMobile={get === 'mobile'}
               fatherObj={obj}
               isPreview={isPreview}