From 1ca9cd8256f676ca10dff6601e79818d9a43a2c8 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Tue, 23 Apr 2024 11:10:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=A1=A8=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/formControlAttr.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index 515cad92c..4b8b07820 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -1859,7 +1859,8 @@ getAssociatedFormsCurrentFieldTree().then(({ data }) => {
         //let rootid_ = data.value.label
         associatedFormsCurrentFormFieldTree.value = [{
             id: 'rootid_'+data.label,
-            label: '当前表单',
+            //label: '当前表单',
+            label: '当前表单-'+data.treeAttrs.show,
             children: [...resData.value],
             treeAttrs: data.treeAttrs,
         }]
@@ -3459,6 +3460,7 @@ const loadNextPage = () => {
                     <el-tree
 						ref="fieldTreeRef"
                         node-key="id"
+                        empty-text="选择关联的表单后展示"
 						:data="asfasfFieldTree"
 						:props="treeDefaultProps"
 						:filter-node-method="filterNode"
@@ -3477,7 +3479,7 @@ const loadNextPage = () => {
 					<el-tree
 						ref="fieldTreeRef"
                         node-key="id"
-                        empty-text="请先保存当前表单,若需要展示本次编辑表单添加的字段,也需先保存"
+                        empty-text="请先保存当前表单"
 						:data="associatedFormsCurrentFormFieldTree"
 						:props="treeDefaultProps"
 						:filter-node-method="filterNode"
@@ -3573,7 +3575,7 @@ const loadNextPage = () => {
             <div style="height:300px;border:1px solid white;overflow-y:auto">
                 
                     <template v-for="(item, index) in controlData.control.fillRoles"  :key="controlData.control.fillRoles[index].id">
-                        <AssociatedFormsFillRole v-model:left-value="controlData.control.fillRoles[index].leftValue"  v-model:right-value="controlData.control.fillRoles[index].rightValue" :left-tree-source = "asfasfFieldTree[0].children" :right-tree-source = "associatedFormsCurrentFormFieldTree[0].children"  :current-key="controlData.control.fillRoles[index].id"  @del-Role = "delRole"  ></AssociatedFormsFillRole>
+                        <AssociatedFormsFillRole v-model:left-value="controlData.control.fillRoles[index].leftValue"  v-model:right-value="controlData.control.fillRoles[index].rightValue" :left-tree-source = "asfasfFieldTree" :right-tree-source = "associatedFormsCurrentFormFieldTree"  :current-key="controlData.control.fillRoles[index].id"  @del-Role = "delRole"  ></AssociatedFormsFillRole>
                     </template>