From 126df0f39b95ff107938c401f02ed6255c24c8b1 Mon Sep 17 00:00:00 2001
From: jianneng-fit2cloud <jianneng.pan@fit2cloud.com>
Date: Mon, 4 Nov 2024 19:48:48 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=B0=B4=E6=B3=A2=E5=9B=BE=E3=80=81=E4=BB=AA=E8=A1=A8=E7=9B=98?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9D=9E=E6=95=B0=E5=80=BC=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E5=9B=BE=E8=A1=A8=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../editor-style/components/MiscSelector.vue  | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/MiscSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/MiscSelector.vue
index 7d80ad3f03..b387ab0d4c 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/MiscSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/MiscSelector.vue
@@ -110,7 +110,10 @@ const initField = () => {
   }
   initDynamicDefaultField()
 }
-
+const COUNT_DE_TYPE = [0, 1, 5]
+const getFieldSummaryByDeType = (deType: number) => {
+  return COUNT_DE_TYPE.includes(deType) || !deType ? 'count' : 'sum'
+}
 const initDynamicDefaultField = () => {
   const yAxisId = props.chart.yAxis?.[0]?.id
   if (yAxisId !== '-1' && state.quotaData.length) {
@@ -146,9 +149,11 @@ const initDynamicDefaultField = () => {
               state.liquidProcessedNoYAxis = false
               // 根据查找结果设置 liquidMaxField.id
               state.miscForm.liquidMaxField.id = yAxisExists ? yAxisId : state.quotaData[0]?.id
+              state.liquidMaxField = getQuotaField(state.miscForm.liquidMaxField.id)
               // 设置 summary 和 maxField
-              state.miscForm.liquidMaxField.summary = 'sum'
-              state.maxField = getQuotaField(state.miscForm.liquidMaxField.id)
+              state.miscForm.liquidMaxField.summary = getFieldSummaryByDeType(
+                state.liquidMaxField?.deType
+              )
               // 触发 changeMisc 事件
               if (yAxisExists) {
                 changeMisc('liquidMaxField', true)
@@ -172,9 +177,9 @@ const initDynamicDefaultField = () => {
               state.gaugeProcessedNoYAxis = false
               // 根据查找结果设置 gaugeMaxField.id
               state.miscForm.gaugeMaxField.id = yAxisExists ? yAxisId : state.quotaData[0]?.id
-              // 设置 summary 和 maxField
-              state.miscForm.gaugeMaxField.summary = 'sum'
               state.maxField = getQuotaField(state.miscForm.gaugeMaxField.id)
+              // 设置 summary 和 maxField
+              state.miscForm.gaugeMaxField.summary = getFieldSummaryByDeType(state.maxField?.deType)
               if (yAxisExists) {
                 // 触发 changeMisc 事件
                 changeMisc('gaugeMaxField', true)
@@ -233,13 +238,13 @@ const changeQuotaField = (type: string, resetSummary?: boolean) => {
         state.miscForm.liquidMaxField.id = props.chart.yAxis?.[0]?.id
       }
       if (!state.miscForm.liquidMaxField.summary) {
-        state.miscForm.liquidMaxField.summary = 'sum'
+        state.miscForm.liquidMaxField.summary = 'count'
       }
       if (resetSummary) {
-        state.miscForm.liquidMaxField.summary = 'sum'
+        state.miscForm.liquidMaxField.summary = 'count'
       }
       if (state.miscForm.liquidMaxField.id && state.miscForm.liquidMaxField.summary) {
-        state.maxField = getQuotaField(state.miscForm.liquidMaxField.id)
+        state.liquidMaxField = getQuotaField(state.miscForm.liquidMaxField.id)
         changeMisc('liquidMaxField', true)
       }
     } else {
@@ -252,10 +257,10 @@ const changeQuotaField = (type: string, resetSummary?: boolean) => {
           state.miscForm.gaugeMaxField.id = props.chart.yAxis?.[0]?.id
         }
         if (!state.miscForm.gaugeMaxField.summary) {
-          state.miscForm.gaugeMaxField.summary = 'sum'
+          state.miscForm.gaugeMaxField.summary = 'count'
         }
         if (resetSummary) {
-          state.miscForm.gaugeMaxField.summary = 'sum'
+          state.miscForm.gaugeMaxField.summary = 'count'
         }
         if (state.miscForm.gaugeMaxField.id && state.miscForm.gaugeMaxField.summary) {
           state.maxField = getQuotaField(state.miscForm.gaugeMaxField.id)
@@ -344,6 +349,12 @@ const addAxis = (form: AxisEditForm) => {
   } else {
     state.miscForm[maxTypeKey] = 'dynamic'
   }
+  if (props.chart.type === 'gauge') {
+    state.miscForm.gaugeMinType = 'fix'
+    state.miscForm.gaugeMin = 0
+    state.miscForm.gaugeMinField.id = ''
+    state.miscForm.gaugeMinField.summary = ''
+  }
 }
 onMounted(() => {
   initField()