From aa7adafaea09bb30f09f09d44fb971e5f231fe7e Mon Sep 17 00:00:00 2001
From: jianneng-fit2cloud <jianneng.pan@fit2cloud.com>
Date: Wed, 29 May 2024 19:26:57 +0800
Subject: [PATCH] =?UTF-8?q?style(=E5=9B=BE=E8=A1=A8-=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=E6=9D=A1):=20=E4=BC=98=E5=8C=96=E8=BF=9B=E5=BA=A6=E6=9D=A1?=
 =?UTF-8?q?=E6=B8=90=E5=8F=98=E8=89=B2=E6=A0=B7=E5=BC=8F=E5=8F=8A=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E7=BA=B5=E8=BD=B4=E9=85=8D=E7=BD=AE=E4=B8=AD=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=E7=9A=84=E5=88=86=E5=89=B2=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../editor/editor-style/components/YAxisSelector.vue | 12 ++++++++++--
 .../components/js/panel/charts/bar/progress-bar.ts   |  9 ++++++---
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/YAxisSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/YAxisSelector.vue
index 2cedb4a638..8869e05f89 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/YAxisSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/YAxisSelector.vue
@@ -255,7 +255,11 @@ onMounted(() => {
         </el-form-item>
       </template>
     </template>
-    <el-divider class="m-divider" :class="'m-divider--' + themes" />
+    <el-divider
+      v-if="showProperty('splitLine') || showProperty('axisLine')"
+      class="m-divider"
+      :class="'m-divider--' + themes"
+    />
     <el-form-item class="form-item" :class="'form-item-' + themes" v-if="showProperty('axisLine')">
       <el-checkbox
         size="small"
@@ -325,7 +329,11 @@ onMounted(() => {
         </el-select>
       </el-form-item>
     </div>
-    <el-divider class="m-divider" :class="'m-divider--' + themes" />
+    <el-divider
+      v-if="showProperty('axisLabel')"
+      class="m-divider"
+      :class="'m-divider--' + themes"
+    />
     <el-form-item
       class="form-item form-item-checkbox"
       :class="{
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 7039f4d1d9..e7b61e6ba4 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
@@ -62,7 +62,8 @@ export class ProgressBar extends G2PlotChartView<BarOptions, G2Progress> {
     isGroup: false,
     isPercent: true,
     isStack: true,
-    xAxis: false
+    xAxis: false,
+    appendPadding: [0, 0, 10, 0]
   }
 
   drawChart(drawOptions: G2PlotDrawOptions<G2Progress>): G2Progress {
@@ -98,13 +99,15 @@ export class ProgressBar extends G2PlotChartView<BarOptions, G2Progress> {
     const data1 = defaultTo(sourceData[0]?.data, [])
     const data2 = defaultTo(sourceData[1]?.data, [])
     const currentData = data2.map(item => {
+      const progress = getCompletionRate(data1.find(i => i.field === item.field)?.value, item.value)
       return {
         ...item,
         type: 'current',
         title: item.field,
         id: item.quotaList[0].id,
         originalValue: item.value,
-        progress: getCompletionRate(data1.find(i => i.field === item.field)?.value, item.value)
+        originalProgress: progress,
+        progress: progress >= 100 ? 100 : progress
       }
     })
     const targetData = data1.map(item => {
@@ -223,7 +226,7 @@ export class ProgressBar extends G2PlotChartView<BarOptions, G2Progress> {
         if (item.type === 'target') {
           return ''
         }
-        return (item.progress * 100).toFixed(2) + '%'
+        return item.originalProgress.toFixed(2) + '%'
       }
     }
     if (label.position === 'top') {