xiufubug

one_stop_public/Table/index.jsx

@@ -20,6 +20,8 @@ export default class ZdyTable extends Component {
             left: 0,
             top: 0,
             max: 4,
+            formId:null,
+            formCode:null,
             width: 100,
             mapData:{},
             defaultBinds:{},
@@ -58,6 +60,7 @@ export default class ZdyTable extends Component {
          * this.props.table有传入值表明需要渲染流程中最新表单
          */
         if(isForm){ // 由表格的操作按钮进入
+           
             const mapData = {};
             const sqlData={}
             const dataObjs = val.form.dataObjModels;
@@ -171,9 +174,10 @@ export default class ZdyTable extends Component {
         }
         const obj = JSON.parse(val.unifiedServicePatternModel.content);
         const xxx = obj.datas[this.props.formKey ? this.props.formKey : obj.init]; // 是否是存在历史表单传入值
-
         this.setState({
             appId: val.id,
+            formId:val.id,
+            formCode:val.code,
             datas:obj.datas,
             mapData,sqlData,
             defaultValues:val.unifiedServicePatternModel.defaultValues,
@@ -347,7 +351,7 @@ export default class ZdyTable extends Component {
     }
 
     render() {
-        let { width,isBorder,sqlData,mapData,defaultBinds,defaultValues,items, init,currentFormKey ,isEdit ,datas,isReady,formConfig} = this.state
+        let { width,isBorder,sqlData,mapData,defaultBinds,defaultValues,items, init,currentFormKey ,isEdit ,datas,isReady,formConfig,formCode,formId} = this.state
 
         let { border, get, obj,index,fatherCode} = this.props
         let style={}
@@ -431,7 +435,7 @@ export default class ZdyTable extends Component {
                                                         ...styles
                                                     }} >
 
-                                                        <TableCom i={i}  j={j} fatherCode={fatherCode} index={index} datas={datas} uuid={cell.uuid} isEdit={isEdit} formKey={currentFormKey} init={init} get={get} json={cell.content} obj={ obj||{}} mapData={mapData} form={this.props.form} sqlData={sqlData} defaultValues={defaultValues || {}} />
+                                                        <TableCom formCode={formCode} formId={formId} i={i}  j={j} fatherCode={fatherCode} index={index} datas={datas} uuid={cell.uuid} isEdit={isEdit} formKey={currentFormKey} init={init} get={get} json={cell.content} obj={ obj||{}} mapData={mapData} form={this.props.form} sqlData={sqlData} defaultValues={defaultValues || {}} />
                                                     </td>}
                                                     )
 
@@ -480,7 +484,7 @@ export default class ZdyTable extends Component {
                                     {
                                         item.map((ary, j) => {
                                         return !allhidden && ary.hidden ? ""
-                                        : <><TableCom i={i}  j={j}   index={index} fatherCode={fatherCode} datas={datas} isEdit={isEdit} formKey={currentFormKey} init={init} get={get} key={j} sqlData={sqlData} obj={ obj||{}} form={this.props.form} mapData={mapData} json={ary.content} uuid={ary.uuid} defaultValues={defaultValues || {}} /></>
+                                        : <><TableCom formCode={formCode} formId={formId}  i={i}  j={j}   index={index} fatherCode={fatherCode} datas={datas} isEdit={isEdit} formKey={currentFormKey} init={init} get={get} key={j} sqlData={sqlData} obj={ obj||{}} form={this.props.form} mapData={mapData} json={ary.content} uuid={ary.uuid} defaultValues={defaultValues || {}} /></>
                                         })
                                     }
                                 </div>)

one_stop_public/tableCompon/index.jsx

@@ -1104,7 +1104,7 @@ export default class tableCom extends Component {
       const obj = { ...this.props.obj, ...this.props.form.getFieldsValue(), ...this.props.defaultValues[this.props.formKey] }
 
 
-      const value = fun1(obj,this.props.init, this.props.defaultValues, { clientType: this.props.get }, this.props.index, this.props.fatherCode,
+      const value = fun1(obj,this.props.init, this.props.defaultValues, { clientType: this.props.get,formCode:this.props.formCode,formId:this.props.formId }, this.props.index, this.props.fatherCode,
         { 
           moment: moment,
           sql: this.sqlUtil.bind(this, base52, json,callback),