结果数据不支持数据筛选

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

@@ -12,8 +12,6 @@ import com.fr.design.mainframe.chart.gui.data.ChartDataFilterPane;
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.plugin.chart.box.data.VanBoxTableDefinition;
-import com.fr.plugin.chart.box.data.VanBoxTableDefinitionHelper;
-import com.fr.plugin.chart.box.data.VanBoxTableResultDefinition;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
@@ -31,6 +29,7 @@ public class BoxPlotTableDataContentPane extends AbstractTableDataContentPane {
     private BoxPlotTableSeriesTypeUsePane seriesTypeComboxPane;
     private BoxPlotTableResultDataSeriesPane resultDataSeriesPane;
 
+    private JPanel filterPane;
     private ChartDataFilterPane dataScreeningPane;
 
     private ChartDataPane parent;
@@ -88,10 +87,10 @@ public class BoxPlotTableDataContentPane extends AbstractTableDataContentPane {
         dataScreeningPane = new ChartDataFilterPane(initplot, parent, false);
         dataScreeningPane.setBorder(BorderFactory.createEmptyBorder(10, 24, 10, 15));
 
-        JPanel panel = new UIExpandablePane(Toolkit.i18nText("Fine-Design_Chart_Data_Filter"), 290, 24, dataScreeningPane);
+        filterPane = new UIExpandablePane(Toolkit.i18nText("Fine-Design_Chart_Data_Filter"), 290, 24, dataScreeningPane);
-        panel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 5));
+        filterPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 5));
 
