diff --git a/core/core-frontend/src/api/dataset.ts b/core/core-frontend/src/api/dataset.ts index b491de7f14..60fc666079 100644 --- a/core/core-frontend/src/api/dataset.ts +++ b/core/core-frontend/src/api/dataset.ts @@ -36,7 +36,10 @@ export interface DatasetDetail { fields: { dimensionList: Array quotaList: Array + parameterList?: Array } + activelist?: string + hasParameter?: boolean checkList: string[] list: Array } 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 b6eef02194..d7f8c1392b 100644 --- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue +++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue @@ -107,7 +107,6 @@ const activeCondition = ref('') const isIndeterminate = ref(false) const datasetTree = shallowRef([]) const fields = ref() -const parameters = ref([]) const { queryElement } = toRefs(props) @@ -191,6 +190,9 @@ const setParameters = () => { if (!!curComponent.value.parameters.length) { curComponent.value.conditionType = 0 + if (curComponent.value.optionValueSource === 0) { + curComponent.value.optionValueSource = 1 + } } }) setType() @@ -1386,7 +1388,9 @@ defineExpose({ @change="handleValueSourceChange" v-model="curComponent.optionValueSource" > - {{ t('chart.margin_model_auto') }} + {{ + t('chart.margin_model_auto') + }} {{ t('chart.select_dataset') }} 手动输入