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] =?UTF-8?q?=E9=80=9A=E7=94=A8=E5=92=8C=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E4=B8=AD=E9=83=BD=E6=94=AF=E6=8C=81=E6=A0=B7=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() {