From 2fddf2965475fff5d52a83b85470cb09c1b85e34 Mon Sep 17 00:00:00 2001 From: dataeaseShu Date: Wed, 26 Jun 2024 15:04:00 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6):=20?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v-query/QueryConditionConfiguration.vue | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) 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 6c61f8942b..9d1ba30e8e 100644 --- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue +++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue @@ -936,10 +936,13 @@ const getOptions = (id, component) => { const treeDialog = ref() const startTreeDesign = () => { + const [comId] = curComponent.value.checkedFields + const componentObj = fields.value.find(ele => ele.componentId === comId) treeDialog.value.init( - curComponent.value.dataset?.fields.filter( - ele => ele.deType === +curComponent.value.field.deType - ), + (curComponent.value.optionValueSource === 0 + ? componentObj?.fields?.dimensionList + : curComponent.value.dataset?.fields + ).filter(ele => ele.deType === +curComponent.value.field.deType), curComponent.value.treeFieldList ) } @@ -977,16 +980,6 @@ const handleDialogClick = () => { defaultConfigurationRef.value?.handleDialogClick() } -const operators = [ - { - label: '精确匹配', - value: 'eq' - }, - { - label: '模糊匹配', - value: 'like' - } -] const relativeToCurrentList = computed(() => { let list = [] if (!curComponent.value) return list