From ba35165bab46691e5863db8010235a5e91621cc3 Mon Sep 17 00:00:00 2001 From: liwenxuan <1298531568@qq.com> Date: Mon, 14 Apr 2025 13:06:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E9=80=89=E6=8B=A9=E6=A1=86?= =?UTF-8?q?=E4=B8=BA=E5=A4=9A=E9=80=89=E6=97=B6,=E5=85=B3=E8=81=94?= =?UTF-8?q?=E9=80=89=E9=A1=B9=E8=AE=BE=E7=BD=AE=E6=95=88=E6=9E=9C=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DesignForm/public/form/form.vue | 35 +++++++++++++++---- 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue index 8211580..9d9d8f1 100644 --- a/src/components/DesignForm/public/form/form.vue +++ b/src/components/DesignForm/public/form/form.vue @@ -836,7 +836,11 @@ function showOrHide(data: any) { props.formData.list[i].type == "radio" || props.formData.list[i].type == "select" ) { - radioSelectShowConfigArr.push(props.formData.list[i].control.glxxsz); + if(!props.formData.list[i].control.multiple){ + radioSelectShowConfigArr.push(props.formData.list[i].control.glxxsz); + }else{ + checkboxShowConfigArr.push(props.formData.list[i].control.glxxsz); + } } else if (props.formData.list[i].type == "checkbox") { checkboxShowConfigArr.push(props.formData.list[i].control.glxxszForCheckBox); } else if (props.formData.list[i].type == "switch") { @@ -853,7 +857,12 @@ function showOrHide(data: any) { for (let w = 0; w < a.length; w++) { if (a[w].type == "radio" || a[w].type == "select") { //console.log(a[w]) - radioSelectShowConfigArr.push(a[w].control.glxxsz); + if(!a[w].control.multiple){ + radioSelectShowConfigArr.push(a[w].control.glxxsz); + }else{ + checkboxShowConfigArr.push(a[w].control.glxxsz); + } + //radioSelectShowConfigArr.push(a[w].control.glxxsz); } else if (a[w].type == "checkbox") { checkboxShowConfigArr.push(a[w].control.glxxszForCheckBox); } else if (a[w].type == "switch") { @@ -869,7 +878,12 @@ function showOrHide(data: any) { for (let x = 0; x < columns[z].list.length; x++) { let a = JSON.parse(JSON.stringify(columns[z].list[x])); if (a.type == "radio" || a.type == "select") { - radioSelectShowConfigArr.push(a.control.glxxsz); + if(!a.control.multiple){ + radioSelectShowConfigArr.push(a.control.glxxsz); + }else{ + checkboxShowConfigArr.push(a.control.glxxsz); + } + //radioSelectShowConfigArr.push(a.control.glxxsz); } else if (a.type == "checkbox") { checkboxShowConfigArr.push(a.control.glxxszForCheckBox); } else if (a.type == "switch") { @@ -888,7 +902,12 @@ function showOrHide(data: any) { for (let x = 0; x < columns[z].list.length; x++) { let a = JSON.parse(JSON.stringify(columns[z].list[x])); if (a.type == "radio" || a.type == "select") { - radioSelectShowConfigArr.push(a.control.glxxsz); + if(!a.control.multiple){ + radioSelectShowConfigArr.push(a.control.glxxsz); + }else{ + checkboxShowConfigArr.push(a.control.glxxsz); + } + //radioSelectShowConfigArr.push(a.control.glxxsz); } else if (a.type == "checkbox") { checkboxShowConfigArr.push(a.control.glxxszForCheckBox); } else if (a.type == "switch") { @@ -897,9 +916,13 @@ function showOrHide(data: any) { if (a.list.length > 0) { for (let m = 0; m < a.list.length; m++) { let q = JSON.parse(JSON.stringify(a.list[m])); - //console.log(q) if (q.type == "radio" || q.type == "select") { - radioSelectShowConfigArr.push(q.control.glxxsz); + if(!q.control.multiple){ + radioSelectShowConfigArr.push(q.control.glxxsz); + }else{ + checkboxShowConfigArr.push(q.control.glxxsz); + } + //radioSelectShowConfigArr.push(q.control.glxxsz); } else if (q.type == "checkbox") { checkboxShowConfigArr.push(q.control.glxxszForCheckBox); } else if (q.type == "switch") {