From 0c76704b3ab3a98569b1b2aed105bdf58deca377 Mon Sep 17 00:00:00 2001 From: dataeaseShu Date: Fri, 28 Jun 2024 15:13:25 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6):=20?= =?UTF-8?q?=E5=85=B6=E4=B8=AD=E4=B8=80=E4=B8=AA=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E9=80=89=E9=A1=B9=E7=B1=BB=E5=9E=8B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=A4=9A=E9=80=89=E6=97=B6=EF=BC=8C=E5=85=B6?= =?UTF-8?q?=E4=BD=99=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E7=9A=84=E9=80=89?= =?UTF-8?q?=E9=A1=B9=E7=B1=BB=E5=9E=8B=E4=B9=9F=E6=98=BE=E7=A4=BA=E4=B8=BA?= =?UTF-8?q?=E5=A4=9A=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v-query/ConditionDefaultConfiguration.vue | 7 ++++++- .../v-query/QueryConditionConfiguration.vue | 10 +++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/core/core-frontend/src/custom-component/v-query/ConditionDefaultConfiguration.vue b/core/core-frontend/src/custom-component/v-query/ConditionDefaultConfiguration.vue index 968cd1231c..eb3a3851aa 100644 --- a/core/core-frontend/src/custom-component/v-query/ConditionDefaultConfiguration.vue +++ b/core/core-frontend/src/custom-component/v-query/ConditionDefaultConfiguration.vue @@ -208,9 +208,14 @@ const multipleChange = (val: boolean, isMultipleChange = false) => { curComponent.value.multiple = val } +const changeMultiple = val => { + multiple.value = val +} + defineExpose({ multipleChange, - handleDialogClick + handleDialogClick, + changeMultiple }) diff --git a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue index addc5cf23f..336989f00f 100644 --- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue +++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue @@ -378,11 +378,6 @@ const multipleChange = (val: boolean, isMultipleChange = false) => { : defaultValue } - if (curComponent.value.field.deType === 1) { - curComponent.value.multiple = val - return - } - curComponent.value.multiple = val } @@ -886,8 +881,9 @@ const handleCondition = item => { activeCondition.value = item.id curComponent.value = conditions.value.find(ele => ele.id === item.id) curComponent.value.dataset.fields = [] - - multiple.value = curComponent.value.multiple + nextTick(() => { + defaultConfigurationRef.value.changeMultiple(curComponent.value.multiple) + }) if (curComponent.value.dataset.id) { listFieldsWithPermissions(curComponent.value.dataset.id).then(res => { curComponent.value.dataset.fields = res.data