Merge branch 'lwx_v9'

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) => {
+			if(data&&data.length>0){
-				tables.forEach((tableItem: any) => {
+				data.forEach((dataElement:any) => {
-					if(dataElement.tableName==tableItem.name){
+					tables.forEach((tableItem: any) => {
-						//console.log(formProps.value.model)
+						if(dataElement.tableName==tableItem.name){
-						//console.log(tableItem)
+							//console.log(formProps.value.model)
-						//console.log(dataElement)
+							//console.log(tableItem)
-						let tableName = dataElement.tableName
+							//console.log(dataElement)
-						//console.log(tableName)
+							let tableName = dataElement.tableName
-						if(tableItem.list.length>0){
+							//console.log(tableName)
-							let tableRowArray: { type: any; name: any }[] = []
+							if(tableItem.list.length>0){
-							tableItem.list.forEach((listItem:any) => {
+								let tableRowArray: { type: any; name: any }[] = []
-								//console.log(listItem)
+								tableItem.list.forEach((listItem:any) => {
-								tableRowArray.push({
+									//console.log(listItem)
-									type:listItem.type,
+									tableRowArray.push({
-									name:listItem.name
+										type:listItem.type,
-								}) 
+										name:listItem.name
-							});
+									}) 
-							//console.log(tableRowArray)
+								});
-							const result = generateXResult(dataElement, tableRowArray);
+								//console.log(tableRowArray)
-							//console.log(result);
+								const result = generateXResult(dataElement, tableRowArray);
-							formProps.value.model[tableName] = result
+								//console.log(result);
+								formProps.value.model[tableName] = result
+							}
+							
 						}
-						
+					});
-					}
 				});
-			});
+			}
+			
         });
 	}
 

src/widget/associatedforms/associatedFormsChildFillRole.vue

@@ -52,15 +52,15 @@
       <el-container>
         <el-aside width="300px" style="height:420px;border: 1px solid gainsboro;margin-right: 5px;">
           <el-tree 
-            ref="fieldTreeRef" node-key="id" empty-text="选择关联的表单后展示" :data="asfasfFieldTree"
+            ref="fieldTreeRef" node-key="id" empty-text="选择关联的表单后展示" :data="asfasfFieldTree[0].children.filter((item:any)=>{return item.id == selectedChildTable1})"
             :props="treeDefaultProps" :filter-node-method="filterNode"
             style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
             @node-contextmenu="handleFieldTreeContextmenuRange" />
-          <el-tree 
+          <!-- <el-tree 
             ref="fieldTreeRef" node-key="id" empty-text="请先保存当前表单" :data="associatedFormsCurrentFormFieldTree"
             :props="treeDefaultProps" :filter-node-method="filterNode"
             style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
-            @node-contextmenu="handleFieldTreeContextmenuRange" />
+            @node-contextmenu="handleFieldTreeContextmenuRange" /> -->
           <el-tree 
             ref="orgTreeRef" style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
             :data="orgAndManTree" :props="treeDefaultProps" :filter-node-method="filterNode"
@@ -69,6 +69,7 @@
             ref="roleTreeRef" style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
             :data="roleTree" :props="treeDefaultProps" :filter-node-method="filterNode"
             @node-contextmenu="handleRoleTreeContextmenuRange" />
+            
         </el-aside>
         <el-main style="border: 1px solid gainsboro; padding: 3px;" class="associatedFormsHideDialogMain">
           <div