From df84b426b0e143c4184726a82066b75c6e69fcad Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Wed, 23 Sep 2020 19:21:52 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=80=9A=E7=94=A8=E5=92=8C=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E4=B8=AD=E9=83=BD=E6=94=AF=E6=8C=81=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/VanChartTooltipContentPane.java    | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java
index 608ee2e16d..51ad13af1f 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java
@@ -73,6 +73,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
     private JPanel commonPanel;
     private JPanel editorPanel;
     private JPanel htmlPanel;
+    private JPanel stylePanel;
     private UIButtonGroup<Integer> styleButton;
     private ChartTextAttrPane textAttrPane;
     private VanChartHtmlLabelPane htmlLabelPane;
@@ -202,6 +203,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
 
         content.add(createButtonPane(), BorderLayout.NORTH);
         content.add(centerPanel, BorderLayout.CENTER);
+        content.add(stylePanel, BorderLayout.SOUTH);
 
         initContentListener();
 
@@ -209,9 +211,10 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
     }
 
     private void initDetailPane() {
-        commonPanel = createCommonPanel();
+        commonPanel = createCommonFormatPanel();
         editorPanel = createRichEditorPanel();
         htmlPanel = createHtmlPane();
+        stylePanel = createCommonStylePane();
     }
 
     private void initCenterPane() {
@@ -261,15 +264,6 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         return TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, column);
     }
 
-    private JPanel createCommonPanel() {
-        JPanel common = new JPanel(new BorderLayout());
-
-        common.add(createCommonFormatPanel(), BorderLayout.CENTER);
-        common.add(createCommonStylePane(), BorderLayout.SOUTH);
-
-        return common;
-    }
-
     protected JPanel createCommonFormatPanel() {
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
@@ -469,6 +463,8 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         } else {
             cardLayout.show(centerPanel, Toolkit.i18nText("Fine-Design_Chart_Common"));
         }
+
+        stylePanel.setVisible(content.getSelectedIndex() != 1);
     }
 
     protected void setCustomFormatterText() {

From 934fb252eb9b81b3b091836fd7c42db8c006c2d3 Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Wed, 23 Sep 2020 20:44:15 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=98=E7=89=B9=E5=9B=BE=E5=92=8C?=
 =?UTF-8?q?=E6=A1=86=E6=9E=B6=E5=9B=BE=E6=A0=87=E7=AD=BE=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...nChartLabelContentPaneWithoutRichText.java | 74 ++++++++++++++++++-
 .../label/GaugeLabelContentPane.java          |  3 +
 2 files changed, 73 insertions(+), 4 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLabelContentPaneWithoutRichText.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLabelContentPaneWithoutRichText.java
index 4c1935eef0..dafaef060c 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLabelContentPaneWithoutRichText.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLabelContentPaneWithoutRichText.java
@@ -6,6 +6,7 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane;
 import com.fr.plugin.chart.base.AttrTooltipContent;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithCheckBox;
@@ -36,9 +37,11 @@ public class VanChartLabelContentPaneWithoutRichText extends BasicBeanPane<AttrT
     //监控刷新时，自动数据点提示使用
     private ChangedValueFormatPaneWithCheckBox changedValueFormatPane;
     private ChangedPercentFormatPaneWithCheckBox changedPercentFormatPane;
-
+    private UIButtonGroup<Integer> styleButton;
+    private ChartTextAttrPane textAttrPane;
     private JPanel centerPane;
     private JPanel commonPanel;
+    private JPanel stylePanel;
     private VanChartHtmlLabelPane htmlLabelPane;
 
     private VanChartStylePane parent;
@@ -85,7 +88,7 @@ public class VanChartLabelContentPaneWithoutRichText extends BasicBeanPane<AttrT
     }
 
     private JPanel createLabelContentPane() {
-        content = new UIButtonGroup<Integer>(new String[]{
+        content = new UIButtonGroup<>(new String[]{
                 Toolkit.i18nText("Fine-Design_Chart_Common"),
                 Toolkit.i18nText("Fine-Design_Chart_Custom")
         });
@@ -99,7 +102,7 @@ public class VanChartLabelContentPaneWithoutRichText extends BasicBeanPane<AttrT
         commonPanel = createCommonPanel();
         htmlLabelPane = createHtmlLabelPane();
         htmlLabelPane.setParent(parent);
-
+        stylePanel = createTextStylePane();
         centerPane = new JPanel(new CardLayout()) {
             @Override
             public Dimension getPreferredSize() {
@@ -121,10 +124,63 @@ public class VanChartLabelContentPaneWithoutRichText extends BasicBeanPane<AttrT
                 new Component[]{null, centerPane},
         };
         initContentListener();
-        JPanel contentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, column);
+        JPanel paramsPanel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, column);
+
+        JPanel contentPane = new JPanel(new BorderLayout());
+        contentPane.add(paramsPanel, BorderLayout.CENTER);
+        contentPane.add(stylePanel, BorderLayout.SOUTH);
+
         return getLabelContentPane(contentPane);
     }
 
+    protected boolean hasTextStylePane() {
+        return true;
+    }
+
+    private JPanel createTextStylePane() {
+        styleButton = new UIButtonGroup<>(new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Automatic"),
+                Toolkit.i18nText("Fine-Design_Chart_Custom")
+        });
+
+        textAttrPane = new ChartTextAttrPane() {
+            protected Component[][] getComponents(JPanel buttonPane) {
+                return new Component[][]{
+                        new Component[]{null, null},
+                        new Component[]{null, getFontNameComboBox()},
+                        new Component[]{null, buttonPane}
+                };
+            }
+        };
+
+        JPanel buttonPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), styleButton);
+
+        JPanel stylePanel = new JPanel(new BorderLayout());
+        stylePanel.add(buttonPane, BorderLayout.CENTER);
+        stylePanel.add(textAttrPane, BorderLayout.SOUTH);
+
+        initStyleButtonListener();
+
+        return stylePanel;
+    }
+
+    private void initStyleButtonListener() {
+        styleButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                checkStylePane();
+            }
+        });
+    }
+
+    private void checkStylePane() {
+        if (hasTextStylePane()) {
+            stylePanel.setVisible(true);
+            textAttrPane.setVisible(styleButton.getSelectedIndex() == 1);
+        } else {
+            stylePanel.setVisible(false);
+        }
+    }
+
     protected String getLabelContentTitle() {
         return Toolkit.i18nText("Fine-Design_Report_Text");
     }
