Pull request #2629: CHART-16040 & CHART-16224 箱型图富文本参数面板修改、增加富文本条件属性界面事件

Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0

* commit 'd4d970d1039e81f62d71c32aaa31c114a322d1ab':
  增加空判断
  CHART-16224 增加富文本条件属性界面事件
  CHART-16040 箱型图富文本参数面板修改

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);
     }
 }

designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnPlotLabelDetailPane.java

@@ -5,6 +5,8 @@ import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.plugin.chart.base.AttrLabelDetail;
 import com.fr.plugin.chart.base.AttrTooltipContent;
 import com.fr.plugin.chart.column.VanChartColumnPlot;
+import com.fr.van.chart.designer.component.VanChartLabelContentPane;
+import com.fr.van.chart.designer.component.VanChartTooltipContentPane;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 import com.fr.van.chart.designer.style.label.VanChartPlotLabelDetailPane;
 
@@ -14,6 +16,34 @@ public class VanChartColumnPlotLabelDetailPane extends VanChartPlotLabelDetailPa
         super(plot, parent);
     }
 
+    protected void initToolTipContentPane(Plot plot) {
+        VanChartLabelContentPane dataLabelContentPane = new VanChartLabelContentPane(getParentPane(), VanChartColumnPlotLabelDetailPane.this) {
+            protected void checkCardPane() {
+                super.checkCardPane();
+                checkOrientationPane();
+            }
+        };
+
+        setDataLabelContentPane(dataLabelContentPane);
+    }
+
+    private void checkOrientationPane() {
+        VanChartLabelContentPane dataLabelContentPane = (VanChartLabelContentPane) getDataLabelContentPane();
+        UIButtonGroup<Integer> content = dataLabelContentPane.getContent();
+        UIButtonGroup<Integer> orientation = getOrientation();
+
+        if (content == null || orientation == null) {
+            return;
+        }
+
+        if (content.getSelectedIndex() == VanChartTooltipContentPane.RICH_EDITOR_INDEX) {
+            orientation.setSelectedIndex(HORIZONTAL_INDEX);
+            orientation.setEnabled(false);
+        } else {
+            orientation.setEnabled(true);
+        }
+    }
+
     protected boolean hasLabelOrientationPane() {
         return !((VanChartColumnPlot) this.getPlot()).isBar();
     }

designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java

@@ -57,10 +57,10 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
     private static final int TEXT_ATTR_AUTO_INDEX = 0;
     private static final int TEXT_ATTR_CUSTOM_INDEX = 1;
     // 标签内容button
-    private static final int COMMON_INDEX = 0;
-    private static final int RICH_EDITOR_INDEX = 1;
-    private static final int CUSTOM_INDEX_WITH_RICH_EDITOR = 2;
-    private static final int CUSTOM_INDEX_WITHOUT_RICH_EDITOR = 1;
+    public static final int COMMON_INDEX = 0;
+    public static final int RICH_EDITOR_INDEX = 1;
+    public static final int CUSTOM_INDEX_WITH_RICH_EDITOR = 2;
+    public static final int CUSTOM_INDEX_WITHOUT_RICH_EDITOR = 1;
 
     private UIButtonGroup<Integer> content;
 
@@ -202,6 +202,10 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         this.richTextChangedPercentFormatPane = richTextChangedPercentFormatPane;
     }
 
+    public UIButtonGroup<Integer> getContent() {
+        return content;
+    }
+
     public AttrTooltipRichText getRichTextAttr() {
         return richText;
     }
@@ -384,17 +388,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"));
 
@@ -508,7 +517,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
     }
 
 
-    private void checkCardPane() {
+    protected void checkCardPane() {
         if (supportRichEditor()) {
             checkCardPaneWithRichEditor();
         } else {