From 854c4bd5012507483a49df7489a2ac756d71e0b7 Mon Sep 17 00:00:00 2001
From: jianneng-fit2cloud <jianneng.pan@fit2cloud.com>
Date: Wed, 30 Oct 2024 17:39:53 +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?=E8=AE=B0=E5=BD=95=E6=95=B0=E5=88=87=E6=8D=A2=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E5=80=BC=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../editor-style/components/MiscSelector.vue  | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 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 96856d226d..560d86bd43 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
@@ -111,9 +111,9 @@ const initField = () => {
 }
 
 const initDynamicDefaultField = () => {
-  if (state.quotaData.length > 0) {
+  const yAxisId = props.chart.yAxis?.[0]?.id
+  if (yAxisId !== '-1' && state.quotaData.length) {
     // 查找 quotaData 中是否存在 chart.yAxis[0].id
-    const yAxisId = props.chart.yAxis?.[0]?.id
     const yAxisExists = state.quotaData.find(ele => ele.id === yAxisId)
     // 如果不存在
     if (!yAxisExists && (state.miscForm.liquidMaxField.id || state.miscForm.gaugeMaxField.id)) {
@@ -190,9 +190,13 @@ const initDynamicDefaultField = () => {
 }
 
 const changeQuotaField = (type: string, resetSummary?: boolean) => {
+  let isCountField = props.chart.yAxis?.[0]?.id === '-1'
   if (type === 'min') {
     if (state.miscForm.gaugeMinType === 'dynamic') {
-      if (!state.miscForm.gaugeMinField.id) {
+      if (isCountField && state.quotaData.length) {
+        state.miscForm.gaugeMinField.id = state.quotaData[0]?.id
+      }
+      if (!state.miscForm.gaugeMinField.id && !isCountField) {
         state.miscForm.gaugeMinField.id = props.chart.yAxis?.[0]?.id
       }
       if (!state.miscForm.gaugeMinField.summary) {
@@ -216,12 +220,13 @@ const changeQuotaField = (type: string, resetSummary?: boolean) => {
     }
   } else if (type === 'max') {
     if (props.chart.type === 'liquid') {
+      if (isCountField && state.quotaData.length) {
+        state.miscForm.liquidMaxField.id = state.quotaData[0]?.id
+      }
       if (state.miscForm.liquidMaxType === 'dynamic') {
         state.miscForm.liquidMax = undefined
-      } else {
-        if (!state.miscForm.liquidMax) {
-          state.miscForm.liquidMax = cloneDeep(defaultMaxValue.liquidMax)
-        }
+      } else if (!state.miscForm.liquidMax) {
+        state.miscForm.liquidMax = cloneDeep(defaultMaxValue.liquidMax)
       }
       if (!state.miscForm.liquidMaxField.id) {
         state.miscForm.liquidMaxField.id = props.chart.yAxis?.[0]?.id
@@ -238,8 +243,11 @@ const changeQuotaField = (type: string, resetSummary?: boolean) => {
       }
     } else {
       if (state.miscForm.gaugeMaxType === 'dynamic') {
+        if (isCountField && state.quotaData.length) {
+          state.miscForm.gaugeMaxField.id = state.quotaData[0]?.id
+        }
         state.miscForm.gaugeMax = undefined
-        if (!state.miscForm.gaugeMaxField.id) {
+        if (!state.miscForm.gaugeMaxField.id && !isCountField) {
           state.miscForm.gaugeMaxField.id = props.chart.yAxis?.[0]?.id
         }
         if (!state.miscForm.gaugeMaxField.summary) {