From a764d161c6e205b1cd471dbb1f5194b38a360570 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Wed, 28 Aug 2024 16:50:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A1=AB=E5=85=85=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E5=89=8D=E7=AB=AF=E8=AF=B7=E6=B1=82=E5=89=8D=E9=A2=84?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../associatedforms/associatedForms.vue       | 44 ++++++++++++-------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/widget/associatedforms/associatedForms.vue b/src/widget/associatedforms/associatedForms.vue
index 9d15a31..c039d6b 100644
--- a/src/widget/associatedforms/associatedForms.vue
+++ b/src/widget/associatedforms/associatedForms.vue
@@ -44,7 +44,7 @@ onMounted(()=>{
     // console.log(props.data.control)
     if(props.data.control.formid!=null&&props.data.control.formid!=""){
       getAsfDataTitles().then(({ data }) => {   
-        //console.log(data)
+        console.log(data)
         options.value = data
 				value1.value = props.formProps.model[props.data.name]
       });
@@ -66,22 +66,35 @@ function getAsfDataTitles() {
   }
   //数据填充规则条件参数处理
 
-  /*
-    fillRoles: [
-      {
-        leftValue: "formField:43:dai4biao3zuo4",
-        rightValue: "formField:44:input1721721327977",
-        id: "870df909314342cfb53c440a3d4263a4"
+  let fillFieldsMaster = "";
+  //console.log(props.data.control.fillRoles)
+  //let fillRoles = JSON.parse(JSON.stringify(props.data.control.fillRoles))
+  for(let i= 0;i<props.data.control.fillRoles.master.length;i++){
+    if(props.data.control.fillRoles.master[i].leftValue!=""&&props.data.control.fillRoles.master[i].rightValue!=""){
+      fillFieldsMaster = fillFieldsMaster+props.data.control.fillRoles.master[i].id+"_"+props.data.control.fillRoles.master[i].leftValue+"_"+props.data.control.fillRoles.master[i].rightValue+";"
+    }
+  }
+  let fillFieldsChild = JSON.parse(JSON.stringify(props.data.control.fillRoles.child))
+  fillFieldsChild = fillFieldsChild.filter((item:any)=>{
+    return item.tablekey!=""
+  })
+  //console.log(fillFieldsChild)
+  for(let i= 0;i<fillFieldsChild.length;i++){
+    if(fillFieldsChild[i].tableKey!=""){
+      if(fillFieldsChild[i].childRoles.length>0){
+        fillFieldsChild[i].childRoles = fillFieldsChild[i].childRoles.filter((element:any) => {
+          if(element.leftValue!=""&&element.rightValue!=""){
+            return element
+          }
+        });
       }
-    ] 
-  */
-  /* let fillFields = "";
-  for(let i= 0;i<props.data.control.fillRoles.length;i++){
-    if(props.data.control.fillRoles[i].leftValue!=""){
-      fillFields = fillFields+props.data.control.fillRoles[i].leftValue
+      
     }
-  } */
+  }
+  //console.log(fillFieldsMaster)
   
+  fillFieldsChild = JSON.stringify(fillFieldsChild)
+  //console.log(fillFieldsChild)
   return request({ 
       url: '/javasys/lowCode/AssociatedForms/getAsfDataTitles',
       method: 'post',
@@ -93,7 +106,8 @@ function getAsfDataTitles() {
         hideFormula:props.data.control.hideGongShi.mathsFormula,
         hideString:props.data.control.hideGongShi.mathsString,
         masterOnField:props.data.name,
-        //fillFields:fillFields,
+        fillFieldsMaster:fillFieldsMaster,
+        fillFieldsChild:fillFieldsChild,
       },
   });
 }