From c198fcf3cf5d2c87541e1319d73822f9573bfb7a Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Fri, 7 Mar 2025 18:55:59 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=9B=BE=E8=A1=A8):=20=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=9D=A1=E7=9A=84=E7=BA=B5=E8=BD=B4=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/panel/charts/bar/progress-bar.ts       | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/progress-bar.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/progress-bar.ts
index 7531722e60..0819082539 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/progress-bar.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/progress-bar.ts
@@ -66,7 +66,7 @@ export class ProgressBar extends G2PlotChartView<BarOptions, G2Progress> {
       'fontSize',
       'axisForm',
       'axisLabel',
-      'position',
+      // 'position',
       'showLengthLimit'
     ],
     'function-cfg': ['emptyDataStrategy'],
@@ -297,12 +297,31 @@ export class ProgressBar extends G2PlotChartView<BarOptions, G2Progress> {
     if (!baseOption.yAxis) {
       return baseOption
     }
-    if (baseOption.yAxis.position === 'left') {
+    baseOption.yAxis.position = 'bottom'
+    const yAxis = parseJson(chart.customStyle).yAxis
+    if (yAxis.axisLabel.show) {
+      const rotate = yAxis.axisLabel.rotate
+      let textAlign = 'end'
+      let textBaseline = 'middle'
+      if (Math.abs(rotate) > 75) {
+        textAlign = 'center'
+      }
+      if (rotate > 75) {
+        textBaseline = 'top'
+      }
+      if (rotate < -75) {
+        textBaseline = 'bottom'
+      }
+      baseOption.yAxis.label.style.textBaseline = textBaseline
+      baseOption.yAxis.label.style.textAlign = textAlign
+    }
+
+    /*if (baseOption.yAxis.position === 'left') {
       baseOption.yAxis.position = 'bottom'
     }
     if (baseOption.yAxis.position === 'right') {
       baseOption.yAxis.position = 'top'
-    }
+    }*/
     return baseOption
   }
   setupDefaultOptions(chart: ChartObj): ChartObj {