From 9140d2b0a092c54a45a5dbbc956d48699838995b Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Wed, 21 Aug 2024 13:55:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=95-=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=A1=AB=E5=85=85=E8=A7=84=E5=88=99-v0.31=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=A0=B7=E5=BC=8F=E7=A1=AE=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/formControlPropertiNew.vue        | 2 +-
 src/widget/associatedforms/associatedFormsChildFillRole.vue | 2 +-
 src/widget/associatedforms/associatedFormsFillRole.vue      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index 468e87a..ada2ae2 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -4521,7 +4521,7 @@ const radioChangeSet = (val:any) => {
 		<template v-if="controlData.type=='associatedForms'">
             <el-button  style="font-size: large;margin-top: 10px;margin-bottom: 15px;"   type="primary" link append-to-body="true" modal="true" @click="addFillRole">十 主表填充规则</el-button>
             <div style="max-height:230px;border:1px solid white;overflow-y:auto;">
-                <div style="background-color: #F0F0F0;padding: 12px;border-radius: 5px;padding-left:45px;padding-bottom: 1px;margin-right: 10px;"><!-- #F5F7FA     #E6F3FE  #F0F0F0  #F5F7FA-->
+                <div style="background-color: #F0F0F0;padding: 12px;border-radius: 5px;padding-left:45px;padding-bottom: 10px;margin-right: 10px;"><!-- #F5F7FA     #E6F3FE  #F0F0F0  #F5F7FA-->
                     <template v-for="(item, index) in controlData.control.fillRoles.master"  :key="controlData.control.fillRoles.master[index].id">
                         <AssociatedFormsFillRole 
                             v-model:left-value="controlData.control.fillRoles.master[index].leftValue"  
diff --git a/src/widget/associatedforms/associatedFormsChildFillRole.vue b/src/widget/associatedforms/associatedFormsChildFillRole.vue
index 85f0990..f1293a3 100644
--- a/src/widget/associatedforms/associatedFormsChildFillRole.vue
+++ b/src/widget/associatedforms/associatedFormsChildFillRole.vue
@@ -41,7 +41,7 @@
       </template>
       
     </div>
-    <el-link type="primary" @click="addChildRole">十 添加规则</el-link>
+    <el-link v-if="selectedChildTable1 !== ''" type="primary"  @click="addChildRole">十 添加规则</el-link>
   </div>
 
 
diff --git a/src/widget/associatedforms/associatedFormsFillRole.vue b/src/widget/associatedforms/associatedFormsFillRole.vue
index 69f8e9a..4a1ab27 100644
--- a/src/widget/associatedforms/associatedFormsFillRole.vue
+++ b/src/widget/associatedforms/associatedFormsFillRole.vue
@@ -1,6 +1,6 @@
 <template>
 
-<div style="margin-bottom: 15px; height: 40px; line-height: 40px;">
+<div style="margin-bottom: 3px; height: 40px; line-height: 40px;">
   <el-tree-select 
     v-model="leftValue1" style="width: 270px;" :data="leftTreeSource" placeholder="关联表单主表字段"
     check-strictly :render-after-expand="false" filterable  @change="leftChanged" />