From 2d97764c192027cd15288141631e661e97bba60a Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Fri, 7 Jun 2024 11:06:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E9=80=89=E4=B8=8B=E6=8B=89=E5=A4=9A?=
 =?UTF-8?q?=E9=80=89=E6=95=B0=E6=8D=AE=E6=BA=90=E6=96=B0=E5=A2=9E=E4=BB=BB?=
 =?UTF-8?q?=E9=80=89=E7=B3=BB=E7=BB=9F=E8=A1=A8=E5=8D=95=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/assembly/index.ts   |  3 +++
 src/components/DesignForm/formControlAttr.vue | 20 ++++++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/components/DesignForm/assembly/index.ts b/src/components/DesignForm/assembly/index.ts
index 7e025d1bf..5513bbdbd 100644
--- a/src/components/DesignForm/assembly/index.ts
+++ b/src/components/DesignForm/assembly/index.ts
@@ -100,6 +100,7 @@ export default [
 					modelValue: '',
 					glxxsz: [],
 					optionsValue3Formid:'',
+					optionsValue3Field:'',
 				},
 				options: selectOption, // 下拉选项数据集合
 				config: config,
@@ -118,6 +119,7 @@ export default [
 					modelValue: [],
 					glxxszForCheckBox: [],
 					optionsValue3Formid:'',
+					optionsValue3Field:'',
 				},
 				options: selectOption,
 				config: config,
@@ -137,6 +139,7 @@ export default [
 					appendToBody: true,
 					glxxsz: [],
 					optionsValue3Formid:'',
+					optionsValue3Field:'',
 				},
 				options: selectOption,
 				config: config,
diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index cc9bf275f..a90bf8c37 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -2279,6 +2279,11 @@ watch(()=>store.activeKey, () => {
         setTimeout(() => {
             formidChanged()
         }, 800);
+    }else if(controlData.value.type==='radio'||controlData.value.type==='select'||controlData.value.type==='checkbox'){
+        
+        setTimeout(() => {
+            formidChangedOptionsValue3()
+        }, 800);
     }
 })
 
@@ -3110,7 +3115,8 @@ const loadNextPage = () => {
                                 </el-form-item>
                             </template>
                             <template v-if="controlData.config.optionsType === 3">
-                                <el-button  style="padding-top: 5px;" type="primary" link append-to-body="true" modal="true" @click="optionsValue3Setting"  >选择系统表单字段</el-button>
+                                <el-button type="primary" style="margin-bottom:10px;margin-left:11px" plain @click="optionsValue3Setting">选择系统表单字段</el-button>
+                                <!--  <el-button  style="padding-top: 5px;" type="primary" link append-to-body="true" modal="true" @click="optionsValue3Setting"  >选择系统表单字段</el-button> -->
                             </template>
                             <template v-else>
                                 <el-form-item class="form_cont">
@@ -3643,7 +3649,7 @@ const loadNextPage = () => {
                     @change="formidChanged"
                 />
             </div>
-            <!-- asfasfFieldTreeOptionsValue3 -->
+            
         </template>
         <template #footer>
         <div class="dialog-footer">
@@ -4030,9 +4036,13 @@ const loadNextPage = () => {
                         @change="formidChangedOptionsValue3"
                     />
                 </div>
-                <!-- <div style="display:flex"><span style="font-size: larger;margin-left: 35px;margin-right: 15px;">当开关关闭时显示</span>
-                    <el-tree-select v-model="controlData.control.glxxszSwitch[1].showFields" style="width: 60%" :data="associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf[0].children" multiple   />
-                </div> -->
+                <div style="display:flex" v-if="typeof(controlData.control.optionsValue3Formid)!='undefined' && typeof(asfasfFieldTreeOptionsValue3)!='undefined' && controlData.control.optionsValue3Formid!=''"><span style="font-size: larger;margin-left: 35px;margin-right: 15px;">请选择字段</span>
+                    <!--
+                        
+                        
+                    -->
+                    <el-tree-select v-model="controlData.control.optionsValue3Field" style="width: 390px;" :data="asfasfFieldTreeOptionsValue3[0].children"    />
+                </div>
             </template>
             <template #footer>
             <div class="dialog-footer">