From 4e74f71f1103b8bc2d6a25186fb036d095111cd4 Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Sun, 18 Oct 2020 14:48:59 +0800
Subject: [PATCH] =?UTF-8?q?CHART-16040=20=E7=AE=B1=E5=9E=8B=E5=9B=BE?=
 =?UTF-8?q?=E5=AF=8C=E6=96=87=E6=9C=AC=E5=8F=82=E6=95=B0=E9=9D=A2=E6=9D=BF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../box/VanChartBoxTooltipContentPane.java    | 82 +++++++++++++++++++
 .../component/VanChartTooltipContentPane.java | 11 ++-
 2 files changed, 90 insertions(+), 3 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/van/chart/box/VanChartBoxTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/box/VanChartBoxTooltipContentPane.java
index abba5f753..18b3bb363 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/box/VanChartBoxTooltipContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/box/VanChartBoxTooltipContentPane.java
@@ -48,6 +48,9 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
     private JPanel dataNumberPane;
     private JPanel dataOutlierPane;
 
+    private JPanel richTextNumberPane;
+    private JPanel richTextOutlierPane;
+
     public VanChartBoxTooltipContentPane(VanChartStylePane parent, JPanel showOnPane, boolean isDetailed) {
         super(parent, showOnPane);
         checkFormatVisible(isDetailed);
@@ -145,6 +148,16 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
         return commonPanel;
     }
 
+    protected JPanel createRichFormatPanel() {
+        JPanel richFormatPanel = new JPanel(new BorderLayout());
+
+        richFormatPanel.add(createRichTextCateAndSeriesPane(), BorderLayout.NORTH);
+        richFormatPanel.add(createRichTextDataNumberPane(), BorderLayout.CENTER);
+        richFormatPanel.add(createRichTextDataDetailPane(), BorderLayout.SOUTH);
+
+        return richFormatPanel;
+    }
+
     protected Component[][] getRichTextComponents() {
         return new Component[][]{
                 new Component[]{getRichTextCategoryNameFormatPane(), null},
@@ -229,6 +242,72 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
         return detailPane;
     }
 
+    private JPanel createRichTextCateAndSeriesPane() {
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
+
+        double[] columnSize = {f, e};
+        double[] rowSize = {p, p, p};
+
+        Component[][] cateAndSeries = new Component[][]{
+                new Component[]{null, null},
+                new Component[]{null, getRichTextCategoryNameFormatPane()},
+                new Component[]{null, getRichTextSeriesNameFormatPane()}
+        };
+
+        return TableLayoutHelper.createTableLayoutPane(cateAndSeries, rowSize, columnSize);
+    }
+
+    private JPanel createRichTextDataNumberPane() {
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
+
+        double[] columnSize = {f, e};
+        double[] rowSize = {p, p};
+
+        Component[][] dataNumber = new Component[][]{
+                new Component[]{null, null},
+                new Component[]{null, richTextNumber},
+        };
+
+        richTextNumberPane = TableLayoutHelper.createTableLayoutPane(dataNumber, rowSize, columnSize);
+
+        return richTextNumberPane;
+    }
+
+    private JPanel createRichTextDataDetailPane() {
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
+
+        double[] columnSize = {f, e};
+
+        JPanel detailPane = new JPanel(new BorderLayout());
+
+        Component[][] richTextDetail = new Component[][]{
+                new Component[]{null, null},
+                new Component[]{null, richTextMax},
+                new Component[]{new UILabel(getLabelContentTitle()), richTextQ3},
+                new Component[]{null, richTextMedian},
+                new Component[]{null, richTextQ1},
+                new Component[]{null, richTextMin}
+        };
+
+        Component[][] dataOutlier = new Component[][]{
+                new Component[]{null, null},
+                new Component[]{null, richTextOutlier},
+        };
+
+        richTextOutlierPane = TableLayoutHelper.createTableLayoutPane(dataOutlier, new double[]{p, p}, columnSize);
+
+        detailPane.add(TableLayoutHelper.createTableLayoutPane(richTextDetail, new double[]{p, p, p, p, p, p}, columnSize), BorderLayout.NORTH);
+        detailPane.add(richTextOutlierPane, BorderLayout.CENTER);
+
+        return detailPane;
+    }
+
     public boolean isDirty() {
         return getCategoryNameFormatPane().isDirty()
                 || getSeriesNameFormatPane().isDirty()
@@ -354,5 +433,8 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
 
         dataNumberPane.setVisible(detailed);
         dataOutlierPane.setVisible(detailed);
+
+        richTextNumberPane.setVisible(detailed);
+        richTextOutlierPane.setVisible(detailed);
     }
 }
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 5d0a613ac..aca007097 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
@@ -384,17 +384,22 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         double[] columnSize = {f, e};
         double[] rowSize = {p, p, p};
 
-        JPanel formatContent = TableLayoutHelper.createTableLayoutPane(getRichTextComponents(), getRowSize(p), new double[]{f, p});
-
         Component[][] components = new Component[][]{
                 new Component[]{null, null},
                 new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Content_Style")), createRichEditorButton()},
-                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Use_Format")), formatContent}
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Use_Format")), createRichFormatPanel()}
         };
 
         return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
     }
 
+    protected JPanel createRichFormatPanel() {
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+
+        return TableLayoutHelper.createTableLayoutPane(getRichTextComponents(), getRowSize(p), new double[]{f, p});
+    }
+
     private JComponent createRichEditorButton() {
         UIButton contentTextArea = new UIButton(Toolkit.i18nText("Fine-Design_Chart_Rich_Text_Edit"));