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 1/6] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=BA=E6=A0=87=E7=AD=BE=E5=B7=A6=E5=8F=B3?=
 =?UTF-8?q?=E5=B8=83=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';

From 4bcdf4d84aef9d36bdae69b6b36aa2cdf6b5ed84 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Mon, 19 Aug 2024 16:38:11 +0800
Subject: [PATCH 2/6] =?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.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/assembly/index.ts   |  32 ++-
 .../DesignForm/formControlPropertiNew.vue     | 183 ++++++++++++++++--
 .../associatedFormsFillRole.vue               |   4 +-
 3 files changed, 194 insertions(+), 25 deletions(-)

diff --git a/src/components/DesignForm/assembly/index.ts b/src/components/DesignForm/assembly/index.ts
index f1370b1..70c43ee 100644
--- a/src/components/DesignForm/assembly/index.ts
+++ b/src/components/DesignForm/assembly/index.ts
@@ -906,13 +906,31 @@ export default [
 					},
 					saveFlag: false,
 					asfasfLabel:'',
-					fillRoles: [
-						{
-							leftValue: '',
-							rightValue: '',
-							id: '',
-						}
-					],
+					fillRoles: {
+							master:  [
+								{
+									leftValue: '',
+									rightValue: '',
+									id: '',
+								},
+							],
+							child: [
+								{
+									id: '',
+									tableKey: '',
+									filterCondition:{
+										conditionHtml: '',
+										conditionHtmlCopy: '',
+										gongShi:{
+											formulaHtml:'',
+											mathsFormula:'',
+											mathsString:'',
+										},
+									},
+									childRoles:[]
+								},
+							],
+						},
 				},
 				config: {}
 			},
diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index 65deb79..b822411 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -1781,9 +1781,9 @@ const showImagePreview = ref(false)
                 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 = [
+            console.log(controlData.value.control.fillRoles.master)
+            if(controlData.value.control.fillRoles&&controlData.value.control.fillRoles.master.length==0){
+                controlData.value.control.fillRoles.master = [
 						{
 							leftValue: '',
 							rightValue: '',
@@ -1791,7 +1791,26 @@ const showImagePreview = ref(false)
 						}
 					]
             }
-            controlData.value.control.fillRoles[0].id = uuidv4().replaceAll('-','').toString();
+            if(controlData.value.control.fillRoles&&controlData.value.control.fillRoles.child.length==0){
+                controlData.value.control.fillRoles.child = [
+								{
+									id: '',
+									tableKey: '',
+									filterCondition:{
+										conditionHtml: '',
+										conditionHtmlCopy: '',
+										gongShi:{
+											formulaHtml:'',
+											mathsFormula:'',
+											mathsString:'',
+										},
+									},
+									childRoles:[]
+								},
+							]
+            }
+            controlData.value.control.fillRoles.master[0].id = uuidv4().replaceAll('-','').toString();
+            controlData.value.control.fillRoles.child[0].id = uuidv4().replaceAll('-','').toString();
         }
         //实现关联表单设置可选字段中没有当前字段效果    start
         // console.log(controlData.value.name)
