From 6226504f59e2a5f05fcef31ac863355719adfc67 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Thu, 30 May 2024 13:47:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E9=80=89=E9=A1=B9=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index 454b4e8c2..c6a4d8192 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -3827,7 +3827,7 @@ const loadNextPage = () => {
 
 
 <!-- 关联选项设置弹窗 liwenxuan 20240426 start -->
-        <el-dialog  v-model="glxxszDialogFlag" class="glxxsztc" top="150px" :close-on-click-modal="false" title="关联选项设置" :show-close="false" style="margin-top:70px;" width="50%" >
+        <el-dialog  v-model="glxxszDialogFlag" class="glxxsztc" top="150px" :close-on-click-modal="false" :title="`关联选项设置--`+controlData.item.label+`--`+controlData.name" :show-close="false" style="margin-top:70px;" width="50%" >
 
             
             
@@ -3862,7 +3862,7 @@ const loadNextPage = () => {
         </template>
         </el-dialog>
 
-        <el-dialog v-model="glxxszDialogFlagCheckBox"  class="glxxsztc" top="150px" :close-on-click-modal="false" title="关联选项设置" :show-close="false" style="margin-top:70px;" width="50%" >
+        <el-dialog v-model="glxxszDialogFlagCheckBox"  class="glxxsztc" top="150px" :close-on-click-modal="false"  :title="`关联选项设置--`+controlData.item.label+`--`+controlData.name"  :show-close="false" style="margin-top:70px;" width="50%" >
 
             
             
@@ -3912,7 +3912,7 @@ const loadNextPage = () => {
 
 
 
-            <el-dialog  v-model="glxxszDialogFlagSwitch" class="glxxsztc" top="150px" :close-on-click-modal="false" title="关联选项设置" :show-close="false" style="margin-top:70px;" width="50%" >
+            <el-dialog  v-model="glxxszDialogFlagSwitch" class="glxxsztc" top="150px" :close-on-click-modal="false"  :title="`关联选项设置--`+controlData.item.label+`--`+controlData.name"  :show-close="false" style="margin-top:70px;" width="50%" >
 
                         
                         
@@ -3924,24 +3924,6 @@ const loadNextPage = () => {
                         <el-tree-select v-model="controlData.control.glxxszSwitch[1].showFields" style="width: 60%" :data="associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf[0].children" multiple   />
                     </div>
                     
-                    <!-- <el-table  
-                    :data="controlData.options" stripe  border style="width: 100%;min-height:50px;max-height:500px;overflow-y:auto" 
-                                :cell-style="{height: '55px',paddingLeft: '15px'}" :header-cell-style="{background:'#F3F4F7',color:'#555',}" 
-                                >
-                    
-                        <el-table-column prop="link" label="当开关状态为" width="220">
-                            <template #default="optionScope">
-                                <span style="background-color: #E8EAEE;border-radius: 8px;padding-top: 5px;padding-bottom: 5px;padding-left: 15px;padding-right: 15px;">{{ optionScope.row.label }}</span>
-                                
-                            </template>
-                        </el-table-column>
-                        <el-table-column fixed="right" label="显示以下组件" >
-                                <template #default="fieldScope">
-                                    
-                                    <el-tree-select v-model="controlData.control.glxxsz[fieldScope.$index].showFields" style="width: 100%" :data="associatedFormsCurrentFormFieldTreeForGlxxsz[0].children" multiple   />
-                                </template>
-                        </el-table-column>
-                    </el-table> -->
                 </template>
                 <template #footer>
                 <div class="dialog-footer">