From 294760e8c3675081e0d4fb948fbfd5333839619d Mon Sep 17 00:00:00 2001 From: dataeaseShu Date: Tue, 16 Jul 2024 10:51:55 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6):=20v2?= =?UTF-8?q?.8=20=E6=96=87=E6=9C=AC=E6=90=9C=E7=B4=A2=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E8=AE=BE=E7=BD=AE=E9=BB=98=E8=AE=A4=E5=80=BC=E5=90=8C?= =?UTF-8?q?=E6=97=B6=E8=AE=BE=E7=BD=AE=E5=BF=85=E5=A1=AB=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E8=AF=86=E5=88=AB=E9=BB=98=E8=AE=A4=E5=80=BC=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E6=97=A0=E9=80=89=E9=A1=B9=E5=80=BC=20#10853?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/custom-component/v-query/Component.vue | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/core/core-frontend/src/custom-component/v-query/Component.vue b/core/core-frontend/src/custom-component/v-query/Component.vue index 36fbdfa107..a036a0bfef 100644 --- a/core/core-frontend/src/custom-component/v-query/Component.vue +++ b/core/core-frontend/src/custom-component/v-query/Component.vue @@ -423,7 +423,17 @@ const queryData = () => { requiredName = next.name } - if ( + if (next.displayType === '8') { + const { conditionValueF, conditionValueS, conditionType } = next + if (conditionType === 0) { + requiredName = conditionValueF === '' ? next.name : '' + } else { + requiredName = [conditionValueF || '', conditionValueS || ''].filter(ele => ele !== '') + .length + ? next.name + : '' + } + } else if ( (Array.isArray(next.selectValue) && !next.selectValue.length) || (next.selectValue !== 0 && !next.selectValue) ) {