From 3c9d79eb50127c97ef559ac89460b89f50d5055a Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Wed, 21 Aug 2024 10:40:29 +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.275?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignForm/formControlPropertiNew.vue     | 103 ++++++++----------
 1 file changed, 43 insertions(+), 60 deletions(-)

diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index 9c7308e..4c79ed0 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -4512,16 +4512,11 @@ const radioChangeSet = (val:any) => {
 
 
     <!-- 数据填充规则弹窗 -->
-
-
-
     <el-dialog v-model="associatedFormsFillRolesDialogFlag" title="数据填充规则" top="150px" :close-on-click-modal="false" :show-close="false" style="margin-top:70px ;min-height: 300px;max-height:900px"  width="80%"  >
-		
 		<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: 10px;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: 1px;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"  
@@ -4533,63 +4528,51 @@ const radioChangeSet = (val:any) => {
                             >
                         </AssociatedFormsFillRole>
                     </template>
-                </div>
-                
-                
-                
-                
-                
+                </div>              
+            </div>
+            <el-popover
+                v-if="currentChildTableCount>0"
+				placement="right-start"
+				title=""
+				:width="200"
+				trigger="hover"
+				content="【关联表单子表字段】暂不支持填充至【当前表单主表字段】; 若【设置筛选条件】，则仅填充满足筛选条件的子表数据"
+			>
+				<template #reference>
+					<el-button  style="font-size: large;margin-top: 23px;margin-bottom: 15px;"   type="primary" link append-to-body="true" modal="true" @click="addChildFillRole">十 子表填充规则</el-button>
+				</template>
+			</el-popover>
+            <div v-if="currentChildTableCount>0" style="max-height: 330px;overflow-y:auto;padding-top: 7px;">
+                <template v-for="(item, index) in controlData.control.fillRoles.child"  :key="controlData.control.fillRoles.child[index].id">
+                    <AssociatedFormsChildFillRole 
+                        v-model:selected-child-table="controlData.control.fillRoles.child[index].tableKey"  
+                        v-model:filter-condition="controlData.control.fillRoles.child[index].filterCondition"
+                        :asfasf-field-tree="asfasfFieldTree"
+                        :tree-default-props="treeDefaultProps"
+                        :filter-node="filterNode"
+                        :handle-field-tree-contextmenu-range="handleFieldTreeContextmenuRange"
+                        :org-and-man-tree="orgAndManTree"
+                        :handle-org-tree-contextmenu-range = "handleOrgTreeContextmenuRange"
+                        :role-tree="roleTree"
+                        :handle-role-tree-contextmenu-range="handleRoleTreeContextmenuRange"
+                        :associated-forms-current-form-field-tree= "associatedFormsCurrentFormFieldTree"  
+                        :current-key="controlData.control.fillRoles.child[index].id" 
+                        :child-table-list="asfasfChildTableList"
+                        :child-roles = "controlData.control.fillRoles.child[index].childRoles"
+                        @del-role = "delChildRole"
+                        >
+                    </AssociatedFormsChildFillRole>
+                </template>
             </div>
-
-                <el-popover
-                    v-if="currentChildTableCount>0"
-					placement="right-start"
-					title=""
-					:width="200"
-					trigger="hover"
-					content="【关联表单子表字段】暂不支持填充至【当前表单主表字段】; 若【设置筛选条件】，则仅填充满足筛选条件的子表数据"
-				>
-					<template #reference>
-						<el-button  style="font-size: large;margin-top: 23px;margin-bottom: 15px;"   type="primary" link append-to-body="true" modal="true" @click="addChildFillRole">十 子表填充规则</el-button>
-					</template>
-				</el-popover>
-                <div v-if="currentChildTableCount>0" style="max-height: 330px;overflow-y:auto;padding-top: 7px;">
-                    <template v-for="(item, index) in controlData.control.fillRoles.child"  :key="controlData.control.fillRoles.child[index].id">
-                        <AssociatedFormsChildFillRole 
-                            v-model:selected-child-table="controlData.control.fillRoles.child[index].tableKey"  
-                            v-model:filter-condition="controlData.control.fillRoles.child[index].filterCondition"
-                            :asfasf-field-tree="asfasfFieldTree"
-                            :tree-default-props="treeDefaultProps"
-                            :filter-node="filterNode"
-                            :handle-field-tree-expand="handleFieldTreeExpand"
-                            :handle-field-tree-collapse="handleFieldTreeCollapse"
-                            :handle-field-tree-contextmenu-range="handleFieldTreeContextmenuRange"
-                            :org-and-man-tree="orgAndManTree"
-                            :handle-org-tree-expand="handleOrgTreeExpand"
-                            :handle-org-tree-collapse = "handleOrgTreeCollapse"
-                            :handle-org-tree-contextmenu-range = "handleOrgTreeContextmenuRange"
-                            :role-tree="roleTree"
-                            :handle-role-tree-expand="handleRoleTreeExpand"
-                            :handle-role-tree-collapse="handleRoleTreeCollapse"
-                            :handle-role-tree-contextmenu-range="handleRoleTreeContextmenuRange"
-                            :associated-forms-current-form-field-tree= "associatedFormsCurrentFormFieldTree"  
-                            :current-key="controlData.control.fillRoles.child[index].id" 
-                            :child-table-list="asfasfChildTableList"
-                            :child-roles = "controlData.control.fillRoles.child[index].childRoles"
-                            @del-role = "delChildRole"
-                            >
-                        </AssociatedFormsChildFillRole>
-                    </template>
-                </div>
 		</template>
 		<template #footer>
-		<div class="dialog-footer">
-			<!-- <el-button @click="asfhTextCancelFillRoles">取消</el-button> -->
-			<el-button type="primary" @click="handleDetermineFillRoles">
-			确定
-			</el-button>
-		</div>
-    </template>
+            <div class="dialog-footer">
+                <!-- <el-button @click="asfhTextCancelFillRoles">取消</el-button> -->
+                <el-button type="primary" @click="handleDetermineFillRoles">
+                确定
+                </el-button>
+            </div>
+        </template>
 	</el-dialog>