From 73cb6b3f46cdfedab37bfa49d27511524fcc2079 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Mon, 1 Aug 2022 17:32:48 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E7=80=91=E5=B8=83?=
 =?UTF-8?q?=E5=9B=BE=E7=A7=BB=E9=99=A4=E8=BD=B4=E5=80=BC=E6=95=B0=E5=80=BC?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E5=8A=9F=E8=83=BD=EF=BC=8C=E9=98=B2?=
 =?UTF-8?q?=E6=AD=A2=E4=B8=8E=E6=8C=87=E6=A0=87=E6=95=B0=E5=80=BC=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E5=8C=96=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/chart/chart/common/common_antv.js    | 18 +++++++++++-------
 .../component-style/YAxisExtSelectorAntV.vue   |  2 +-
 .../component-style/YAxisSelectorAntV.vue      |  4 ++--
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/frontend/src/views/chart/chart/common/common_antv.js b/frontend/src/views/chart/chart/common/common_antv.js
index 69a69be62d..e4635f9735 100644
--- a/frontend/src/views/chart/chart/common/common_antv.js
+++ b/frontend/src/views/chart/chart/common/common_antv.js
@@ -430,14 +430,18 @@ export function getYAxis(chart) {
             fontSize: parseInt(a.axisLabel.fontSize)
           },
           formatter: function(value) {
-            if (!chart.type.includes('horizontal')) {
-              if (!a.axisLabelFormatter) {
-                return valueFormatter(value, formatterItem)
-              } else {
-                return valueFormatter(value, a.axisLabelFormatter)
-              }
-            } else {
+            if (chart.type === 'waterfall') {
               return value
+            } else {
+              if (!chart.type.includes('horizontal')) {
+                if (!a.axisLabelFormatter) {
+                  return valueFormatter(value, formatterItem)
+                } else {
+                  return valueFormatter(value, a.axisLabelFormatter)
+                }
+              } else {
+                return value
+              }
             }
           }
         } : null
diff --git a/frontend/src/views/chart/components/component-style/YAxisExtSelectorAntV.vue b/frontend/src/views/chart/components/component-style/YAxisExtSelectorAntV.vue
index 6ef6a3c605..b02a5f86a1 100644
--- a/frontend/src/views/chart/components/component-style/YAxisExtSelectorAntV.vue
+++ b/frontend/src/views/chart/components/component-style/YAxisExtSelectorAntV.vue
@@ -93,7 +93,7 @@
               </el-select>
             </el-form-item>
 
-            <span v-show="chart.type && !chart.type.includes('horizontal')">
+            <span v-show="chart.type && !chart.type.includes('horizontal') && chart.type !== 'waterfall'">
               <el-form-item :label="$t('chart.value_formatter_type')" class="form-item">
                 <el-select v-model="axisForm.axisLabelFormatter.type" @change="changeYAxisStyle('axisLabelFormatter')">
                   <el-option v-for="type in typeList" :key="type.value" :label="$t('chart.' + type.name)" :value="type.value" />
diff --git a/frontend/src/views/chart/components/component-style/YAxisSelectorAntV.vue b/frontend/src/views/chart/components/component-style/YAxisSelectorAntV.vue
index 9c1e2d9e64..74d3334b0b 100644
--- a/frontend/src/views/chart/components/component-style/YAxisSelectorAntV.vue
+++ b/frontend/src/views/chart/components/component-style/YAxisSelectorAntV.vue
@@ -64,7 +64,7 @@
               </el-form-item>
             </span>
           </span>
-          <el-divider v-if="showProperty('splitLine')"  />
+          <el-divider v-if="showProperty('splitLine')" />
           <el-form-item v-show="showProperty('splitLine')" :label="$t('chart.axis_show')" class="form-item">
             <el-checkbox v-model="axisForm.splitLine.show" @change="changeYAxisStyle('splitLine')">{{ $t('chart.axis_show') }}</el-checkbox>
           </el-form-item>
@@ -93,7 +93,7 @@
               </el-select>
             </el-form-item>
 
-            <span v-show="chart.type && !chart.type.includes('horizontal')">
+            <span v-show="chart.type && !chart.type.includes('horizontal') && chart.type !== 'waterfall'">
               <el-form-item :label="$t('chart.value_formatter_type')" class="form-item">
                 <el-select v-model="axisForm.axisLabelFormatter.type" @change="changeYAxisStyle('axisLabelFormatter')">
                   <el-option v-for="type in typeList" :key="type.value" :label="$t('chart.' + type.name)" :value="type.value" />