From 017af37bfe493aa281fddb9c80ba0de27c4abc12 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Fri, 27 Oct 2023 11:02:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8A=E4=B8=80=E4=B8=AA=E8=A7=84=E5=88=99=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=8C=96=E5=86=8D=E6=AC=A1=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E6=97=B6=E5=8F=82=E6=95=B0=E5=8C=96=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=E8=87=AA=E5=8A=A8=E5=BC=80=E5=90=AF=E4=BD=86=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=BC=B9=E7=AA=97=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/custom-component/v-query/Component.vue         | 10 ++++------
 .../v-query/QueryConditionConfiguration.vue            |  1 -
 .../editor/drag-item/components/CompareEdit.vue        |  2 +-
 .../editor/drag-item/components/ValueFormatterEdit.vue |  2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/core/core-frontend/src/custom-component/v-query/Component.vue b/core/core-frontend/src/custom-component/v-query/Component.vue
index c23d31ec03..c2300710d7 100644
--- a/core/core-frontend/src/custom-component/v-query/Component.vue
+++ b/core/core-frontend/src/custom-component/v-query/Component.vue
@@ -192,7 +192,7 @@ const dragover = () => {
 
 const infoFormat = (obj: ComponentInfo) => {
   const { id, name, deType, type, datasetId } = obj
-  const base = {
+  return {
     id: guid(),
     name,
     showError: true,
@@ -205,7 +205,6 @@ const infoFormat = (obj: ComponentInfo) => {
       deType
     },
     auto: false,
-    operator: deType === 1 ? 'between' : 'eq',
     defaultValue: undefined,
     selectValue: undefined,
     optionValueSource: 0,
@@ -220,12 +219,11 @@ const infoFormat = (obj: ComponentInfo) => {
     multiple: false,
     displayType: '0',
     checkedFields: [],
+    parameters: [],
+    parametersCheck: false,
+    parametersList: [],
     checkedFieldsMap: {}
   }
-  if (deType === 1) {
-    return base
-  }
-  return { ...base, parameters: [], parametersCheck: false, parametersList: [] }
 }
 
 const drop = e => {
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 e5150602bc..fd63850655 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -245,7 +245,6 @@ const multipleChange = (val: boolean, isMultipleChange = false) => {
     return
   }
   curComponent.value.multiple = val
-  curComponent.value.operator = val ? 'in' : 'eq'
 }
 
 const validate = () => {
diff --git a/core/core-frontend/src/views/chart/components/editor/drag-item/components/CompareEdit.vue b/core/core-frontend/src/views/chart/components/editor/drag-item/components/CompareEdit.vue
index ea8dc77bd6..f56b7e9911 100644
--- a/core/core-frontend/src/views/chart/components/editor/drag-item/components/CompareEdit.vue
+++ b/core/core-frontend/src/views/chart/components/editor/drag-item/components/CompareEdit.vue
@@ -1,6 +1,6 @@
 <script lang="tsx" setup>
 import { useI18n } from '@/hooks/web/useI18n'
-import { defineProps, reactive, toRefs, watch } from 'vue'
+import { reactive, toRefs, watch } from 'vue'
 import {
   compareYearList,
   compareMonthList,
diff --git a/core/core-frontend/src/views/chart/components/editor/drag-item/components/ValueFormatterEdit.vue b/core/core-frontend/src/views/chart/components/editor/drag-item/components/ValueFormatterEdit.vue
index 4eb2823f74..b4d1166290 100644
--- a/core/core-frontend/src/views/chart/components/editor/drag-item/components/ValueFormatterEdit.vue
+++ b/core/core-frontend/src/views/chart/components/editor/drag-item/components/ValueFormatterEdit.vue
@@ -1,6 +1,6 @@
 <script lang="tsx" setup>
 import { useI18n } from '@/hooks/web/useI18n'
-import { defineProps, reactive, toRefs } from 'vue'
+import { reactive, toRefs } from 'vue'
 import { formatterType, unitType, valueFormatter } from '@/views/chart/components/js/formatter'
 
 const { t } = useI18n()