From f93067a110250392bc5409197f5120947da0c194 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Sat, 20 Apr 2024 11:19:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E7=9A=84=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E6=A0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/formControlAttr.vue | 116 +++++++++++-------
 1 file changed, 71 insertions(+), 45 deletions(-)

diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index 333388a97..68312a620 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -1787,7 +1787,6 @@ function getAssociatedFormsCurrentFieldTree() {
                 cfid:props.customerformid
 			},
         });
- 
 }
 
 function getAssociatedFormsOrgAndManTree() {
@@ -1810,32 +1809,36 @@ function getAssociatedFormsRoleTree() {
         });
 }
 
-const associatedFormsCurrentFormFieldTree = ref<Tree[]>()
+function getAsfasfFieldTree() {
+    return request({ 
+        url: '/javasys/lowCode/AssociatedForms/getFieldTree',
+        method: 'post',
+        data: {
+            //cfid:'13'
+            cfid:controlData.value.control.formid
+        },
+    });
+}
 
-    getAssociatedFormsCurrentFieldTree().then(({ data }) => {
-        
-        if(data.id==="cfid为空"){
-            //alert("cfid为空")
-        }else{
-            
-                
-                
-                let resData = ref(data.children)
-                //let rootid_ = data.value.label
-                associatedFormsCurrentFormFieldTree.value = [{
-                    id: 'rootid_'+data.label,
-                    label: '当前表单',
-                    children: [...resData.value],
-                    treeAttrs: data.treeAttrs,
-                }]
-            
-            
-        }
 
-        
-        
-        
-    });
+const asfasfFieldTree = ref<Tree[]>()
+
+const associatedFormsCurrentFormFieldTree = ref<Tree[]>()
+getAssociatedFormsCurrentFieldTree().then(({ data }) => {
+    
+    if(data.id==="cfid为空"){
+        //alert("cfid为空")
+    }else{
+        let resData = ref(data.children)
+        //let rootid_ = data.value.label
+        associatedFormsCurrentFormFieldTree.value = [{
+            id: 'rootid_'+data.label,
+            label: '当前表单',
+            children: [...resData.value],
+            treeAttrs: data.treeAttrs,
+        }]
+    }
+});
 
 
 
@@ -1853,27 +1856,27 @@ getCustomerFormList().then(({ data }) => {
 
 
 const orgAndManTree = ref<Tree[]>()
-	getAssociatedFormsOrgAndManTree().then(({ data }) => {   
-        let resData = ref(data.children)
-		orgAndManTree.value = [{
-            id: data.id,
-        	//label: data.label,
-			label: '组织机构',
-            children: [...resData.value]
-        }]
+getAssociatedFormsOrgAndManTree().then(({ data }) => {   
+    let resData = ref(data.children)
+	orgAndManTree.value = [{
+        id: data.id,
+    	//label: data.label,
+		label: '组织机构',
+        children: [...resData.value]
+    }]
 });
 
 const roleTree = ref<Tree[]>()
-	getAssociatedFormsRoleTree().then(({ data }) => {   
-        let resData = ref(data.children)
-        //console.log("roleTree=============="+resData.value);
-		roleTree.value = [{
-            id: data.id,
-        	//label: data.label,
-			label: '角色',
-            children: [...resData.value]
-        }]
-    });
+getAssociatedFormsRoleTree().then(({ data }) => {   
+    let resData = ref(data.children)
+    //console.log("roleTree=============="+resData.value);
+	roleTree.value = [{
+        id: data.id,
+    	//label: data.label,
+		label: '角色',
+        children: [...resData.value]
+    }]
+});
 //    field
 const fieldTreeSearchFlag = ref(false)
 
@@ -2005,6 +2008,28 @@ function associatedFormsDataRangeDialoghandle(){
             aftRange.value.focusEditor()
         })
     }else{ */
+
+        
+
+
+        getAsfasfFieldTree().then(({ data }) => {
+    
+            if(data.id==="cfid为空"){
+                //alert("cfid为空")
+            }else{
+                let resData = ref(data.children)
+                //let rootid_ = data.value.label
+                asfasfFieldTree.value = [{
+                    id: 'rootid_'+data.label,
+                    label: '关联的表单-'+data.label,
+                    children: [...resData.value],
+                    treeAttrs: data.treeAttrs,
+                }]
+            }
+        });
+
+
+
         associatedFormsDataRangeDialogFlag.value = true
         controlData.value.control.dataRangeConditionHtmlCopy = controlData.value.control.dataRangeConditionHtml
         
@@ -2554,6 +2579,7 @@ const loadNextPage = () => {
                                             filterable
                                         />
                                     </div>
+                                    <!-- <div v-html="controlData.control.formid"></div> -->
 								</el-row> 
 
                                 <el-row v-else-if="item.type === 'associatedForms_dataRange'">
@@ -3380,7 +3406,7 @@ const loadNextPage = () => {
 				<el-aside width="300px" style="height:420px;border: 1px solid gainsboro;margin-right: 5px;">
 
 
-                    <!-- <el-tree
+                    <el-tree
 						ref="fieldTreeRef"
                         node-key="id"
 						:data="asfasfFieldTree"
@@ -3390,7 +3416,7 @@ const loadNextPage = () => {
 						@node-expand="handleFieldTreeExpand"
 						@node-collapse="handleFieldTreeCollapse"
 						@node-contextmenu="handleFieldTreeContextmenuRange"
-					/> -->
+					/>
 					<el-input
 						v-show="fieldTreeSearchFlag"
 						v-model="fieldTreeFilterText"