From 34842dab9a90e72af4d907bc407e13af4e6a7e5c Mon Sep 17 00:00:00 2001 From: dataeaseShu Date: Fri, 8 Nov 2024 10:47:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E5=90=8C=E4=B8=80=E4=B8=AA=E4=BB=AA=E8=A1=A8=E6=9D=BF=E4=B8=AD?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E4=B8=A4=E4=B8=AA=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E7=9A=84=E5=8F=82=E6=95=B0=E6=9F=A5=E8=AF=A2=E4=BC=9A=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/custom-component/v-query/QueryConditionConfiguration.vue | 1 + 1 file changed, 1 insertion(+) 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 971c5ecd88..a271d512d3 100644 --- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue +++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue @@ -684,6 +684,7 @@ const setParameters = field => { Object.values(field?.fields || {}) .flat() .filter(ele => fieldArr.includes(ele.id) && !!ele.variableName) + .concat(curComponent.value.parameters) ) nextTick(() => { if (isTimeParameter.value) { From e7ef9b4c77088d16b9b0fb743aeddf4c6833deca Mon Sep 17 00:00:00 2001 From: dataeaseShu Date: Fri, 8 Nov 2024 11:32:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E5=90=8C=E4=B8=80=E4=B8=AA=E4=BB=AA=E8=A1=A8=E6=9D=BF=E4=B8=AD?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E4=B8=A4=E4=B8=AA=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E7=9A=84=E5=8F=82=E6=95=B0=E6=9F=A5=E8=AF=A2=E4=BC=9A=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v-query/QueryConditionConfiguration.vue | 7 +++---- 1 file changed, 3 insertions(+), 4 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 a271d512d3..b1c4c22d5a 100644 --- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue +++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue @@ -684,14 +684,13 @@ const setParameters = field => { Object.values(field?.fields || {}) .flat() .filter(ele => fieldArr.includes(ele.id) && !!ele.variableName) - .concat(curComponent.value.parameters) + .concat(curComponent.value.parameters.filter(ele => fieldArr.includes(ele.id))) ) nextTick(() => { if (isTimeParameter.value) { + const timeParameter = curComponent.value.parameters.find(ele => ele.deType === 1) curComponent.value.timeGranularity = - typeTimeMap[ - curComponent.value.parameters[0].type[1] || curComponent.value.parameters[0].type[0] - ] + typeTimeMap[timeParameter.type[1] || timeParameter.type[0]] curComponent.value.displayType = '1' }