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 5374899e90..efcdd0bf0d 100644 --- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue +++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue @@ -415,7 +415,16 @@ const timeParameterList = computed(() => { const [year, y] = curComponent.value.parameters?.filter( ele => ele.deType === 1 && !!ele.variableName )[0].type - return timeList.filter(ele => ele.value === (typeTimeMap[y] || typeTimeMap[year])) + let stopPush = false + return timeList.reduce((pre, ele) => { + if (ele.value === (typeTimeMap[y] || typeTimeMap[year])) { + stopPush = true + pre.push(ele) + } else if (!stopPush) { + pre.push(ele) + } + return pre + }, []) }) const cancelClick = () => { @@ -1431,6 +1440,11 @@ const addQueryCriteria = () => { conditions.value.push(addQueryCriteriaConfig()) } +const addQueryCriteriaAndSelect = () => { + addQueryCriteria() + handleCondition(conditions.value[conditions.value.length - 1]) +} + const addCriteriaConfig = () => { addQueryCriteria() return conditions.value[conditions.value.length - 1].id @@ -1458,7 +1472,7 @@ defineExpose({
查询条件 - +
diff --git a/core/core-frontend/src/views/chart/components/editor/index.vue b/core/core-frontend/src/views/chart/components/editor/index.vue index a2ccde6641..93beb437c6 100644 --- a/core/core-frontend/src/views/chart/components/editor/index.vue +++ b/core/core-frontend/src/views/chart/components/editor/index.vue @@ -1,4 +1,5 @@