-        return panel;
+        return filterPane;
     }
 
     private void initDataTypeListener() {
@@ -109,6 +108,10 @@ public class BoxPlotTableDataContentPane extends AbstractTableDataContentPane {
         if (resultDataSeriesPane != null) {
             resultDataSeriesPane.setVisible(dataType.getSelectedIndex() == 1);
         }
+
+        if (filterPane != null) {
+            filterPane.setVisible(dataType.getSelectedIndex() == 0);
+        }
     }
 
     public void checkBoxUse(boolean hasUse) {
@@ -144,7 +147,7 @@ public class BoxPlotTableDataContentPane extends AbstractTableDataContentPane {
     public void updateBean(ChartCollection collection) {
         checkChartCollection(collection);
 
-        VanBoxTableDefinition table = VanBoxTableDefinitionHelper.getBoxTableDefinition(collection);
+        VanBoxTableDefinition table = BoxTableDefinitionHelper.getBoxTableDefinition(collection);
 
         if (table != null) {
             table.setDetailed(dataType.getSelectedIndex() == 0);
@@ -164,7 +167,7 @@ public class BoxPlotTableDataContentPane extends AbstractTableDataContentPane {
         checkChartCollection(collection);
 
         if (dataType != null) {
-            dataType.setSelectedIndex(VanBoxTableDefinitionHelper.isDetailedTableDataType(collection) ? 0 : 1);
+            dataType.setSelectedIndex(BoxTableDefinitionHelper.isDetailedTableDataType(collection) ? 0 : 1);
         }
         if (seriesTypeComboxPane != null) {
             seriesTypeComboxPane.populateBean(collection);
@@ -180,7 +183,7 @@ public class BoxPlotTableDataContentPane extends AbstractTableDataContentPane {
     }
 
     private void checkChartCollection(ChartCollection collection) {
-        VanBoxTableDefinition table = VanBoxTableDefinitionHelper.getBoxTableDefinition(collection);
+        VanBoxTableDefinition table = BoxTableDefinitionHelper.getBoxTableDefinition(collection);
 
         if (table == null) {
             collection.getSelectedChart().setFilterDefinition(new VanBoxTableDefinition());
@@ -188,26 +191,18 @@ public class BoxPlotTableDataContentPane extends AbstractTableDataContentPane {
     }
 
     private void populateDataScreeningPane(ChartDataFilterPane dataScreeningPane, ChartCollection collection) {
-        NormalTableDataDefinition detailedDefinition = VanBoxTableDefinitionHelper.getBoxTableDetailedDefinition(collection);
+        NormalTableDataDefinition detailedDefinition = BoxTableDefinitionHelper.getBoxTableDetailedDefinition(collection);
-        VanBoxTableResultDefinition resultDefinition = VanBoxTableDefinitionHelper.getBoxTableResultDefinition(collection);
 
         if (detailedDefinition != null) {
             dataScreeningPane.populateDefinition(detailedDefinition, false);
-        } else if (resultDefinition != null) {
-            dataScreeningPane.populateDefinition(resultDefinition, false);
         }
     }
 
     private void updateDataScreeningPane(ChartDataFilterPane dataScreeningPane, ChartCollection collection) {
-        NormalTableDataDefinition detailedDefinition = VanBoxTableDefinitionHelper.getBoxTableDetailedDefinition(collection);
+        NormalTableDataDefinition detailedDefinition = BoxTableDefinitionHelper.getBoxTableDetailedDefinition(collection);
-        VanBoxTableResultDefinition resultDefinition = VanBoxTableDefinitionHelper.getBoxTableResultDefinition(collection);
 
         if (detailedDefinition != null) {
             dataScreeningPane.updateDefinition(detailedDefinition);
         }
-
-        if (resultDefinition != null) {
-            dataScreeningPane.updateDefinition(resultDefinition);
-        }
     }
 }

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

@@ -8,7 +8,6 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.plugin.chart.box.data.VanBoxTableDefinition;
-import com.fr.plugin.chart.box.data.VanBoxTableDefinitionHelper;
 import com.fr.plugin.chart.box.data.VanBoxTableResultDefinition;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.StringUtils;
@@ -120,7 +119,7 @@ public class BoxPlotTableResultDataSeriesPane extends AbstractTableDataContentPa
     public void populateBean(ChartCollection collection) {
         super.populateBean(collection);
 
-        VanBoxTableResultDefinition definition = VanBoxTableDefinitionHelper.getBoxTableResultDefinition(collection);
+        VanBoxTableResultDefinition definition = BoxTableDefinitionHelper.getBoxTableResultDefinition(collection);
 
         if (definition == null) {
             return;
@@ -136,7 +135,7 @@ public class BoxPlotTableResultDataSeriesPane extends AbstractTableDataContentPa
     }
 
     public void updateBean(ChartCollection collection) {
-        VanBoxTableDefinition table = VanBoxTableDefinitionHelper.getBoxTableDefinition(collection);
+        VanBoxTableDefinition table = BoxTableDefinitionHelper.getBoxTableDefinition(collection);
 
         VanBoxTableResultDefinition definition = new VanBoxTableResultDefinition();
 

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

@@ -18,7 +18,6 @@ import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.design.utils.gui.UIComponentUtils;
 import com.fr.general.ComparatorUtils;
 import com.fr.plugin.chart.box.data.VanBoxTableDefinition;
-import com.fr.plugin.chart.box.data.VanBoxTableDefinitionHelper;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.StringUtils;
 
@@ -168,7 +167,7 @@ public class BoxPlotTableSeriesTypeUsePane extends UIComboBoxPane<ChartCollectio
     }
 
     public void populateBean(ChartCollection collection) {
-        NormalTableDataDefinition definition = VanBoxTableDefinitionHelper.getBoxTableDetailedDefinition(collection);
+        NormalTableDataDefinition definition = BoxTableDefinitionHelper.getBoxTableDetailedDefinition(collection);
 
         if (definition == null) {
             categoryCombox.setSelectedItem(Toolkit.i18nText("Fine-Design_Chart_Use_None"));
@@ -187,7 +186,7 @@ public class BoxPlotTableSeriesTypeUsePane extends UIComboBoxPane<ChartCollectio
     }
 
     public void updateBean(ChartCollection collection) {
-        VanBoxTableDefinition table = VanBoxTableDefinitionHelper.getBoxTableDefinition(collection);
+        VanBoxTableDefinition table = BoxTableDefinitionHelper.getBoxTableDefinition(collection);
 
         if (table == null) {
             return;

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

@@ -0,0 +1,59 @@
+package com.fr.van.chart.box.data.table;
+
+import com.fr.base.chart.chartdata.TopDefinitionProvider;
+import com.fr.chart.chartattr.Chart;
+import com.fr.chart.chartattr.ChartCollection;
+import com.fr.chart.chartdata.NormalTableDataDefinition;
+import com.fr.plugin.chart.box.data.VanBoxTableDefinition;
+import com.fr.plugin.chart.box.data.VanBoxTableResultDefinition;
+
+public class BoxTableDefinitionHelper {
+
+    public static VanBoxTableDefinition getBoxTableDefinition(ChartCollection collection) {
+        if (collection != null) {
+
+            Chart chart = collection.getSelectedChart();
+
+            if (chart != null) {
+                TopDefinitionProvider definitionProvider = chart.getFilterDefinition();
+
+                if (definitionProvider instanceof VanBoxTableDefinition) {
+                    return (VanBoxTableDefinition) definitionProvider;
+                }
+            }
+        }
+
+        return null;
+    }
+
+    public static VanBoxTableResultDefinition getBoxTableResultDefinition(ChartCollection collection) {
+        VanBoxTableDefinition table = getBoxTableDefinition(collection);
+
+        if (table != null) {
+            return table.getResultDefinition();
+        }
+
+        return null;
+    }
+
+    public static NormalTableDataDefinition getBoxTableDetailedDefinition(ChartCollection collection) {
+        VanBoxTableDefinition table = getBoxTableDefinition(collection);
+
+        if (table != null) {
+            return table.getDetailedDefinition();
+        }
+
+        return null;
+    }
+
+    public static boolean isDetailedTableDataType(ChartCollection collection) {
+        VanBoxTableDefinition table = getBoxTableDefinition(collection);
+
+        if (table != null) {
+            return table.isDetailed();
+        }
+
+        return true;
+    }
+}
+