From 379190f070a0fcccf6318ec047247c72eb850508 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Fri, 12 Jul 2024 13:58:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=95=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8B=E6=8B=89=E9=80=89=E9=A1=B9--=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=8F=AF=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/app/formPage.vue          |  1 +
 src/components/DesignForm/public/form/formGroup.vue |  1 +
 src/widget/associatedforms/associatedForms.vue      | 11 ++++++++---
 src/widget/associatedforms/index.vue                |  7 ++++++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/components/DesignForm/app/formPage.vue b/src/components/DesignForm/app/formPage.vue
index 71b6849fc..c5225be31 100644
--- a/src/components/DesignForm/app/formPage.vue
+++ b/src/components/DesignForm/app/formPage.vue
@@ -690,6 +690,7 @@ const appFormSubmit = (params = {}) => {
 		}
 		return
     }
+	console.log(params)
 	validate((valid: boolean, fields: any) => {
 		if (valid) {
 			const formatParams = Object.assign({}, fields, params)
diff --git a/src/components/DesignForm/public/form/formGroup.vue b/src/components/DesignForm/public/form/formGroup.vue
index 5f2ca1ab6..982290b29 100644
--- a/src/components/DesignForm/public/form/formGroup.vue
+++ b/src/components/DesignForm/public/form/formGroup.vue
@@ -353,6 +353,7 @@ const linksIf = (obj: FormList) => {
 //按钮点击事件
 const injectBtnEvent:any = inject(constFormBtnEvent)
 const clickBtn = (control: any) => {
+	console.log(control)
     // 0: '提交表单',
     // 1: '重置表单',
     // 2: '取消返回',
diff --git a/src/widget/associatedforms/associatedForms.vue b/src/widget/associatedforms/associatedForms.vue
index 9c664fa3b..9e9a6a213 100644
--- a/src/widget/associatedforms/associatedForms.vue
+++ b/src/widget/associatedforms/associatedForms.vue
@@ -2,7 +2,7 @@
 
 
   <!-- <el-input v-model="input" style="width: 240px" placeholder="" /> -->
-  <el-select v-model="value1"  placeholder="请选择" style="width: 240px">
+  <el-select v-model="value1"  placeholder="请选择" style="width: 240px" @change="asfValueChanged">
     <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
   </el-select>
 
@@ -34,7 +34,7 @@ const props = withDefaults(
     }>(),
     {}
 )
-
+const emits = defineEmits(["valueChanged"]);
 const value1 = ref('')
 
 const options = ref([])
@@ -42,13 +42,18 @@ onMounted(()=>{
     console.log(props.data.control)
     if(props.data.control.formid!=null&&props.data.control.formid!=""){
       getAsfDataTitles().then(({ data }) => {   
-        console.log(data)
+        //console.log(data)
         options.value = data
       });
     }
     
     
 })
+function asfValueChanged(){
+  
+  emits("valueChanged",value1.value)
+}
+
 function getAsfDataTitles() {
   let dataTitle = ''
   if(props.tablekey.dataTitle!=null&&props.tablekey.dataTitle.length>0){
diff --git a/src/widget/associatedforms/index.vue b/src/widget/associatedforms/index.vue
index 577cf84da..ef2aa4cbe 100644
--- a/src/widget/associatedforms/index.vue
+++ b/src/widget/associatedforms/index.vue
@@ -14,7 +14,7 @@
         <input  v-model="value" type="hidden" >
     </el-form-item>
 
-    <AssociatedForms :data="props.data" :form-props="formProps" :tablekey="props.tablekey"></AssociatedForms>
+    <AssociatedForms :data="props.data" :form-props="formProps" :tablekey="props.tablekey" @value-changed="valueChanged"></AssociatedForms>
 </template>
 <script lang='ts' setup>
 import AssociatedForms   from './associatedForms.vue';
@@ -154,7 +154,12 @@ const formatCustomRules = () => {
 
 
 
+const valueChanged = (val:any) =>{
+	console.log("关联表单选择--->",val)
+	
+    value.value = val
 
+}