From 6337c929e4a57a1a76165cffba07c69f7bc7253d Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Wed, 18 Sep 2024 08:44:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=95=E5=AD=90?=
 =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E5=A1=AB=E5=85=85=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignForm/formControlPropertiNew.vue     |  2 +-
 .../DesignForm/public/form/formGroup.vue      | 51 ++++++++++---------
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index fb497c1..b190ce3 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -4834,7 +4834,7 @@ const radioChangeSet = (val:any) => {
 
 
     <!-- 数据填充规则弹窗 -->
-    <el-dialog v-model="associatedFormsFillRolesDialogFlag" title="数据填充规则" top="150px" :close-on-click-modal="false" :show-close="false" style="margin-top:70px ;min-height: 300px;max-height:900px"  width="50%"  >
+    <el-dialog v-model="associatedFormsFillRolesDialogFlag" title="数据填充规则" top="150px" :close-on-click-modal="false" :show-close="false" style="margin-top:70px ;min-height: 300px;max-height:900px"  width="80%"  >
 		<template v-if="controlData.type=='associatedForms'">
             <el-button  style="font-size: large;margin-top: 10px;margin-bottom: 15px;"   type="primary" link append-to-body="true" modal="true" @click="addFillRole">十 主表填充规则</el-button>
             <div style="max-height:230px;border:1px solid white;overflow-y:auto;">
diff --git a/src/components/DesignForm/public/form/formGroup.vue b/src/components/DesignForm/public/form/formGroup.vue
index 7b85ffd..ab423bc 100644
--- a/src/components/DesignForm/public/form/formGroup.vue
+++ b/src/components/DesignForm/public/form/formGroup.vue
@@ -502,32 +502,35 @@ function asfValueChanged(val:any){
 		//console.log(fillFieldsChild)
 		getAsfTableFill(val.asfFormId,val.glbbddbd,val.currentVal,fillFieldsChild).then(({ data }) => {   
 			//console.log(data)
-			data.forEach((dataElement:any) => {
-				tables.forEach((tableItem: any) => {
-					if(dataElement.tableName==tableItem.name){
-						//console.log(formProps.value.model)
-						//console.log(tableItem)
-						//console.log(dataElement)
-						let tableName = dataElement.tableName
-						//console.log(tableName)
-						if(tableItem.list.length>0){
-							let tableRowArray: { type: any; name: any }[] = []
-							tableItem.list.forEach((listItem:any) => {
-								//console.log(listItem)
-								tableRowArray.push({
-									type:listItem.type,
-									name:listItem.name
-								}) 
-							});
-							//console.log(tableRowArray)
-							const result = generateXResult(dataElement, tableRowArray);
-							//console.log(result);
-							formProps.value.model[tableName] = result
+			if(data&&data.length>0){
+				data.forEach((dataElement:any) => {
+					tables.forEach((tableItem: any) => {
+						if(dataElement.tableName==tableItem.name){
+							//console.log(formProps.value.model)
+							//console.log(tableItem)
+							//console.log(dataElement)
+							let tableName = dataElement.tableName
+							//console.log(tableName)
+							if(tableItem.list.length>0){
+								let tableRowArray: { type: any; name: any }[] = []
+								tableItem.list.forEach((listItem:any) => {
+									//console.log(listItem)
+									tableRowArray.push({
+										type:listItem.type,
+										name:listItem.name
+									}) 
+								});
+								//console.log(tableRowArray)
+								const result = generateXResult(dataElement, tableRowArray);
+								//console.log(result);
+								formProps.value.model[tableName] = result
+							}
+							
 						}
-						
-					}
+					});
 				});
-			});
+			}
+			
         });
 	}