From 6bb96dcb11207cd66015a09172f9d9663245739c Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Fri, 16 Aug 2024 16:10:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=95=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E4=B8=BA=E6=A0=87=E7=AD=BE=E5=B7=A6=E5=8F=B3=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignForm/formControlPropertiNew.vue     |  6 +++++
 .../lowcodepage/pageFlow/tableFlow.vue        |  4 +--
 .../associatedforms/associatedForms.vue       | 27 +++++++++++++++----
 src/widget/associatedforms/index.vue          |  3 ++-
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index b4d902e..65deb79 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -1775,6 +1775,12 @@ const showImagePreview = ref(false)
                 }
             });
         }else if(controlData.value.type==='associatedForms'){
+            /* if(controlData.value.item.label){
+
+            }else{
+                controlData.value.item.label = "关联表单"
+            }
+            controlData.value.item.showLabel = true */
             console.log(controlData.value.control.fillRoles)
             if(controlData.value.control.fillRoles.length==0){
                 controlData.value.control.fillRoles = [
diff --git a/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue b/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue
index 4a09147..2cfc6f4 100644
--- a/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue
+++ b/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue
@@ -106,8 +106,8 @@ const getTaskFormData = () =>{
 			state.id=props.versionid
 			state.formData = stringToObj(data.tableFormPage.mastesform)
 			state.formData.config.hideField = []//暂时的修复方法:接口返回的config中没有hideField属性,手动添加
-			console.log("tableFlow---echoTableFormPage---data.tableFormPage.mastesform",data.tableFormPage.mastesform)
-      		state.dict = string2json(data.tableFormPage.dict)
+			//console.log("tableFlow---echoTableFormPage---data.tableFormPage.mastesform",data.tableFormPage.mastesform)
+			state.dict = string2json(data.tableFormPage.dict)
 			state.formData.powerstr = string2json(data.tableFormPage.powerstr)
 			judgeSubmitCancel({"name":data.tableFormPage.mastesformjson})
 				.then((datajud:any) =>{
diff --git a/src/widget/associatedforms/associatedForms.vue b/src/widget/associatedforms/associatedForms.vue
index deb51fe..9d15a31 100644
--- a/src/widget/associatedforms/associatedForms.vue
+++ b/src/widget/associatedforms/associatedForms.vue
@@ -1,10 +1,12 @@
 <template>
 
 
-  <!-- <el-input v-model="input" style="width: 240px" placeholder="" /> -->
-  <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>
+  <div class="container">
+    <!-- <span style="font-size: 14px; margin-right: 12px;padding-top: 4px;" class="small-span" >{{ props.data.item?props.data.item.label:"关联表单" }}</span> -->
+    <el-select v-model="value1"  placeholder="请选择" class="big-span" @change="asfValueChanged">
+      <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+    </el-select>
+  </div>
 
 </template>
 
@@ -97,4 +99,19 @@ function getAsfDataTitles() {
 }
 </script>
 
-<style></style>
+<style>
+
+/* style="font-size: 14px; margin-right: 12px;" */
+.container {
+  display: flex;
+}
+
+.small-span {
+  width: auto;  /* 您可以根据需要调整第一个 span 的宽度比例 */
+}
+
+.big-span {
+  flex: 1;  /* 第二个 span 占据剩余的所有宽度 */
+}
+
+</style>
diff --git a/src/widget/associatedforms/index.vue b/src/widget/associatedforms/index.vue
index 411d4f2..d5b4045 100644
--- a/src/widget/associatedforms/index.vue
+++ b/src/widget/associatedforms/index.vue
@@ -12,9 +12,10 @@
 		:label="getLabel(data.item as FormItem)"
     >
         <input  v-model="value" type="hidden" >
+		<AssociatedForms :data="props.data" :form-props="formProps" :tablekey="props.tablekey" @value-changed="valueChanged"></AssociatedForms>
     </el-form-item>
 
-    <AssociatedForms :data="props.data" :form-props="formProps" :tablekey="props.tablekey" @value-changed="valueChanged"></AssociatedForms>
+    
 </template>
 <script lang='ts' setup>
 import AssociatedForms   from './associatedForms.vue';