@@ -237,7 +293,12 @@ public class VanChartLabelContentPaneWithoutRichText extends BasicBeanPane<AttrT
         if (!attrTooltipContent.isCommon()) {
             setDirty(false);
         }
+        if (hasTextStylePane()) {
+            this.styleButton.setSelectedIndex(attrTooltipContent.isCustom() ? 1 : 0);
+            this.textAttrPane.populate(attrTooltipContent.getTextAttr());
+        }
         checkCardPane();
+        checkStylePane();
     }
 
     protected void populateFormatPane(AttrTooltipContent attrTooltipContent) {
@@ -265,6 +326,11 @@ public class VanChartLabelContentPaneWithoutRichText extends BasicBeanPane<AttrT
 
         htmlLabelPane.update(attrTooltipContent.getHtmlLabel());
 
+        if (hasTextStylePane()) {
+            attrTooltipContent.setCustom(styleButton.getSelectedIndex() == 1);
+            attrTooltipContent.setTextAttr(this.textAttrPane.update());
+        }
+
         return attrTooltipContent;
     }
 
diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/label/GaugeLabelContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/label/GaugeLabelContentPane.java
index 13a03fd470..6459ef480b 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/label/GaugeLabelContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/label/GaugeLabelContentPane.java
@@ -24,4 +24,7 @@ public class GaugeLabelContentPane extends VanChartLabelContentPaneWithoutRichTe
         return contentPane;
     }
 
+    protected boolean hasTextStylePane() {
+        return false;
+    }
 }

From 1351725929c4a42add56401304654a6c52289984 Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Wed, 23 Sep 2020 20:51:07 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E7=9A=84setDirty?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../van/chart/designer/component/VanChartTooltipContentPane.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java
index 51ad13af1f..ca96165119 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java
@@ -604,7 +604,6 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
     protected void populateRichText(AttrTooltipRichText tooltipRichText) {
         if (tooltipRichText != null) {
             updateLocalRichText(tooltipRichText.getContent(), tooltipRichText.isAuto());
-            setDirty(false);
         }
     }