Pull request #2132: CHART-15175 & CHART-15174 调整结果数据的数据点提示内容和埋点信息

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

* commit '10af1e97853c552fbd957e5d830b0bb7ba399f93':
  调整check的位置
  CHART-15175 调整结果数据的数据点提示

designer-chart/src/main/java/com/fr/van/chart/box/VanChartBoxPlotTooltipPane.java

@@ -25,8 +25,4 @@ public class VanChartBoxPlotTooltipPane extends VanChartPlotTooltipPane {
     protected boolean hasTooltipSeriesType() {
         return false;
     }
-
-    public void checkContentVisible(boolean isDetailed) {
-        ((VanChartBoxTooltipContentPane) tooltipContentPane).checkFormatVisible(isDetailed);
-    }
 }

designer-chart/src/main/java/com/fr/van/chart/box/VanChartBoxTooltipContentPane.java

@@ -32,7 +32,7 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
 
     public VanChartBoxTooltipContentPane(VanChartStylePane parent, JPanel showOnPane, boolean isDetailed) {
         super(parent, showOnPane);
-        this.detailed = isDetailed;
+        checkFormatVisible(isDetailed);
     }
 
     protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
@@ -83,8 +83,6 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
         commonPanel.add(createDataNumberPane(), BorderLayout.CENTER);
         commonPanel.add(createDataDetailPane(), BorderLayout.SOUTH);
 
-        checkFormatVisible(detailed);
-
         return commonPanel;
     }
 
@@ -178,7 +176,7 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
     }
 
     protected AttrTooltipContent createAttrTooltip() {
-        return new AttrBoxTooltipContent();
+        return new AttrBoxTooltipContent(detailed);
     }
 
     protected void populateFormatPane(AttrTooltipContent attrTooltipContent) {
@@ -195,6 +193,8 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
             q1.populate(boxTooltipContent.getQ1());
             min.populate(boxTooltipContent.getMin());
             outlier.populate(boxTooltipContent.getOutlier());
+
+            checkFormatVisible(boxTooltipContent.isDetailed());
         }
     }
 
@@ -212,6 +212,8 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
             q1.update(boxTooltipContent.getQ1());
             min.update(boxTooltipContent.getMin());
             outlier.update(boxTooltipContent.getOutlier());
+
+            boxTooltipContent.setDetailed(this.detailed);
         }
     }
 

designer-chart/src/main/java/com/fr/van/chart/box/VanChartBoxTooltipPane.java

@@ -4,7 +4,6 @@ import com.fr.chart.base.DataSeriesCondition;
 import com.fr.chart.chartattr.Plot;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.base.AttrTooltip;
-import com.fr.plugin.chart.box.VanChartBoxPlot;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 import com.fr.van.chart.designer.style.tooltip.VanChartPlotTooltipPane;
 import com.fr.van.chart.designer.style.tooltip.VanChartTooltipPane;
@@ -25,11 +24,6 @@ public class VanChartBoxTooltipPane extends VanChartTooltipPane {
 
         if (tooltipPane instanceof VanChartBoxPlotTooltipPane) {
             tooltipPane.populate((AttrTooltip) attr);
-
-            VanChartBoxPlotTooltipPane boxPlotTooltipPane = (VanChartBoxPlotTooltipPane) tooltipPane;
-            VanChartBoxPlot boxPlot = (VanChartBoxPlot) plot;
-
-            boxPlotTooltipPane.checkContentVisible(boxPlot.isDetailed());
         }
     }
 }

designer-chart/src/main/java/com/fr/van/chart/box/data/report/BoxPlotReportDataContentPane.java

@@ -101,7 +101,7 @@ public class BoxPlotReportDataContentPane extends AbstractReportDataContentPane
             boolean isDetailed = dataType.getSelectedIndex() == 0;
 
             report.setDetailed(isDetailed);
-            ((VanChartBoxPlot) initplot).setDetailed(isDetailed);
+            ((VanChartBoxPlot) initplot).updateDetailedAttr(isDetailed);
         }
         if (detailedDataSeriesPane != null) {
             detailedDataSeriesPane.updateBean(collection);

designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableDataContentPane.java

@@ -154,7 +154,7 @@ public class BoxPlotTableDataContentPane extends AbstractTableDataContentPane {
             boolean isDetailed = dataType.getSelectedIndex() == 0;
 
             table.setDetailed(isDetailed);
-            ((VanChartBoxPlot) initplot).setDetailed(isDetailed);
+            ((VanChartBoxPlot) initplot).updateDetailedAttr(isDetailed);
         }
         if (seriesTypeComboxPane != null) {
             seriesTypeComboxPane.updateBean(collection);