From af646a28617df49b12891853227958dd5397534c Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Tue, 18 Oct 2022 15:48:06 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E4=BF=AE=E5=A4=8Dec?=
 =?UTF-8?q?harts=E8=BD=B4=E5=80=BC=E6=A0=BC=E5=BC=8F=E5=8C=96=E9=94=99?=
 =?UTF-8?q?=E4=B9=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/chart/chart/common/common.js    | 57 ++++++++++---------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/frontend/src/views/chart/chart/common/common.js b/frontend/src/views/chart/chart/common/common.js
index f587aa76e2..1cfd5e5ce0 100644
--- a/frontend/src/views/chart/chart/common/common.js
+++ b/frontend/src/views/chart/chart/common/common.js
@@ -2,11 +2,34 @@ import { hexColorToRGBA } from '@/views/chart/chart/util'
 import { DEFAULT_XAXIS_STYLE, DEFAULT_YAXIS_EXT_STYLE, DEFAULT_YAXIS_STYLE } from '@/views/chart/chart/chart'
 import { formatterItem, valueFormatter } from '@/views/chart/chart/formatter'
 
-let xAxisLabelFormatter = null
-let yAxisLabelFormatter = null
-let yExtAxisLabelFormatter = null
-
 export function componentStyle(chart_option, chart) {
+  let xAxisLabelFormatter = null
+  let yAxisLabelFormatter = null
+  let yExtAxisLabelFormatter = null
+  const xFormatter = function(value) {
+    if (!xAxisLabelFormatter) {
+      return valueFormatter(value, formatterItem)
+    } else {
+      return valueFormatter(value, xAxisLabelFormatter)
+    }
+  }
+
+  const yFormatter = function(value) {
+    if (!yAxisLabelFormatter) {
+      return valueFormatter(value, formatterItem)
+    } else {
+      return valueFormatter(value, yAxisLabelFormatter)
+    }
+  }
+
+  const yExtFormatter = function(value) {
+    if (!yExtAxisLabelFormatter) {
+      return valueFormatter(value, formatterItem)
+    } else {
+      return valueFormatter(value, yExtAxisLabelFormatter)
+    }
+  }
+
   const padding = '8px'
   if (chart.customStyle) {
     const customStyle = JSON.parse(chart.customStyle)
@@ -224,6 +247,7 @@ export function componentStyle(chart_option, chart) {
     }
   }
 }
+
 export const getMarginUnit = marginForm => {
   if (!marginForm.marginModel || marginForm.marginModel === 'auto') return null
   if (marginForm.marginModel === 'absolute') return 'px'
@@ -241,6 +265,7 @@ const hexToRgba = (hex, opacity) => {
   }
   return rgbaColor
 }
+
 export function seniorCfg(chart_option, chart) {
   if (chart.senior && chart.type && (chart.type.includes('bar') || chart.type.includes('line') || chart.type.includes('mix'))) {
     const senior = JSON.parse(chart.senior)
@@ -366,30 +391,6 @@ export function seniorCfg(chart_option, chart) {
   }
 }
 
-const xFormatter = function(value) {
-  if (!xAxisLabelFormatter) {
-    return valueFormatter(value, formatterItem)
-  } else {
-    return valueFormatter(value, xAxisLabelFormatter)
-  }
-}
-
-const yFormatter = function(value) {
-  if (!yAxisLabelFormatter) {
-    return valueFormatter(value, formatterItem)
-  } else {
-    return valueFormatter(value, yAxisLabelFormatter)
-  }
-}
-
-const yExtFormatter = function(value) {
-  if (!yExtAxisLabelFormatter) {
-    return valueFormatter(value, formatterItem)
-  } else {
-    return valueFormatter(value, yExtAxisLabelFormatter)
-  }
-}
-
 export const reverseColor = colorValue => {
   colorValue = '0x' + colorValue.replace(/#/g, '')
   const str = '000000' + (0xFFFFFF - colorValue).toString(16)