子表单要传一个datas 属性

one_stop_public/Table/index.jsx

@@ -55,7 +55,10 @@ export default class ZdyTable extends Component {
 			isQRCode = false, // 是否为二维码快捷发起
 			formDeafault = '', // 为二维码快捷发起默认值
 		} = this.props;
-		if (isPreview || isChild) {
+		// if(this.props.currentFormKey === 'aa20cdbd-2019-45ea-8cdf-715aa46e132e'){
+		//   debugger;
+    // }
+    if (isPreview || isChild ) {
 			this.initExcel({ datas: this.props.datas, trees: this.props.trees }, () => {
 				this.setState({
 					...this.state,
@@ -228,7 +231,7 @@ export default class ZdyTable extends Component {
 				: val.taskFormKey
 					? val.taskFormKey
 					: obj.init;
-			console.log('231--------');
+			// console.log('231--------');
 			this.initExcel(obj, () =>
 				this.setState(
 					{
@@ -734,6 +737,10 @@ export default class ZdyTable extends Component {
 			updateTime = moment(+this.props.postData?.updateTime).format('llll');
 		}
 
+    if(this.props.currentFormKey === 'aa20cdbd-2019-45ea-8cdf-715aa46e132e'){
+       console.log(this);
+    }
+
 		switch (get) {
 			case 'web':
 				return (

one_stop_public/libs/ChildForm.jsx

@@ -119,12 +119,13 @@ export default class ChildForm extends React.Component {
 			getCurrentFormTitle,
 			getCellValue,
 			taskId,
+      datasAll,
 		} = this.props;
 
 		const span = json.span || 24;
 		const gutter = json.gutter != null ? json.gutter : 0;
 		const rights = this.props.rights;
-
+		// console.log(datasAll);
 		if (datas == null) {
 			return <div>还没有配置子表单key</div>;
 		}
@@ -155,7 +156,6 @@ export default class ChildForm extends React.Component {
 													currentFormTitle={
 														getCurrentFormTitle ? getCurrentFormTitle(json.childFormKey) : null
 													}
-													getCellValue={getCellValue}
 													hfInstance={hfInstance}
 													getCellValue={getCellValue}
 													formCode={this.props.formCode}
@@ -174,6 +174,7 @@ export default class ChildForm extends React.Component {
 													form={form}
 													mapData={mapData}
 													sqlData={sqlData}
+                          datas={datasAll}
 													{...datas}
 													defaultValues={defaultValues}
 												/>
@@ -255,7 +256,8 @@ export default class ChildForm extends React.Component {
 									form={form}
 									mapData={mapData}
 									sqlData={sqlData}
-									{...datas}
+                  datas={datasAll}
+                  {...datas}
 									defaultValues={defaultValues}
 								/>
 

one_stop_public/tableCompon/FormModal.jsx

@@ -3,6 +3,7 @@ import { Button, Form, Input, InputNumber, Modal, Select } from 'antd';
 
 export default class FormModal extends React.Component {
 	render() {
+	  // console.log(this.props);
 		return (
 			<Modal
 				destroyOnClose

one_stop_public/tableCompon/index.jsx

@@ -110,6 +110,8 @@ export default class tableCom extends Component {
     });
   };
   showModal = (fk, title, data, modalProps) => {
+    // console.log(fk, title, data, modalProps);
+
     const { dispatch } = this.props;
     const x = this.props.DataColumn.isShowModal;
     x[fk] = true;
@@ -1313,6 +1315,7 @@ export default class tableCom extends Component {
       currentFormTitle,
       getCellValue,
     } = this.props;
+    // console.log(this.props.datas);
     const { options, labels, selectDis, modalCode, modalTitle, modalInit, modalProps } = this.state;
     const { getFieldDecorator, getFieldError, getFieldProps } = this.props.form;
     const disabled = json != null ? json.disabled : false;
@@ -2152,7 +2155,7 @@ export default class tableCom extends Component {
           if (Object.keys(xxxxx).length > 0) {
             delete xxxxx[''];
           }
-
+          // console.log(datas);
           cm = (
             <ChildForm
               taskId={this.props.taskId}
@@ -2176,6 +2179,7 @@ export default class tableCom extends Component {
               base52={dataColumn.base52}
               mapData={mapData}
               datas={datas ? datas[json.childFormKey] : null}
+              datasAll={datas}
               defaultValues={defaultValues}
               sqlData={sqlData}
               form={this.props.form}
@@ -3003,6 +3007,7 @@ export default class tableCom extends Component {
           }
           break;
         case 'ChildForm':
+          // console.log(datas, json);
           cm = getFieldDecorator(dataColumn.base52, { initialValue: initValue || {} })(
             <ChildForm
               taskId={this.props.taskId}
@@ -3025,6 +3030,8 @@ export default class tableCom extends Component {
               base52={dataColumn.base52}
               mapData={mapData}
               datas={datas ? datas[json.childFormKey] : null}
+              datasAll={datas}
+              // datas={datas}
               defaultValues={defaultValues}
               sqlData={sqlData}
               form={this.props.form}
@@ -3284,6 +3291,7 @@ export default class tableCom extends Component {
             </Row>
           );
         } else {
+          // console.log(datas);
           return (
             <>
               {modalCode ? (
@@ -3311,6 +3319,7 @@ export default class tableCom extends Component {
                     mapData={mapData}
                     sqlData={sqlData}
                     {...datas[modalCode]}
+                    // items={}
                     defaultValues={defaultValues}
                   />
                 </FormModal>