From 9345fba3e13403590f433e8d239b408b0d0dddda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com>
Date: Mon, 27 Dec 2021 19:48:31 +0800
Subject: [PATCH] =?UTF-8?q?CHART-22503=20=E6=A0=87=E9=A2=98=E3=80=81?=
 =?UTF-8?q?=E5=9B=BE=E4=BE=8B=E3=80=81=E8=BD=B4=E6=A0=87=E9=A2=98=E3=80=81?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=A1=A8=E7=AD=89=E5=AD=97=E7=AC=A6=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2=E6=8E=A7=E4=BB=B6-=E5=A4=9A=E4=BD=99=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=BA=86=E8=87=AA=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gui/style/ChartTextAttrPaneWithThemeStyle.java     |  6 ------
 .../designer/component/VanChartLabelContentPane.java   | 10 +++++++++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithThemeStyle.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithThemeStyle.java
index a291347364..345d57de8a 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithThemeStyle.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithThemeStyle.java
@@ -2,7 +2,6 @@ package com.fr.design.mainframe.chart.gui.style;
 
 import com.fr.chart.base.TextAttr;
 import com.fr.design.gui.ibutton.UIButtonGroup;
-import com.fr.design.gui.ibutton.UIColorButtonWithAuto;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
@@ -75,11 +74,6 @@ public class ChartTextAttrPaneWithThemeStyle extends ChartTextAttrPane {
         textFontPane.setVisible(preButton.getSelectedIndex() == CUSTOM);
     }
 
-    @Override
-    protected void initFontColorState() {
-        setFontColor(new UIColorButtonWithAuto());
-    }
-
     protected double[] getRowSize() {
         double p = TableLayout.PREFERRED;
         return new double[]{p, p};
diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLabelContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLabelContentPane.java
index 1aaf53424c..54200fcdee 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLabelContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLabelContentPane.java
@@ -1,5 +1,6 @@
 package com.fr.van.chart.designer.component;
 
+import com.fr.design.gui.ibutton.UIColorButtonWithAuto;
 import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane;
 import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPaneWithAuto;
 import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPaneWithThemeStyle;
@@ -33,7 +34,7 @@ public class VanChartLabelContentPane extends VanChartTooltipContentPane {
         if (isInCondition() || !ChartEditContext.supportTheme()) {
             return super.createCommonStylePane();
         }
-        setTextAttrPane(new ChartTextAttrPaneWithThemeStyle());
+        setTextAttrPane(new LabelAttrPaneWithThemeStyle());
 
         JPanel stylePanel = new JPanel(new BorderLayout());
         stylePanel.add(getTextAttrPane(), BorderLayout.CENTER);
@@ -66,4 +67,11 @@ public class VanChartLabelContentPane extends VanChartTooltipContentPane {
             }
         }
     }
+
+    class LabelAttrPaneWithThemeStyle extends ChartTextAttrPaneWithThemeStyle {
+        @Override
+        protected void initFontColorState() {
+            setFontColor(new UIColorButtonWithAuto());
+        }
+    }
 }