@@ -2011,6 +2030,7 @@ const transferDataSourceOptions = [
 import AssociatedFormsTinyace from '@/widget/associatedforms/associatedFormsTinyace.vue'
 import AssociatedFormsTinyaceRange from '@/widget/associatedforms/associatedFormsTinyaceRange.vue'
 import AssociatedFormsFillRole from '@/widget/associatedforms/associatedFormsFillRole.vue'
+import AssociatedFormsChildFillRole from '@/widget/associatedforms/associatedFormsChildFillRole.vue'
 
 const treeDefaultProps = {
 	children: 'children',
@@ -2077,8 +2097,14 @@ function getAsfasfFieldTreeOptionsValue3() {
 //
 const asfasfFieldTree = ref<Tree[]>()
 
+const asfasfMasterFieldTree = ref<Tree[]>()
+
+const asfasfChildTableList = ref<Tree[]>()
+
 const asfasfFieldTreeOptionsValue3 = ref<Tree[]>()
 
+let currentChildTableCount = 0
+
 function formidChanged(){
     
     if(controlData.value.control.formid===''){
@@ -2090,12 +2116,43 @@ function formidChanged(){
                 //alert("cfid为空")
             }else{
                 let resData = ref(data.children)
-                //let rootid_ = data.value.label
+                let dataExceptChild = JSON.parse(JSON.stringify(data.children))
+                let dataOnlyChild = JSON.parse(JSON.stringify(data.children))
+                dataExceptChild = dataExceptChild.filter((obj: { type: string }) => obj.type!== 'table');
+                dataOnlyChild = dataOnlyChild.filter((obj: { type: string }) => obj.type== 'table');
+                for(let m = 0;m<dataOnlyChild.length;m++){
+                    dataOnlyChild[m].children = []
+                }
+                let resDataExceptChild = ref(dataExceptChild)
+                let resDataOnlyChild = ref(dataOnlyChild)
+                //console.log(resDataOnlyChild.value)
+                let childTableCount = 0
+                for(let n = 0;n<resDataOnlyChild.value.length;n++){
+                    console.log(resDataOnlyChild.value[n])
+                    childTableCount++
+                }
+                console.log(childTableCount)
+                currentChildTableCount = childTableCount
                 asfasfFieldTree.value = [{
                     id: 'rootid_'+data.label,
                     label: '关联的表单-'+data.label,
                     children: [...resData.value],
                     treeAttrs: data.treeAttrs,
+                    disabled:true,
+                }]
+                asfasfMasterFieldTree.value = [{
+                    id: 'rootid_'+data.label,
+                    label: '关联的表单-'+data.label,
+                    children: [...resDataExceptChild.value],
+                    treeAttrs: data.treeAttrs,
+                    disabled:true,
+                }]
+                asfasfChildTableList.value = [{
+                    id: 'rootid_'+data.label,
+                    label: '关联的表单-'+data.label,
+                    children: [...resDataOnlyChild.value],
+                    treeAttrs: data.treeAttrs,
+                    disabled:true,
                 }]
             }
             controlData.value.control.asfasfLabel = data.label
@@ -2190,6 +2247,7 @@ getAssociatedFormsCurrentFieldTree().then(({ data }) => {
             label: '当前表单-'+data.treeAttrs.show,
             children: [...resData.value],
             treeAttrs: data.treeAttrs,
+            disabled: true,
         }]
         
         resDataNoTable = resDataNoTable.filter((item: { type: string | null }) => item.type!="table")
@@ -2382,13 +2440,46 @@ function associatedFormsDataRangeDialoghandle(){
                 //alert("cfid为空")
             }else{
                 let resData = ref(data.children)
-                //let rootid_ = data.value.label
+                let dataExceptChild = JSON.parse(JSON.stringify(data.children))
+                let dataOnlyChild = JSON.parse(JSON.stringify(data.children))
+                dataExceptChild = dataExceptChild.filter((obj: { type: string }) => obj.type!== 'table');
+                dataOnlyChild = dataOnlyChild.filter((obj: { type: string }) => obj.type== 'table');
+                for(let m = 0;m<dataOnlyChild.length;m++){
+                    dataOnlyChild[m].children = []
+                }
+                let resDataExceptChild = ref(dataExceptChild)
+                let resDataOnlyChild = ref(dataOnlyChild)
+                //console.log(asfasfChildTableList.value)
+                //console.log(resDataOnlyChild.value)
+                let childTableCount = 0
+                for(let n = 0;n<resDataOnlyChild.value.length;n++){
+                    console.log(resDataOnlyChild.value[n])
+                    childTableCount = n;
+                }
+                console.log(childTableCount)
+                currentChildTableCount = childTableCount
                 asfasfFieldTree.value = [{
                     id: 'rootid_'+data.label,
                     label: '关联的表单-'+data.label,
                     children: [...resData.value],
                     treeAttrs: data.treeAttrs,
+                    disabled:true,
+                }]
+                asfasfMasterFieldTree.value = [{
+                    id: 'rootid_'+data.label,
+                    label: '关联的表单-'+data.label,
+                    children: [...resDataExceptChild.value],
+                    treeAttrs: data.treeAttrs,
+                    disabled:true,
+                }]
+                asfasfChildTableList.value = [{
+                    id: 'rootid_'+data.label,
+                    label: '关联的表单-'+data.label,
+                    children: [...resDataOnlyChild.value],
+                    treeAttrs: data.treeAttrs,
+                    disabled:true,
                 }]
+
             }
         });
 
@@ -2514,15 +2605,44 @@ watch(()=>store.activeKey, () => {
 
 function addFillRole(){
     let onlyNumber = uuidv4().replaceAll('-','').toString();   //获取唯一编码
-    controlData.value.control.fillRoles.push({
+    controlData.value.control.fillRoles.master.push({
         leftValue:'',
 		rightValue:'',
         id:onlyNumber,
     })
 }
 
+function addChildFillRole(){
+    let onlyNumber = uuidv4().replaceAll('-','').toString();   //获取唯一编码
+    controlData.value.control.fillRoles.child.push({
+									id: onlyNumber,
+									tableKey: '',
+									filterCondition:{
+										conditionHtml: '',
+										conditionHtmlCopy: '',
+										gongShi:{
+											formulaHtml:'',
+											mathsFormula:'',
+											mathsString:'',
+										},
+									},
+									childRoles:[]
+								})
+}
+
 function delRole(id:String){
-    const delRoleData:any = controlData.value.control.fillRoles
+    const delRoleData:any = controlData.value.control.fillRoles.master
+        for (var i = 0; i < delRoleData.length; i++) {
+            if(delRoleData[i].id===id){
+                delRoleData.splice(i, 1);
+                i--; // 如果不减，将漏掉一个元素
+            }
+        }
+}
+
+
+function delChildRole(id:String){
+    const delRoleData:any = controlData.value.control.fillRoles.child
         for (var i = 0; i < delRoleData.length; i++) {
             if(delRoleData[i].id===id){
                 delRoleData.splice(i, 1);
@@ -4388,16 +4508,47 @@ 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: 800px" width="80%"  >
 		
 		<template v-if="controlData.type=='associatedForms'">
-            <el-divider style="margin-top: 0px;" />
-			<div style="margin-top: -10px;"><span style="color: grey;">当选择具体数据后，将按如下规则给当前表单字段填充数据 </span></div>
-            <el-button  style="font-size: large;margin-top: 3px;"   type="primary" link append-to-body="true" modal="true" @click="addFillRole">十 添加规则</el-button>
-            <el-divider />
-            <div style="height:600px;border:1px solid white;overflow-y:auto">
+            
+            <div style="height:600px;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 -->
+                    <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"  
+                            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>
                 
-                    <template v-for="(item, index) in controlData.control.fillRoles"  :key="controlData.control.fillRoles[index].id">
-                        <AssociatedFormsFillRole v-model:left-value="controlData.control.fillRoles[index].leftValue"  v-model:right-value="controlData.control.fillRoles[index].rightValue" :left-tree-source = "asfasfFieldTree" :right-tree-source = "associatedFormsCurrentFormFieldTree"  :current-key="controlData.control.fillRoles[index].id"  @del-Role = "delRole"  ></AssociatedFormsFillRole>
+                
+                
+                <el-popover
+                    v-if="currentChildTableCount>0"
+					placement="right-end"
+					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>
+					</template>
+				</el-popover>
+                <div v-if="currentChildTableCount>0"><!-- asfasfChildTableList -->
+                    <template v-for="(item, index) in controlData.control.fillRoles.child"  :key="controlData.control.fillRoles.child[index].id">
+                        <AssociatedFormsChildFillRole 
+                            :current-key="controlData.control.fillRoles.child[index].id" 
+                            :child-table-list="asfasfChildTableList"
+                            @del-role = "delChildRole"
+                            >
+                        </AssociatedFormsChildFillRole>
                     </template>
-                    <div style="height:2000px"></div>
+                </div>
                 
             </div>
 		</template>
diff --git a/src/widget/associatedforms/associatedFormsFillRole.vue b/src/widget/associatedforms/associatedFormsFillRole.vue
index af5b81a..7d1d7a4 100644
--- a/src/widget/associatedforms/associatedFormsFillRole.vue
+++ b/src/widget/associatedforms/associatedFormsFillRole.vue
@@ -2,12 +2,12 @@
 
 <div style="margin-bottom: 15px; height: 40px; line-height: 40px;">
   <el-tree-select 
-    v-model="leftValue1" style="width: 290px;" :data="leftTreeSource"
+    v-model="leftValue1" style="width: 290px;" :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: 290px;" :data="rightTreeSource"
-    check-strictly :render-after-expand="false" filterable @change="rightChanged" />
+    check-strictly :render-after-expand="false"  placeholder="当前表单字段" 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" />
 </div>
   

From 4d5667bcf89112a759d96b88bfc41f48e84723f2 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Mon, 19 Aug 2024 16:49:42 +0800
Subject: [PATCH 3/6] =?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.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/formControlPropertiNew.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index b822411..dd4f3ae 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -4542,6 +4542,7 @@ const radioChangeSet = (val:any) => {
                 <div v-if="currentChildTableCount>0"><!-- asfasfChildTableList -->
                     <template v-for="(item, index) in controlData.control.fillRoles.child"  :key="controlData.control.fillRoles.child[index].id">
                         <AssociatedFormsChildFillRole 
+                            v-model:left-value="controlData.control.fillRoles.child[index].tableKey"  
                             :current-key="controlData.control.fillRoles.child[index].id" 
                             :child-table-list="asfasfChildTableList"
                             @del-role = "delChildRole"

From c51437192c90bb99633a76f530139d96721d7eb3 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Mon, 19 Aug 2024 16:56:33 +0800
Subject: [PATCH 4/6] =?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.21?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignForm/formControlPropertiNew.vue     |  2 +-
 .../associatedFormsChildFillRole.vue          | 85 +++++++++++++++++++
 2 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 src/widget/associatedforms/associatedFormsChildFillRole.vue

diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index dd4f3ae..f64a4c3 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -4542,7 +4542,7 @@ const radioChangeSet = (val:any) => {
                 <div v-if="currentChildTableCount>0"><!-- asfasfChildTableList -->
                     <template v-for="(item, index) in controlData.control.fillRoles.child"  :key="controlData.control.fillRoles.child[index].id">
                         <AssociatedFormsChildFillRole 
-                            v-model:left-value="controlData.control.fillRoles.child[index].tableKey"  
+                            v-model:selected-child-table="controlData.control.fillRoles.child[index].tableKey"  
                             :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
new file mode 100644
index 0000000..ed7a0ff
--- /dev/null
+++ b/src/widget/associatedforms/associatedFormsChildFillRole.vue
@@ -0,0 +1,85 @@
+<template>
+
+<div style="background-color: #E6F3FE;padding: 12px;border-radius: 10px;padding-left:45px;margin-bottom:20px;margin-right:11px;min-height: 65px;">
+  <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" /> -->
+</div>
+  
+
+
+</template>
+
+<script setup lang="ts">
+import { Close } from '@element-plus/icons-vue'
+
+const props = defineProps({
+  childTableList: {
+    type: Object,
+    default() {
+      return {}
+    }
+  },
+  selectedChildTable: {
+    type: String,
+    default() {
+      return {}
+    }
+  },
+  /* rightTreeSource: {
+    type: Object,
+    default() {
+      return {}
+    }
+  },
+  
+  rightValue: {
+    type: String,
+    default() {
+      return {}
+    }
+  },*/
+  currentKey: {
+    type: String,
+    default() {
+      return {}
+    }
+  }, 
+})
+const selectedChildTable1 = ref()
+selectedChildTable1.value = props.selectedChildTable
+/*const rightValue1 = ref()
+
+
+rightValue1.value = props.rightValue
+ */
+
+
+let emit = defineEmits(["delRole","update:selectedChildTable",]);
+
+function selectedChildTableChanged(){
+  emit('update:selectedChildTable',selectedChildTable1)
+}
+/*
+function rightChanged(){
+  emit('update:rightValue',rightValue1)
+} */
+
+function delRole(){
+  //alert(props.currentKey)
+  emit('delRole',props.currentKey)
+}
+
+
+
+</script>
+
+<style></style>
\ No newline at end of file

From ccc02cd7f6631454654ce7771e569f5eae37cf1c Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Tue, 20 Aug 2024 09:11:58 +0800
Subject: [PATCH 5/6] =?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.23?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignForm/formControlPropertiNew.vue     | 40 ++++++++++++-------
 .../associatedFormsChildFillRole.vue          | 17 +++++++-
 2 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index f64a4c3..16e9b58 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -2129,6 +2129,7 @@ function formidChanged(){
                 let childTableCount = 0
                 for(let n = 0;n<resDataOnlyChild.value.length;n++){
                     console.log(resDataOnlyChild.value[n])
+                    resDataOnlyChild.value[n].disabled=false
                     childTableCount++
                 }
                 console.log(childTableCount)
@@ -2454,6 +2455,7 @@ function associatedFormsDataRangeDialoghandle(){
                 let childTableCount = 0
                 for(let n = 0;n<resDataOnlyChild.value.length;n++){
                     console.log(resDataOnlyChild.value[n])
+                    resDataOnlyChild.value[n].disabled=false
                     childTableCount = n;
                 }
                 console.log(childTableCount)
@@ -2613,21 +2615,29 @@ function addFillRole(){
 }
 
 function addChildFillRole(){
-    let onlyNumber = uuidv4().replaceAll('-','').toString();   //获取唯一编码
-    controlData.value.control.fillRoles.child.push({
-									id: onlyNumber,
-									tableKey: '',
-									filterCondition:{
-										conditionHtml: '',
-										conditionHtmlCopy: '',
-										gongShi:{
-											formulaHtml:'',
-											mathsFormula:'',
-											mathsString:'',
-										},
-									},
-									childRoles:[]
-								})
+    //子表填充规则要受到子表数量的限制
+    //currentChildTableCount
+    //controlData.value.control.fillRoles.child.length
+    if(controlData.value.control.fillRoles.child.length<currentChildTableCount){
+        let onlyNumber = uuidv4().replaceAll('-','').toString();   //获取唯一编码
+        controlData.value.control.fillRoles.child.push({
+                                                        id: onlyNumber,
+                                                        tableKey: '',
+                                                        filterCondition:{
+                                                            conditionHtml: '',
+                                                            conditionHtmlCopy: '',
+                                                            gongShi:{
+                                                                formulaHtml:'',
+                                                                mathsFormula:'',
+                                                                mathsString:'',
+                                                            },
+                                                        },
+                                                        childRoles:[]
+                                                    })
+    }else{
+        alert("当前关联表单共 "+controlData.value.control.fillRoles.child.length+" 张子表,不可再添加")
+    }
+    
 }
 
 function delRole(id:String){
diff --git a/src/widget/associatedforms/associatedFormsChildFillRole.vue b/src/widget/associatedforms/associatedFormsChildFillRole.vue
index ed7a0ff..3d651d7 100644
--- a/src/widget/associatedforms/associatedFormsChildFillRole.vue
+++ b/src/widget/associatedforms/associatedFormsChildFillRole.vue
@@ -12,15 +12,28 @@
     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 v-if="selectedChildTable1===''" style="padding-top: 5px;" type="primary" link append-to-body="true" modal="true" @click="associatedFormsDataRangeDialoghandle"  >设置筛选条件（选填）</el-button>
+				<div v-if="selectedChildTable1!==''" style="width:100%; cursor: pointer;" @click="associatedFormsDataRangeDialoghandle"  v-html="controlData.control.dataRangeConditionHtml"></div> -->
 </div>
   
-
+<el-dialog
+      v-model="innerVisible"
+      width="500"
+      title="Inner Dialog"
+      append-to-body
+    >
+    {{ currentKey }}
+  </el-dialog>
 
 </template>
 
 <script setup lang="ts">
 import { Close } from '@element-plus/icons-vue'
-
+const innerVisible = ref(false)
 const props = defineProps({
   childTableList: {
     type: Object,

From 6e0627d7e3550088aa214fa027aa96dcca0acb74 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Tue, 20 Aug 2024 09:40:45 +0800
Subject: [PATCH 6/6] =?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.24?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignForm/formControlPropertiNew.vue     |  4 +-
 .../associatedFormsChildFillRole.vue          | 48 ++++++++++---------
 .../associatedFormsFillRole.vue               |  4 +-
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index 16e9b58..808c460 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -4515,11 +4515,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: 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:800px"  width="50%"  >
 		
 		<template v-if="controlData.type=='associatedForms'">
             
-            <div style="height:600px;border:1px solid white;overflow-y:auto;">
+            <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 -->
                     <template v-for="(item, index) in controlData.control.fillRoles.master"  :key="controlData.control.fillRoles.master[index].id">
diff --git a/src/widget/associatedforms/associatedFormsChildFillRole.vue b/src/widget/associatedforms/associatedFormsChildFillRole.vue
index 3d651d7..ac01695 100644
--- a/src/widget/associatedforms/associatedFormsChildFillRole.vue
+++ b/src/widget/associatedforms/associatedFormsChildFillRole.vue
@@ -1,29 +1,31 @@
 <template>
 
-<div style="background-color: #E6F3FE;padding: 12px;border-radius: 10px;padding-left:45px;margin-bottom:20px;margin-right:11px;min-height: 65px;">
-  <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" /> -->
+  <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 v-if="selectedChildTable1===''" style="padding-top: 5px;" type="primary" link append-to-body="true" modal="true" @click="associatedFormsDataRangeDialoghandle"  >设置筛选条件（选填）</el-button>
-				<div v-if="selectedChildTable1!==''" style="width:100%; cursor: pointer;" @click="associatedFormsDataRangeDialoghandle"  v-html="controlData.control.dataRangeConditionHtml"></div> -->
-</div>
-  
-<el-dialog
-      v-model="innerVisible"
+          <!-- <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>
+    
+  <el-dialog
+      v-model="filterConditionDialoghandle"
       width="500"
-      title="Inner Dialog"
+      :show-close="true"
+      title="筛选条件"
       append-to-body
     >
     {{ currentKey }}
@@ -33,7 +35,7 @@
 
 <script setup lang="ts">
 import { Close } from '@element-plus/icons-vue'
-const innerVisible = ref(false)
+const filterConditionDialoghandle = ref(false)
 const props = defineProps({
   childTableList: {
     type: Object,
diff --git a/src/widget/associatedforms/associatedFormsFillRole.vue b/src/widget/associatedforms/associatedFormsFillRole.vue
index 7d1d7a4..69f8e9a 100644
--- a/src/widget/associatedforms/associatedFormsFillRole.vue
+++ b/src/widget/associatedforms/associatedFormsFillRole.vue
@@ -2,11 +2,11 @@
 
 <div style="margin-bottom: 15px; height: 40px; line-height: 40px;">
   <el-tree-select 
-    v-model="leftValue1" style="width: 290px;" :data="leftTreeSource" placeholder="关联表单主表字段"
+    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: 290px;" :data="rightTreeSource"
+    v-model="rightValue1" style="width: 270px;" :data="rightTreeSource"
     check-strictly :render-after-expand="false"  placeholder="当前表单字段" 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" />
 </div>