From 943e21d89f9d0deea420e6400e3e1c42e988b87a Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 27 May 2024 10:10:40 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=BB=84=E4=BB=B6=E9=80=89=E6=8B=A9=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E5=90=8E=E4=BE=9D=E7=84=B6=E5=8F=AF=E4=BB=A5=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/api/dataset.ts                     | 3 +++
 .../v-query/QueryConditionConfiguration.vue               | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

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<Field>
     quotaList: Array<Field>
+    parameterList?: Array<Field>
   }
+  activelist?: string
+  hasParameter?: boolean
   checkList: string[]
   list: Array<Field>
 }
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<DatasetDetail[]>()
-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"
                 >
-                  <el-radio :label="0">{{ t('chart.margin_model_auto') }}</el-radio>
+                  <el-radio :disabled="!!curComponent.parameters.length" :label="0">{{
+                    t('chart.margin_model_auto')
+                  }}</el-radio>
                   <el-radio :label="1">{{ t('chart.select_dataset') }}</el-radio>
                   <el-radio :label="2">手动输入</el-radio>
                 </el-radio-group>