From 1911ebba5145bfff6ad86d95152f7473a2dde50d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com>
Date: Tue, 1 Mar 2022 20:33:30 +0800
Subject: [PATCH] =?UTF-8?q?CHART-23035=20=E4=BB=AA=E8=A1=A8=E7=9B=98?=
 =?UTF-8?q?=E8=BD=B4=E6=A0=87=E7=AD=BE=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=9D=87=E4=B8=8D=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../designer/style/axis/VanChartBaseAxisPane.java  |  4 ++--
 .../axis/gauge/VanChartGaugeDetailAxisPane.java    | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java
index a6f667100..29bbf6a9b 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java
@@ -569,7 +569,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
     }
 
     //标签
-    private void populateLabel(VanChartAxis axis) {
+    protected void populateLabel(VanChartAxis axis) {
         if (showLabel != null) {
             showLabel.setSelectedIndex(axis.isShowAxisLabel() ? 0 : 1);
         }
@@ -813,7 +813,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
     }
 
     //标签
-    private void updateLabel(VanChartAxis axis) {
+    protected void updateLabel(VanChartAxis axis) {
         if (showLabel != null) {
             axis.setShowAxisLabel(showLabel.getSelectedIndex() == 0);
         }
diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/gauge/VanChartGaugeDetailAxisPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/gauge/VanChartGaugeDetailAxisPane.java
index aa2c2a3fd..8a13e188d 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/gauge/VanChartGaugeDetailAxisPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/gauge/VanChartGaugeDetailAxisPane.java
@@ -186,25 +186,35 @@ public class VanChartGaugeDetailAxisPane extends VanChartValueAxisPane {
     public void populateBean(VanChartAxis axis) {
         VanChartGaugeAxis gaugeAxis = (VanChartGaugeAxis) axis;
         labelTextAttrPane.populate(axis.getTextAttr());
+        super.populateBean(gaugeAxis);
+    }
+
+    @Override
+    protected void populateLabel(VanChartAxis axis) {
+        VanChartGaugeAxis gaugeAxis = (VanChartGaugeAxis) axis;
         if (mainTickColor != null) {
             mainTickColor.setSelectObject(gaugeAxis.getMainTickColor());
         }
         if (secTickColor != null) {
             secTickColor.setSelectObject(gaugeAxis.getSecTickColor());
         }
-        super.populateBean(gaugeAxis);
     }
 
     public void updateBean(VanChartAxis axis) {
         VanChartGaugeAxis gaugeAxis = (VanChartGaugeAxis) axis;
         TextAttr textAttr = axis.getTextAttr();
         labelTextAttrPane.update(textAttr);
+        super.updateBean(gaugeAxis);
+    }
+
+    @Override
+    protected void updateLabel(VanChartAxis axis) {
+        VanChartGaugeAxis gaugeAxis = (VanChartGaugeAxis) axis;
         if (mainTickColor != null) {
             gaugeAxis.setMainTickColor(mainTickColor.getSelectObject());
         }
         if (secTickColor != null) {
             gaugeAxis.setSecTickColor(secTickColor.getSelectObject());
         }
-        super.updateBean(gaugeAxis);
     }
 }
\ No newline at end of file