From 5f02bdd5c27c2d36b192b41c4da6fb4e5ea543f9 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Tue, 20 Aug 2024 17:00:04 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=95-?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A1=AB=E5=85=85=E8=A7=84=E5=88=99-v0.25?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignForm/formControlPropertiNew.vue     |  44 ++-
 .../associatedFormsChildFillRole.vue          | 265 ++++++++++++++----
 2 files changed, 245 insertions(+), 64 deletions(-)

diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index 808c460..be50192 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -4298,13 +4298,13 @@ const radioChangeSet = (val:any) => {
 			<div class="common-layout">
 				<el-container>
 				<el-aside width="300px" style="height:420px;border: 1px solid gainsboro;margin-right: 5px;">
-					<el-input
+					<!-- <el-input
 						v-show="fieldTreeSearchFlag"
 						v-model="fieldTreeFilterText"
 						style="width:98%;margin: 3px;"
 						placeholder="搜索字段"
 						class="filter-tree"
-					/>
+					/> -->
 					<el-tree
 						ref="fieldTreeRef"
                         node-key="id"
@@ -4320,13 +4320,13 @@ const radioChangeSet = (val:any) => {
 						
 						
 					/>
-                    <el-input
+                    <!-- <el-input
 						v-show="orgTreeSearchFlag"
 						v-model="orgTreeFilterText"
 						style="width:98%;margin: 3px;"
 						placeholder="搜索字段"
 						class="filter-tree"
-					/>
+					/> -->
 					<el-tree
                         ref="orgTreeRef"
 						style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
@@ -4338,13 +4338,13 @@ const radioChangeSet = (val:any) => {
 						
 						@node-contextmenu="handleOrgTreeContextmenu"
 					/>
-                    <el-input
+                    <!-- <el-input
 						v-show="roleTreeSearchFlag"
 						v-model="roleTreeFilterText"
 						style="width:98%;margin: 3px;"
 						placeholder="搜索字段"
 						class="filter-tree"
-					/>
+					/> -->
 					<el-tree
                         ref="roleTreeRef"
 						style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
@@ -4415,13 +4415,13 @@ const radioChangeSet = (val:any) => {
 						@node-collapse="handleFieldTreeCollapse"
 						@node-contextmenu="handleFieldTreeContextmenuRange"
 					/>
-					<el-input
+					<!-- <el-input
 						v-show="fieldTreeSearchFlag"
 						v-model="fieldTreeFilterText"
 						style="width:98%;margin: 3px;"
 						placeholder="搜索字段"
 						class="filter-tree"
-					/>
+					/> -->
 					<el-tree
 						ref="fieldTreeRef"
                         node-key="id"
@@ -4434,13 +4434,13 @@ const radioChangeSet = (val:any) => {
 						@node-collapse="handleFieldTreeCollapse"
 						@node-contextmenu="handleFieldTreeContextmenuRange"
 					/>
-                    <el-input
+                    <!-- <el-input
 						v-show="orgTreeSearchFlag"
 						v-model="orgTreeFilterText"
 						style="width:98%;margin: 3px;"
 						placeholder="搜索字段"
 						class="filter-tree"
-					/>
+					/> -->
 					<el-tree
                         ref="orgTreeRef"
 						style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
@@ -4452,13 +4452,13 @@ const radioChangeSet = (val:any) => {
 						
 						@node-contextmenu="handleOrgTreeContextmenuRange"
 					/>
-                    <el-input
+                    <!-- <el-input
 						v-show="roleTreeSearchFlag"
 						v-model="roleTreeFilterText"
 						style="width:98%;margin: 3px;"
 						placeholder="搜索字段"
 						class="filter-tree"
-					/>
+					/> -->
 					<el-tree
                         ref="roleTreeRef"
 						style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
@@ -4515,7 +4515,7 @@ 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:800px"  width="50%"  >
+    <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:800px"  width="80%"  >
 		
 		<template v-if="controlData.type=='associatedForms'">
             
@@ -4549,10 +4549,26 @@ const radioChangeSet = (val:any) => {
 						<el-button  style="font-size: large;margin-top: 3px;margin-bottom: 15px;"   type="primary" link append-to-body="true" modal="true" @click="addChildFillRole">十 子表填充规则</el-button>
 					</template>
 				</el-popover>
-                <div v-if="currentChildTableCount>0"><!-- asfasfChildTableList -->
+                <div v-if="currentChildTableCount>0">
                     <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"
                             @del-role = "delChildRole"
diff --git a/src/widget/associatedforms/associatedFormsChildFillRole.vue b/src/widget/associatedforms/associatedFormsChildFillRole.vue
index ac01695..1beef12 100644
--- a/src/widget/associatedforms/associatedFormsChildFillRole.vue
+++ b/src/widget/associatedforms/associatedFormsChildFillRole.vue
@@ -1,96 +1,261 @@
+<!-- eslint-disable vue/no-v-html -->
 <template>
 
-  <div style="background-color: #E6F3FE;padding: 12px;border-radius: 10px;padding-left:45px;margin-bottom:20px;margin-right:11px;min-height: 65px;padding-top: 16px;">
-    <el-button :icon="Close" size="small" circle type="info" plain style="float: right;margin-top: -22px;margin-right: -22px"  @click="delRole"/>
-    
-    <el-tree-select 
-    v-model="selectedChildTable1"
-    style="width: 290px;" :data="childTableList" placeholder="请选择关联表单子表"
-      check-strictly :render-after-expand="false" filterable  @change="selectedChildTableChanged"  /><!-- 
-    <span style="margin-left: 8px;margin-right: 8px;">的值填充到</span>
-    <el-tree-select 
-      v-model="rightValue1" style="width: 290px;" :data="rightTreeSource"
-      check-strictly :render-after-expand="false" filterable @change="rightChanged" />
-      <Delete style="width: 22px; height: 22px; margin-right: 35px;cursor: pointer; color: #50A6FF;margin-top: 10px; display: block; float:right" @click="delRole" /> -->
-
-          <!-- <el-button type="primary" @click="innerVisible = true">
-                open
-          </el-button> -->
-          
-          <el-button style="padding-top: 5px; width: 290px;margin-left: 85px;height: 30px;" type="info" plain  append-to-body="true" modal="true" @click="filterConditionDialoghandle = true"  >设置筛选条件（选填）</el-button>
-          <!-- <div v-if="selectedChildTable1!==''" style="width:100%; cursor: pointer;" @click="associatedFormsDataRangeDialoghandle"  v-html="controlData.control.dataRangeConditionHtml"></div> -->
+  <div
+    style="background-color: #E6F3FE;padding: 12px;border-radius: 10px;padding-left:45px;margin-bottom:20px;margin-right:11px;min-height: 65px;padding-top: 16px;">
+    <el-button 
+      :icon="Close" size="small" circle type="info" plain
+      style="float: right;margin-top: -22px;margin-right: -22px" @click="delRole" />
+
+    <el-tree-select
+      v-model="selectedChildTable1" style="width: 290px;margin-bottom: -1px" :data="childTableList"
+      placeholder="请选择关联表单子表" check-strictly :render-after-expand="false" filterable
+      @change="selectedChildTableChanged" />
+
+    <el-button 
+      v-if="selectedChildTable1 === '' || filterCondition1.conditionHtml === ''"
+      style="padding-top: 8px; width: 290px;margin-left: 85px;height: 30px;" type="info" plain append-to-body="true"
+      modal="true" @click="filterConditionDialogFlag = true">设置筛选条件（选填）</el-button>
+    <div 
+      v-if="selectedChildTable1 !== '' && filterCondition1.conditionHtml !== ''"
+      style="padding-top: 5px; width: auto;margin-left: 85px;height: 30px;cursor: pointer;display: inline-block;border: gray 1px solid;margin-top: 3px;"
+      @click="filterConditionDialogHandle" v-html="filterCondition1.conditionHtml"></div>
   </div>
+  
+
+  <el-dialog v-model="filterConditionDialogFlag" style="margin-top:70px ;min-height: 500px" width="50%" :show-close="false" title="筛选条件" append-to-body>
+    
+      <div class="common-layout">
+        <el-container>
+          <el-aside width="300px" style="height:420px;border: 1px solid gainsboro;margin-right: 5px;">
+            <el-tree 
+              ref="fieldTreeRef" node-key="id" empty-text="选择关联的表单后展示" :data="asfasfFieldTree"
+              :props="treeDefaultProps" :filter-node-method="filterNode"
+              style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;" @node-expand="handleFieldTreeExpand"
+              @node-collapse="handleFieldTreeCollapse" @node-contextmenu="handleFieldTreeContextmenuRange" />
+            <!--  <el-input 
+              v-show="fieldTreeSearchFlag" v-model="fieldTreeFilterText" style="width:98%;margin: 3px;"
+              placeholder="搜索字段" class="filter-tree" /> --> 
+            <el-tree 
+              ref="fieldTreeRef" node-key="id" empty-text="请先保存当前表单" :data="associatedFormsCurrentFormFieldTree"
+              :props="treeDefaultProps" :filter-node-method="filterNode"
+              style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;" @node-expand="handleFieldTreeExpand"
+              @node-collapse="handleFieldTreeCollapse" @node-contextmenu="handleFieldTreeContextmenuRange" />
+            <!-- <el-input 
+              v-show="orgTreeSearchFlag" v-model="orgTreeFilterText" style="width:98%;margin: 3px;"
+              placeholder="搜索字段" class="filter-tree" /> -->
+            <el-tree 
+              ref="orgTreeRef" style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
+              :data="orgAndManTree" :props="treeDefaultProps" :filter-node-method="filterNode"
+              @node-expand="handleOrgTreeExpand" @node-collapse="handleOrgTreeCollapse"
+              @node-contextmenu="handleOrgTreeContextmenuRange" />
+              
+            <!--<el-input 
+              v-show="roleTreeSearchFlag" v-model="roleTreeFilterText" style="width:98%;margin: 3px;"
+              placeholder="搜索字段" class="filter-tree" />-->
+            <el-tree 
+              ref="roleTreeRef" style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
+              :data="roleTree" :props="treeDefaultProps" :filter-node-method="filterNode"
+              @node-expand="handleRoleTreeExpand" @node-collapse="handleRoleTreeCollapse"
+              @node-contextmenu="handleRoleTreeContextmenuRange" /> 
+          </el-aside>
+          <el-main style="border: 1px solid gainsboro; padding: 3px;" class="associatedFormsHideDialogMain">
+            <div
+              style="border: 1px solid gainsboro; height: 7%; border-bottom: 0px; padding-top: 3px; padding-left: 5px; background-color: #E6F3FE;">
+              仅可选择符合以下条件的数据</div>
+            <div id="associatedFormsHideEditArea" style="border: 1px solid gainsboro; height: 38%; border-bottom: 0px;">
+              <AssociatedFormsTinyaceFillRoleFilterCondition ref="aftRange" :aft-text="conditionHtml"
+                :aft-text-copy="conditionHtmlCopy" @text-change="aftTextChangedRange"
+                @gongshi-change="aftGongshiChangedRange"></AssociatedFormsTinyaceFillRoleFilterCondition>
+              
+
+            </div>
+            <div style="border: 1px solid gainsboro; height: 55%; padding-top: 20px;">
+              <ul>
+                <li>请从左侧面板<span style="color: red">右击</span>选择字段或选项</li>
+                <li>支持的符号：<span style="color: red">'==', '>=', '>', '<=', '<' , '!=' </span>
+                </li>
+                <li>支持<span style="color: red">"包含,不包含,数据拥有者,数据所属部门"</span>关键字,用于组织机构条件,角色条件,==运算符和!=运算符</li>
+                <li>参考举例：</li>
+                <span style="margin-left: 14px;">年龄>10</span><br>
+                <span style="margin-left: 14px;">企管部==数据所属部门</span><br>
+                <span style="margin-left: 14px;">绩效考核执行人包含数据拥有者</span><br>
+                <span style="margin-left: 14px;">生产部包含数据所属部门</span>
+              </ul>
+            </div>
+          </el-main>
+        </el-container>
+      </div>
     
-  <el-dialog
-      v-model="filterConditionDialoghandle"
-      width="500"
-      :show-close="true"
-      title="筛选条件"
-      append-to-body
-    >
-    {{ currentKey }}
+    <template #footer>
+      <div class="dialog-footer">
+        <!-- <el-button @click="asfhTextCancelRange">取消</el-button> -->
+        <el-button type="primary" @click="filterConditionDialogHandle">
+          确定
+        </el-button>
+      </div>
+    </template>
   </el-dialog>
 
 </template>
 
 <script setup lang="ts">
 import { Close } from '@element-plus/icons-vue'
-const filterConditionDialoghandle = ref(false)
+import AssociatedFormsTinyaceFillRoleFilterCondition from '@/widget/associatedforms/associatedFormsTinyaceFillRoleFilterCondition.vue'
+
+let emit = defineEmits(["delRole", "update:selectedChildTable",]);
 const props = defineProps({
-  childTableList: {
+  orgAndManTree:{
     type: Object,
     default() {
       return {}
     }
   },
-  selectedChildTable: {
-    type: String,
+  handleRoleTreeExpand:{
+    type: Object,
     default() {
       return {}
     }
   },
-  /* rightTreeSource: {
+  handleRoleTreeCollapse:{
     type: Object,
     default() {
       return {}
     }
   },
-  
-  rightValue: {
+  handleRoleTreeContextmenuRange:{
+    type: Object,
+    default() {
+      return {}
+    }
+  },
+  roleTree:{
+    type: Object,
+    default() {
+      return {}
+    }
+  },
+  handleOrgTreeExpand:{
+    type: Object,
+    default() {
+      return {}
+    }
+  },
+  associatedFormsCurrentFormFieldTree:{
+    type: Object,
+    default() {
+      return {}
+    }
+  },
+  handleOrgTreeCollapse:{
+    type: Object,
+    default() {
+      return {}
+    }
+  },
+  handleOrgTreeContextmenuRange:{
+    type: Object,
+    default() {
+      return {}
+    }
+  },
+  handleFieldTreeContextmenuRange:{
+    type: Object,
+    default() {
+      return {}
+    }
+  },
+  handleFieldTreeCollapse:{
+    type: Object,
+    default() {
+      return {}
+    }
+  },
+  handleFieldTreeExpand:{
+    type: Object,
+    default() {
+      return {}
+    }
+  },
+  filterNode:{
+    type: Object,
+    default() {
+      return {}
+    }
+  },
+  treeDefaultProps:{
+    type: Object,
+    default() {
+      return {}
+    }
+  },
+  asfasfFieldTree:{
+    type: Object,
+    default() {
+      return {}
+    }
+  },
+  childTableList: {
+    type: Object,
+    default() {
+      return {}
+    }
+  },
+  selectedChildTable: {
     type: String,
     default() {
       return {}
     }
-  },*/
+  },
+  filterCondition: {
+    type: Object,
+    default() {
+      return {}
+    }
+  },
+  
   currentKey: {
     type: String,
     default() {
       return {}
     }
-  }, 
+  },
 })
+const filterConditionDialogFlag = ref(false)
+
+
 const selectedChildTable1 = ref()
 selectedChildTable1.value = props.selectedChildTable
-/*const rightValue1 = ref()
 
 
-rightValue1.value = props.rightValue
- */
 
+const filterCondition1 = ref()
+filterCondition1.value = props.filterCondition
+
+
+
+
+function filterConditionDialogHandle() {
+  filterConditionDialogFlag.value = !filterConditionDialogFlag.value
+}
+
+function aftTextChangedRange(str:string){
+    props.conditionHtml = str
+}
 
-let emit = defineEmits(["delRole","update:selectedChildTable",]);
+function aftGongshiChangedRange(gongshi:any){
+    props.formulaHtml = gongshi.formulaHtml
+    props.mathsFormula = gongshi.mathsFormula
+    props.mathsString = gongshi.mathsString
+}
 
-function selectedChildTableChanged(){
-  emit('update:selectedChildTable',selectedChildTable1)
+function selectedChildTableChanged() {
+  emit('update:selectedChildTable', selectedChildTable1)
 }
-/*
-function rightChanged(){
-  emit('update:rightValue',rightValue1)
-} */
-
-function delRole(){
-  //alert(props.currentKey)
-  emit('delRole',props.currentKey)
+
+
+function delRole() {
+  emit('delRole', props.currentKey)
 }
 
 

From ef7091033d33e4b0bddba25e5c66593e4403eb5a Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Wed, 21 Aug 2024 09:02:44 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=95-?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A1=AB=E5=85=85=E8=A7=84=E5=88=99-v0.26?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../associatedFormsChildFillRole.vue          | 104 ++++++------------
 1 file changed, 31 insertions(+), 73 deletions(-)

diff --git a/src/widget/associatedforms/associatedFormsChildFillRole.vue b/src/widget/associatedforms/associatedFormsChildFillRole.vue
index 1beef12..ea0cf39 100644
--- a/src/widget/associatedforms/associatedFormsChildFillRole.vue
+++ b/src/widget/associatedforms/associatedFormsChildFillRole.vue
@@ -18,7 +18,7 @@
       modal="true" @click="filterConditionDialogFlag = true">设置筛选条件（选填）</el-button>
     <div 
       v-if="selectedChildTable1 !== '' && filterCondition1.conditionHtml !== ''"
-      style="padding-top: 5px; width: auto;margin-left: 85px;height: 30px;cursor: pointer;display: inline-block;border: gray 1px solid;margin-top: 3px;"
+      style="padding-top: 5px; width: auto;margin-left: 85px;height: 30px;cursor: pointer;display: inline-block;margin-top: 3px;"
       @click="filterConditionDialogHandle" v-html="filterCondition1.conditionHtml"></div>
   </div>
   
@@ -31,23 +31,21 @@
             <el-tree 
               ref="fieldTreeRef" node-key="id" empty-text="选择关联的表单后展示" :data="asfasfFieldTree"
               :props="treeDefaultProps" :filter-node-method="filterNode"
-              style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;" @node-expand="handleFieldTreeExpand"
-              @node-collapse="handleFieldTreeCollapse" @node-contextmenu="handleFieldTreeContextmenuRange" />
+              style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"  @node-contextmenu="handleFieldTreeContextmenuRange" />
             <!--  <el-input 
               v-show="fieldTreeSearchFlag" v-model="fieldTreeFilterText" style="width:98%;margin: 3px;"
               placeholder="搜索字段" class="filter-tree" /> --> 
             <el-tree 
               ref="fieldTreeRef" node-key="id" empty-text="请先保存当前表单" :data="associatedFormsCurrentFormFieldTree"
               :props="treeDefaultProps" :filter-node-method="filterNode"
-              style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;" @node-expand="handleFieldTreeExpand"
-              @node-collapse="handleFieldTreeCollapse" @node-contextmenu="handleFieldTreeContextmenuRange" />
+              style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;" @node-contextmenu="handleFieldTreeContextmenuRange" />
             <!-- <el-input 
               v-show="orgTreeSearchFlag" v-model="orgTreeFilterText" style="width:98%;margin: 3px;"
               placeholder="搜索字段" class="filter-tree" /> -->
             <el-tree 
               ref="orgTreeRef" style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
               :data="orgAndManTree" :props="treeDefaultProps" :filter-node-method="filterNode"
-              @node-expand="handleOrgTreeExpand" @node-collapse="handleOrgTreeCollapse"
+              
               @node-contextmenu="handleOrgTreeContextmenuRange" />
               
             <!--<el-input 
@@ -56,7 +54,7 @@
             <el-tree 
               ref="roleTreeRef" style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
               :data="roleTree" :props="treeDefaultProps" :filter-node-method="filterNode"
-              @node-expand="handleRoleTreeExpand" @node-collapse="handleRoleTreeCollapse"
+              
               @node-contextmenu="handleRoleTreeContextmenuRange" /> 
           </el-aside>
           <el-main style="border: 1px solid gainsboro; padding: 3px;" class="associatedFormsHideDialogMain">
@@ -64,11 +62,13 @@
               style="border: 1px solid gainsboro; height: 7%; border-bottom: 0px; padding-top: 3px; padding-left: 5px; background-color: #E6F3FE;">
               仅可选择符合以下条件的数据</div>
             <div id="associatedFormsHideEditArea" style="border: 1px solid gainsboro; height: 38%; border-bottom: 0px;">
-              <AssociatedFormsTinyaceFillRoleFilterCondition ref="aftRange" :aft-text="conditionHtml"
-                :aft-text-copy="conditionHtmlCopy" @text-change="aftTextChangedRange"
-                @gongshi-change="aftGongshiChangedRange"></AssociatedFormsTinyaceFillRoleFilterCondition>
+              <AssociatedFormsTinyaceFillRoleFilterCondition 
+                ref="tinymceRef" 
+                :aft-text="filterCondition1.conditionHtml"
+                :aft-text-copy="filterCondition1.conditionHtmlCopy" 
+                @text-change="aftTextChangedRange" @gongshi-change="aftGongshiChangedRange"
+                ></AssociatedFormsTinyaceFillRoleFilterCondition>
               
-
             </div>
             <div style="border: 1px solid gainsboro; height: 55%; padding-top: 20px;">
               <ul>
@@ -105,78 +105,27 @@ import AssociatedFormsTinyaceFillRoleFilterCondition from '@/widget/associatedfo
 
 let emit = defineEmits(["delRole", "update:selectedChildTable",]);
 const props = defineProps({
+  
   orgAndManTree:{
     type: Object,
     default() {
       return {}
     }
   },
-  handleRoleTreeExpand:{
-    type: Object,
-    default() {
-      return {}
-    }
-  },
-  handleRoleTreeCollapse:{
-    type: Object,
-    default() {
-      return {}
-    }
-  },
-  handleRoleTreeContextmenuRange:{
-    type: Object,
-    default() {
-      return {}
-    }
-  },
   roleTree:{
     type: Object,
     default() {
       return {}
     }
   },
-  handleOrgTreeExpand:{
-    type: Object,
-    default() {
-      return {}
-    }
-  },
+
   associatedFormsCurrentFormFieldTree:{
     type: Object,
     default() {
       return {}
     }
   },
-  handleOrgTreeCollapse:{
-    type: Object,
-    default() {
-      return {}
-    }
-  },
-  handleOrgTreeContextmenuRange:{
-    type: Object,
-    default() {
-      return {}
-    }
-  },
-  handleFieldTreeContextmenuRange:{
-    type: Object,
-    default() {
-      return {}
-    }
-  },
-  handleFieldTreeCollapse:{
-    type: Object,
-    default() {
-      return {}
-    }
-  },
-  handleFieldTreeExpand:{
-    type: Object,
-    default() {
-      return {}
-    }
-  },
+  
   filterNode:{
     type: Object,
     default() {
@@ -221,6 +170,10 @@ const props = defineProps({
     }
   },
 })
+
+//拿到子组件AssociatedFormsTinyace的实例
+const tinymceRef = ref();
+
 const filterConditionDialogFlag = ref(false)
 
 
@@ -234,19 +187,18 @@ filterCondition1.value = props.filterCondition
 
 
 
-
 function filterConditionDialogHandle() {
   filterConditionDialogFlag.value = !filterConditionDialogFlag.value
 }
 
 function aftTextChangedRange(str:string){
-    props.conditionHtml = str
+  filterCondition1.value.conditionHtml = str
 }
 
 function aftGongshiChangedRange(gongshi:any){
-    props.formulaHtml = gongshi.formulaHtml
-    props.mathsFormula = gongshi.mathsFormula
-    props.mathsString = gongshi.mathsString
+  filterCondition1.value.gongShi.formulaHtml = gongshi.formulaHtml
+  filterCondition1.value.gongShi.mathsFormula = gongshi.mathsFormula
+  filterCondition1.value.gongShi.mathsString = gongshi.mathsString
 }
 
 function selectedChildTableChanged() {
@@ -257,9 +209,15 @@ function selectedChildTableChanged() {
 function delRole() {
   emit('delRole', props.currentKey)
 }
-
-
-
+function handleOrgTreeContextmenuRange(MouseEvent:any, object:any, Node:any, element:any){
+  tinymceRef.value.addIcon_org(object)
+}
+function handleRoleTreeContextmenuRange(MouseEvent:any, object:any, Node:any, element:any){
+  tinymceRef.value.addIcon(object)
+}     
+function handleFieldTreeContextmenuRange(MouseEvent:any, object:any, Node:any, element:any){
+  tinymceRef.value.addIcon(object)
+}
 </script>
 
 <style></style>
\ No newline at end of file

From d779df08573bc5d1f0e09dbb48a9b3ac8520d1a1 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Wed, 21 Aug 2024 10:27:38 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=95-?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A1=AB=E5=85=85=E8=A7=84=E5=88=99-v0.27?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/assembly/index.ts   |  8 +++-
 .../DesignForm/formControlPropertiNew.vue     | 25 +++++-----
 .../associatedFormsChildFillRole.vue          | 48 +++++++++++++++++--
 3 files changed, 64 insertions(+), 17 deletions(-)

diff --git a/src/components/DesignForm/assembly/index.ts b/src/components/DesignForm/assembly/index.ts
index 70c43ee..aed0e51 100644
--- a/src/components/DesignForm/assembly/index.ts
+++ b/src/components/DesignForm/assembly/index.ts
@@ -927,7 +927,13 @@ export default [
 											mathsString:'',
 										},
 									},
-									childRoles:[]
+									childRoles:[
+										{
+											leftValue: '',
+											rightValue: '',
+											id: '',
+										},
+									]
 								},
 							],
 						},
diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index be50192..9c7308e 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -2618,7 +2618,7 @@ function addChildFillRole(){
     //子表填充规则要受到子表数量的限制
     //currentChildTableCount
     //controlData.value.control.fillRoles.child.length
-    if(controlData.value.control.fillRoles.child.length<currentChildTableCount){
+if(controlData.value.control.fillRoles.child.length<currentChildTableCount){
         let onlyNumber = uuidv4().replaceAll('-','').toString();   //获取唯一编码
         controlData.value.control.fillRoles.child.push({
                                                         id: onlyNumber,
@@ -4515,13 +4515,13 @@ 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:800px"  width="80%"  >
+    <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'">
-            
-            <div style="height:300px;border:1px solid white;overflow-y:auto;">
-                <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="background-color: #E6F3FE;padding: 12px;border-radius: 10px;padding-left:45px;margin-bottom:20px;padding-bottom: 1px;"><!-- #F5F7FA -->
+            <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-->
                     <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"  
@@ -4537,19 +4537,23 @@ const radioChangeSet = (val:any) => {
                 
                 
                 
+                
+                
+            </div>
+
                 <el-popover
                     v-if="currentChildTableCount>0"
-					placement="right-end"
+					placement="right-start"
 					title=""
 					:width="200"
 					trigger="hover"
 					content="【关联表单子表字段】暂不支持填充至【当前表单主表字段】; 若【设置筛选条件】，则仅填充满足筛选条件的子表数据"
 				>
 					<template #reference>
-						<el-button  style="font-size: large;margin-top: 3px;margin-bottom: 15px;"   type="primary" link append-to-body="true" modal="true" @click="addChildFillRole">十 子表填充规则</el-button>
+						<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">
+                <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"  
@@ -4571,13 +4575,12 @@ const radioChangeSet = (val:any) => {
                             :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>
-                
-            </div>
 		</template>
 		<template #footer>
 		<div class="dialog-footer">
diff --git a/src/widget/associatedforms/associatedFormsChildFillRole.vue b/src/widget/associatedforms/associatedFormsChildFillRole.vue
index ea0cf39..770624b 100644
--- a/src/widget/associatedforms/associatedFormsChildFillRole.vue
+++ b/src/widget/associatedforms/associatedFormsChildFillRole.vue
@@ -2,7 +2,7 @@
 <template>
 
   <div
-    style="background-color: #E6F3FE;padding: 12px;border-radius: 10px;padding-left:45px;margin-bottom:20px;margin-right:11px;min-height: 65px;padding-top: 16px;">
+    style="background-color: #F0F0F0;padding: 12px;border-radius: 5px;padding-left:45px;margin-bottom:20px;margin-right:11px;min-height: 65px;padding-top: 16px;color: black;">
     <el-button 
       :icon="Close" size="small" circle type="info" plain
       style="float: right;margin-top: -22px;margin-right: -22px" @click="delRole" />
@@ -11,15 +11,47 @@
       v-model="selectedChildTable1" style="width: 290px;margin-bottom: -1px" :data="childTableList"
       placeholder="请选择关联表单子表" check-strictly :render-after-expand="false" filterable
       @change="selectedChildTableChanged" />
+    
+
+      <el-popover
+                    
+					placement="top-end"
+					title=""
+					:width="200"
+					trigger="hover"
+					content="若【设置筛选条件】，则仅填充满足筛选条件的子表数据"
+				>
+					<template #reference>
+						<el-button 
+              v-if="selectedChildTable1 !== '' && filterCondition1.conditionHtml === ''"
+              style="padding-top: 8px; width: 290px;margin-left: 85px;height: 30px;" type="primary" plain append-to-body="true"
+              modal="true" @click="filterConditionDialogFlag = true">设置筛选条件（选填）</el-button>
+					</template>
+				</el-popover>
+
+    
+
+
 
-    <el-button 
-      v-if="selectedChildTable1 === '' || filterCondition1.conditionHtml === ''"
-      style="padding-top: 8px; width: 290px;margin-left: 85px;height: 30px;" type="info" plain append-to-body="true"
-      modal="true" @click="filterConditionDialogFlag = true">设置筛选条件（选填）</el-button>
     <div 
       v-if="selectedChildTable1 !== '' && filterCondition1.conditionHtml !== ''"
       style="padding-top: 5px; width: auto;margin-left: 85px;height: 30px;cursor: pointer;display: inline-block;margin-top: 3px;"
       @click="filterConditionDialogHandle" v-html="filterCondition1.conditionHtml"></div>
+    <el-divider v-if="selectedChildTable1 !== ''" />
+    <div v-if="selectedChildTable1 !== ''" style="background-color: #F0F0F0;padding: 12px;border-radius: 10px;padding-left:45px;margin-bottom:20px;padding-bottom: 1px;margin-right: 10px;"><!-- #F5F7FA     #E6F3FE  #F0F0F0  #F5F7FA-->
+        <template v-for="(item, index) in childRoles"  :key="childRoles[index].id">
+          {{ item }}
+            <!-- <AssociatedFormsFillRole 
+                v-model:left-value="controlData.control.fillRoles.master[index].leftValue"  
+                v-model:right-value="controlData.control.fillRoles.master[index].rightValue" 
+                :left-tree-source = "asfasfMasterFieldTree" 
+                :right-tree-source = "associatedFormsCurrentFormFieldTree"  
+                :current-key="controlData.control.fillRoles.master[index].id"  
+                @del-role = "delRole"  
+                >
+            </AssociatedFormsFillRole> -->
+        </template>
+    </div>
   </div>
   
 
@@ -169,6 +201,12 @@ const props = defineProps({
       return {}
     }
   },
+  childRoles:{
+    type: Object,
+    default() {
+      return {}
+    }
+  },
 })
 
 //拿到子组件AssociatedFormsTinyace的实例

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 4/7] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=95-?=
 =?UTF-8?q?=E6=95=B0=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>
     
     

From 5eb98c91e5c660147ee91218828383655bb4ef43 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Wed, 21 Aug 2024 10:44:57 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=95-?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A1=AB=E5=85=85=E8=A7=84=E5=88=99-v0.276?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../associatedFormsChildFillRole.vue          | 197 ++++++++----------
 1 file changed, 85 insertions(+), 112 deletions(-)

diff --git a/src/widget/associatedforms/associatedFormsChildFillRole.vue b/src/widget/associatedforms/associatedFormsChildFillRole.vue
index 770624b..963ae80 100644
--- a/src/widget/associatedforms/associatedFormsChildFillRole.vue
+++ b/src/widget/associatedforms/associatedFormsChildFillRole.vue
@@ -1,47 +1,33 @@
 <!-- eslint-disable vue/no-v-html -->
 <template>
-
   <div
     style="background-color: #F0F0F0;padding: 12px;border-radius: 5px;padding-left:45px;margin-bottom:20px;margin-right:11px;min-height: 65px;padding-top: 16px;color: black;">
     <el-button 
       :icon="Close" size="small" circle type="info" plain
       style="float: right;margin-top: -22px;margin-right: -22px" @click="delRole" />
-
-    <el-tree-select
+    <el-tree-select 
       v-model="selectedChildTable1" style="width: 290px;margin-bottom: -1px" :data="childTableList"
       placeholder="请选择关联表单子表" check-strictly :render-after-expand="false" filterable
       @change="selectedChildTableChanged" />
-    
-
-      <el-popover
-                    
-					placement="top-end"
-					title=""
-					:width="200"
-					trigger="hover"
-					content="若【设置筛选条件】，则仅填充满足筛选条件的子表数据"
-				>
-					<template #reference>
-						<el-button 
-              v-if="selectedChildTable1 !== '' && filterCondition1.conditionHtml === ''"
-              style="padding-top: 8px; width: 290px;margin-left: 85px;height: 30px;" type="primary" plain append-to-body="true"
-              modal="true" @click="filterConditionDialogFlag = true">设置筛选条件（选填）</el-button>
-					</template>
-				</el-popover>
-
-    
-
-
-
+    <el-popover placement="top-end" title="" :width="200" trigger="hover" content="若【设置筛选条件】，则仅填充满足筛选条件的子表数据">
+      <template #reference>
+        <el-button 
+          v-if="selectedChildTable1 !== '' && filterCondition1.conditionHtml === ''"
+          style="padding-top: 8px; width: 290px;margin-left: 85px;height: 30px;" type="primary" plain
+          append-to-body="true" modal="true" @click="filterConditionDialogFlag = true">设置筛选条件（选填）</el-button>
+      </template>
+    </el-popover>
     <div 
       v-if="selectedChildTable1 !== '' && filterCondition1.conditionHtml !== ''"
       style="padding-top: 5px; width: auto;margin-left: 85px;height: 30px;cursor: pointer;display: inline-block;margin-top: 3px;"
       @click="filterConditionDialogHandle" v-html="filterCondition1.conditionHtml"></div>
     <el-divider v-if="selectedChildTable1 !== ''" />
-    <div v-if="selectedChildTable1 !== ''" style="background-color: #F0F0F0;padding: 12px;border-radius: 10px;padding-left:45px;margin-bottom:20px;padding-bottom: 1px;margin-right: 10px;"><!-- #F5F7FA     #E6F3FE  #F0F0F0  #F5F7FA-->
-        <template v-for="(item, index) in childRoles"  :key="childRoles[index].id">
-          {{ item }}
-            <!-- <AssociatedFormsFillRole 
+    <div 
+      v-if="selectedChildTable1 !== ''"
+      style="background-color: #F0F0F0;padding: 12px;border-radius: 10px;padding-left:45px;margin-bottom:20px;padding-bottom: 1px;margin-right: 10px;"><!-- #F5F7FA     #E6F3FE  #F0F0F0  #F5F7FA-->
+      <template v-for="(item, index) in childRoles" :key="childRoles[index].id">
+        {{ item }}
+        <!-- <AssociatedFormsFillRole 
                 v-model:left-value="controlData.control.fillRoles.master[index].leftValue"  
                 v-model:right-value="controlData.control.fillRoles.master[index].rightValue" 
                 :left-tree-source = "asfasfMasterFieldTree" 
@@ -50,78 +36,65 @@
                 @del-role = "delRole"  
                 >
             </AssociatedFormsFillRole> -->
-        </template>
+      </template>
     </div>
   </div>
-  
 
-  <el-dialog v-model="filterConditionDialogFlag" style="margin-top:70px ;min-height: 500px" width="50%" :show-close="false" title="筛选条件" append-to-body>
-    
-      <div class="common-layout">
-        <el-container>
-          <el-aside width="300px" style="height:420px;border: 1px solid gainsboro;margin-right: 5px;">
-            <el-tree 
-              ref="fieldTreeRef" node-key="id" empty-text="选择关联的表单后展示" :data="asfasfFieldTree"
-              :props="treeDefaultProps" :filter-node-method="filterNode"
-              style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"  @node-contextmenu="handleFieldTreeContextmenuRange" />
-            <!--  <el-input 
-              v-show="fieldTreeSearchFlag" v-model="fieldTreeFilterText" style="width:98%;margin: 3px;"
-              placeholder="搜索字段" class="filter-tree" /> --> 
-            <el-tree 
-              ref="fieldTreeRef" node-key="id" empty-text="请先保存当前表单" :data="associatedFormsCurrentFormFieldTree"
-              :props="treeDefaultProps" :filter-node-method="filterNode"
-              style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;" @node-contextmenu="handleFieldTreeContextmenuRange" />
-            <!-- <el-input 
-              v-show="orgTreeSearchFlag" v-model="orgTreeFilterText" style="width:98%;margin: 3px;"
-              placeholder="搜索字段" class="filter-tree" /> -->
-            <el-tree 
-              ref="orgTreeRef" style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
-              :data="orgAndManTree" :props="treeDefaultProps" :filter-node-method="filterNode"
-              
-              @node-contextmenu="handleOrgTreeContextmenuRange" />
-              
-            <!--<el-input 
-              v-show="roleTreeSearchFlag" v-model="roleTreeFilterText" style="width:98%;margin: 3px;"
-              placeholder="搜索字段" class="filter-tree" />-->
-            <el-tree 
-              ref="roleTreeRef" style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
-              :data="roleTree" :props="treeDefaultProps" :filter-node-method="filterNode"
-              
-              @node-contextmenu="handleRoleTreeContextmenuRange" /> 
-          </el-aside>
-          <el-main style="border: 1px solid gainsboro; padding: 3px;" class="associatedFormsHideDialogMain">
-            <div
-              style="border: 1px solid gainsboro; height: 7%; border-bottom: 0px; padding-top: 3px; padding-left: 5px; background-color: #E6F3FE;">
-              仅可选择符合以下条件的数据</div>
-            <div id="associatedFormsHideEditArea" style="border: 1px solid gainsboro; height: 38%; border-bottom: 0px;">
-              <AssociatedFormsTinyaceFillRoleFilterCondition 
-                ref="tinymceRef" 
-                :aft-text="filterCondition1.conditionHtml"
-                :aft-text-copy="filterCondition1.conditionHtmlCopy" 
-                @text-change="aftTextChangedRange" @gongshi-change="aftGongshiChangedRange"
-                ></AssociatedFormsTinyaceFillRoleFilterCondition>
-              
-            </div>
-            <div style="border: 1px solid gainsboro; height: 55%; padding-top: 20px;">
-              <ul>
-                <li>请从左侧面板<span style="color: red">右击</span>选择字段或选项</li>
-                <li>支持的符号：<span style="color: red">'==', '>=', '>', '<=', '<' , '!=' </span>
-                </li>
-                <li>支持<span style="color: red">"包含,不包含,数据拥有者,数据所属部门"</span>关键字,用于组织机构条件,角色条件,==运算符和!=运算符</li>
-                <li>参考举例：</li>
-                <span style="margin-left: 14px;">年龄>10</span><br>
-                <span style="margin-left: 14px;">企管部==数据所属部门</span><br>
-                <span style="margin-left: 14px;">绩效考核执行人包含数据拥有者</span><br>
-                <span style="margin-left: 14px;">生产部包含数据所属部门</span>
-              </ul>
-            </div>
-          </el-main>
-        </el-container>
-      </div>
-    
+
+  <el-dialog 
+    v-model="filterConditionDialogFlag" style="margin-top:70px ;min-height: 500px" width="50%"
+    :show-close="false" title="筛选条件" append-to-body>
+    <div class="common-layout">
+      <el-container>
+        <el-aside width="300px" style="height:420px;border: 1px solid gainsboro;margin-right: 5px;">
+          <el-tree 
+            ref="fieldTreeRef" node-key="id" empty-text="选择关联的表单后展示" :data="asfasfFieldTree"
+            :props="treeDefaultProps" :filter-node-method="filterNode"
+            style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
+            @node-contextmenu="handleFieldTreeContextmenuRange" />
+          <el-tree 
+            ref="fieldTreeRef" node-key="id" empty-text="请先保存当前表单" :data="associatedFormsCurrentFormFieldTree"
+            :props="treeDefaultProps" :filter-node-method="filterNode"
+            style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
+            @node-contextmenu="handleFieldTreeContextmenuRange" />
+          <el-tree 
+            ref="orgTreeRef" style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
+            :data="orgAndManTree" :props="treeDefaultProps" :filter-node-method="filterNode"
+            @node-contextmenu="handleOrgTreeContextmenuRange" />
+          <el-tree 
+            ref="roleTreeRef" style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
+            :data="roleTree" :props="treeDefaultProps" :filter-node-method="filterNode"
+            @node-contextmenu="handleRoleTreeContextmenuRange" />
+        </el-aside>
+        <el-main style="border: 1px solid gainsboro; padding: 3px;" class="associatedFormsHideDialogMain">
+          <div
+            style="border: 1px solid gainsboro; height: 7%; border-bottom: 0px; padding-top: 3px; padding-left: 5px; background-color: #E6F3FE;">
+            仅可选择符合以下条件的数据</div>
+          <div id="associatedFormsHideEditArea" style="border: 1px solid gainsboro; height: 38%; border-bottom: 0px;">
+            <AssociatedFormsTinyaceFillRoleFilterCondition 
+              ref="tinymceRef" :aft-text="filterCondition1.conditionHtml"
+              :aft-text-copy="filterCondition1.conditionHtmlCopy" @text-change="aftTextChangedRange"
+              @gongshi-change="aftGongshiChangedRange"></AssociatedFormsTinyaceFillRoleFilterCondition>
+          </div>
+          <div style="border: 1px solid gainsboro; height: 55%; padding-top: 20px;">
+            <ul>
+              <li>请从左侧面板<span style="color: red">右击</span>选择字段或选项</li>
+              <li>支持的符号：<span style="color: red">'==', '>=', '>', '<=', '<' , '!=' </span>
+              </li>
+              <li>支持<span style="color: red">"包含,不包含,数据拥有者,数据所属部门"</span>关键字,用于组织机构条件,角色条件,==运算符和!=运算符</li>
+              <li>参考举例：</li>
+              <span style="margin-left: 14px;">年龄>10</span><br>
+              <span style="margin-left: 14px;">企管部==数据所属部门</span><br>
+              <span style="margin-left: 14px;">绩效考核执行人包含数据拥有者</span><br>
+              <span style="margin-left: 14px;">生产部包含数据所属部门</span>
+            </ul>
+          </div>
+        </el-main>
+      </el-container>
+    </div>
+
     <template #footer>
       <div class="dialog-footer">
-        <!-- <el-button @click="asfhTextCancelRange">取消</el-button> -->
         <el-button type="primary" @click="filterConditionDialogHandle">
           确定
         </el-button>
@@ -137,40 +110,40 @@ import AssociatedFormsTinyaceFillRoleFilterCondition from '@/widget/associatedfo
 
 let emit = defineEmits(["delRole", "update:selectedChildTable",]);
 const props = defineProps({
-  
-  orgAndManTree:{
+
+  orgAndManTree: {
     type: Object,
     default() {
       return {}
     }
   },
-  roleTree:{
+  roleTree: {
     type: Object,
     default() {
       return {}
     }
   },
 
-  associatedFormsCurrentFormFieldTree:{
+  associatedFormsCurrentFormFieldTree: {
     type: Object,
     default() {
       return {}
     }
   },
-  
-  filterNode:{
+
+  filterNode: {
     type: Object,
     default() {
       return {}
     }
   },
-  treeDefaultProps:{
+  treeDefaultProps: {
     type: Object,
     default() {
       return {}
     }
   },
-  asfasfFieldTree:{
+  asfasfFieldTree: {
     type: Object,
     default() {
       return {}
@@ -194,14 +167,14 @@ const props = defineProps({
       return {}
     }
   },
-  
+
   currentKey: {
     type: String,
     default() {
       return {}
     }
   },
-  childRoles:{
+  childRoles: {
     type: Object,
     default() {
       return {}
@@ -229,11 +202,11 @@ function filterConditionDialogHandle() {
   filterConditionDialogFlag.value = !filterConditionDialogFlag.value
 }
 
-function aftTextChangedRange(str:string){
+function aftTextChangedRange(str: string) {
   filterCondition1.value.conditionHtml = str
 }
 
-function aftGongshiChangedRange(gongshi:any){
+function aftGongshiChangedRange(gongshi: any) {
   filterCondition1.value.gongShi.formulaHtml = gongshi.formulaHtml
   filterCondition1.value.gongShi.mathsFormula = gongshi.mathsFormula
   filterCondition1.value.gongShi.mathsString = gongshi.mathsString
@@ -247,13 +220,13 @@ function selectedChildTableChanged() {
 function delRole() {
   emit('delRole', props.currentKey)
 }
-function handleOrgTreeContextmenuRange(MouseEvent:any, object:any, Node:any, element:any){
+function handleOrgTreeContextmenuRange(MouseEvent: any, object: any, Node: any, element: any) {
   tinymceRef.value.addIcon_org(object)
 }
-function handleRoleTreeContextmenuRange(MouseEvent:any, object:any, Node:any, element:any){
+function handleRoleTreeContextmenuRange(MouseEvent: any, object: any, Node: any, element: any) {
   tinymceRef.value.addIcon(object)
-}     
-function handleFieldTreeContextmenuRange(MouseEvent:any, object:any, Node:any, element:any){
+}
+function handleFieldTreeContextmenuRange(MouseEvent: any, object: any, Node: any, element: any) {
   tinymceRef.value.addIcon(object)
 }
 </script>

From d808eae8de574d52e8c8545f529f5c2ff0598ccc Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Wed, 21 Aug 2024 13:49:01 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=95-?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A1=AB=E5=85=85=E8=A7=84=E5=88=99-v0.3?=
 =?UTF-8?q?=E9=A1=B5=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

---
 .../DesignForm/formControlPropertiNew.vue     | 13 +++--
 .../associatedFormsChildFillRole.vue          | 57 ++++++++++++-------
 2 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index 4c79ed0..468e87a 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -2620,6 +2620,7 @@ function addChildFillRole(){
     //controlData.value.control.fillRoles.child.length
 if(controlData.value.control.fillRoles.child.length<currentChildTableCount){
         let onlyNumber = uuidv4().replaceAll('-','').toString();   //获取唯一编码
+        let onlyNumber1 = uuidv4().replaceAll('-','').toString();   //获取唯一编码
         controlData.value.control.fillRoles.child.push({
                                                         id: onlyNumber,
                                                         tableKey: '',
@@ -2632,7 +2633,11 @@ if(controlData.value.control.fillRoles.child.length<currentChildTableCount){
                                                                 mathsString:'',
                                                             },
                                                         },
-                                                        childRoles:[]
+                                                        childRoles:[{
+											leftValue: '',
+											rightValue: '',
+											id: onlyNumber1,
+										}]
                                                     })
     }else{
         alert("当前关联表单共 "+controlData.value.control.fillRoles.child.length+" 张子表,不可再添加")
@@ -4512,7 +4517,7 @@ 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%"  >
+    <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="50%"  >
 		<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;">
@@ -4536,7 +4541,7 @@ const radioChangeSet = (val:any) => {
 				title=""
 				:width="200"
 				trigger="hover"
-				content="【关联表单子表字段】暂不支持填充至【当前表单主表字段】; 若【设置筛选条件】，则仅填充满足筛选条件的子表数据"
+				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>
@@ -4547,6 +4552,7 @@ const radioChangeSet = (val:any) => {
                     <AssociatedFormsChildFillRole 
                         v-model:selected-child-table="controlData.control.fillRoles.child[index].tableKey"  
                         v-model:filter-condition="controlData.control.fillRoles.child[index].filterCondition"
+                        v-model:child-roles = "controlData.control.fillRoles.child[index].childRoles"
                         :asfasf-field-tree="asfasfFieldTree"
                         :tree-default-props="treeDefaultProps"
                         :filter-node="filterNode"
@@ -4558,7 +4564,6 @@ const radioChangeSet = (val:any) => {
                         :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>
diff --git a/src/widget/associatedforms/associatedFormsChildFillRole.vue b/src/widget/associatedforms/associatedFormsChildFillRole.vue
index 963ae80..85f0990 100644
--- a/src/widget/associatedforms/associatedFormsChildFillRole.vue
+++ b/src/widget/associatedforms/associatedFormsChildFillRole.vue
@@ -6,14 +6,14 @@
       :icon="Close" size="small" circle type="info" plain
       style="float: right;margin-top: -22px;margin-right: -22px" @click="delRole" />
     <el-tree-select 
-      v-model="selectedChildTable1" style="width: 290px;margin-bottom: -1px" :data="childTableList"
+      v-model="selectedChildTable1" style="width: 270px;margin-bottom: -1px" :data="childTableList"
       placeholder="请选择关联表单子表" check-strictly :render-after-expand="false" filterable
       @change="selectedChildTableChanged" />
     <el-popover placement="top-end" title="" :width="200" trigger="hover" content="若【设置筛选条件】，则仅填充满足筛选条件的子表数据">
       <template #reference>
         <el-button 
           v-if="selectedChildTable1 !== '' && filterCondition1.conditionHtml === ''"
-          style="padding-top: 8px; width: 290px;margin-left: 85px;height: 30px;" type="primary" plain
+          style="padding-top: 8px; width: 270px;margin-left: 85px;height: 30px;" type="primary" plain
           append-to-body="true" modal="true" @click="filterConditionDialogFlag = true">设置筛选条件（选填）</el-button>
       </template>
     </el-popover>
@@ -24,20 +24,24 @@
     <el-divider v-if="selectedChildTable1 !== ''" />
     <div 
       v-if="selectedChildTable1 !== ''"
-      style="background-color: #F0F0F0;padding: 12px;border-radius: 10px;padding-left:45px;margin-bottom:20px;padding-bottom: 1px;margin-right: 10px;"><!-- #F5F7FA     #E6F3FE  #F0F0F0  #F5F7FA-->
+      style="background-color: #F0F0F0;border-radius: 5px;padding-bottom: 1px;margin-right: 10px;"><!-- #F5F7FA     #E6F3FE  #F0F0F0  #F5F7FA-->
       <template v-for="(item, index) in childRoles" :key="childRoles[index].id">
-        {{ item }}
-        <!-- <AssociatedFormsFillRole 
-                v-model:left-value="controlData.control.fillRoles.master[index].leftValue"  
-                v-model:right-value="controlData.control.fillRoles.master[index].rightValue" 
-                :left-tree-source = "asfasfMasterFieldTree" 
-                :right-tree-source = "associatedFormsCurrentFormFieldTree"  
-                :current-key="controlData.control.fillRoles.master[index].id"  
-                @del-role = "delRole"  
-                >
-            </AssociatedFormsFillRole> -->
+        <div style="display: flex;margin-bottom: 10px;">
+          <el-tree-select 
+            v-model="leftValue1" style="width: 270px;" :data="leftTreeSource" placeholder="关联表单主表字段"
+            check-strictly :render-after-expand="false" filterable  @change="leftChanged" />
+          <span style="margin-left: 8px;margin-right: 8px;">的值填充到</span>
+          <el-tree-select 
+            v-model="rightValue1" style="width: 270px;" :data="rightTreeSource"
+            check-strictly :render-after-expand="false"  placeholder="当前表单字段" filterable @change="rightChanged" />
+            <Delete style="width: 22px; height: 22px;cursor: pointer; color: #50A6FF; display: block;  float:right;margin-left: 35px;margin-top: 4px;" @click="delChildRole(item)" />
+
+        </div>
+        
       </template>
+      
     </div>
+    <el-link type="primary" @click="addChildRole">十 添加规则</el-link>
   </div>
 
 
@@ -107,10 +111,9 @@
 <script setup lang="ts">
 import { Close } from '@element-plus/icons-vue'
 import AssociatedFormsTinyaceFillRoleFilterCondition from '@/widget/associatedforms/associatedFormsTinyaceFillRoleFilterCondition.vue'
-
+import { v4 as uuidv4 } from "uuid";
 let emit = defineEmits(["delRole", "update:selectedChildTable",]);
 const props = defineProps({
-
   orgAndManTree: {
     type: Object,
     default() {
@@ -123,14 +126,12 @@ const props = defineProps({
       return {}
     }
   },
-
   associatedFormsCurrentFormFieldTree: {
     type: Object,
     default() {
       return {}
     }
   },
-
   filterNode: {
     type: Object,
     default() {
@@ -167,7 +168,6 @@ const props = defineProps({
       return {}
     }
   },
-
   currentKey: {
     type: String,
     default() {
@@ -191,7 +191,8 @@ const filterConditionDialogFlag = ref(false)
 const selectedChildTable1 = ref()
 selectedChildTable1.value = props.selectedChildTable
 
-
+const childRoles1 = ref()
+childRoles1.value = props.childRoles
 
 const filterCondition1 = ref()
 filterCondition1.value = props.filterCondition
@@ -216,7 +217,23 @@ function selectedChildTableChanged() {
   emit('update:selectedChildTable', selectedChildTable1)
 }
 
-
+function delChildRole(item: any) {
+  let id = item.id
+  for (var i = 0; i < childRoles1.value.length; i++) {
+    if(childRoles1.value[i].id===id){
+      childRoles1.value.splice(i, 1);
+      i--; // 如果不减，将漏掉一个元素
+    }
+  }
+}
+function addChildRole(){
+  let onlyNumber = uuidv4().replaceAll('-','').toString();   //获取唯一编码
+  childRoles1.value.push({
+											leftValue: '',
+											rightValue: '',
+											id: onlyNumber,
+										})
+}
 function delRole() {
   emit('delRole', props.currentKey)
 }

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 7/7] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=95-?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A1=AB=E5=85=85=E8=A7=84=E5=88=99-v0.31?=
 =?UTF-8?q?=E9=A1=B5=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" />