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