Merge pull request #1309 in DESIGN/design from ~WIM.ZHAI/xdesign:feature/10.0 to feature/10.0

* commit '250b8ebf657f400f222c633cdf62c2e475e1506c':
  CHART-11424 fix 补充几种图表单元格数据面板 数据筛选组件
  fix 雷达图轴面板NPE

designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelCellDataFieldsPane.java

@@ -54,7 +54,7 @@ public class FunnelCellDataFieldsPane extends AbstractCellDataFieldsWithSeriesVa
         ColumnFieldCollectionWithSeriesValue fieldCollection = new ColumnFieldCollectionWithSeriesValue();
         updateSeriesValuePane(fieldCollection);
         SeriesValueCorrelationDefinition seriesValueCorrelationDefinition = fieldCollection.getSeriesValueCorrelationDefinition();
-        filterPane.updateBean(seriesValueCorrelationDefinition.getFilterProperties());
+        seriesValueCorrelationDefinition.setFilterProperties(filterPane.updateBean());
         return fieldCollection;
     }
 

designer-chart/src/main/java/com/fr/design/chartx/fields/diff/GaugeCellDataFieldsPane.java

@@ -69,7 +69,7 @@ public class GaugeCellDataFieldsPane extends AbstractCellDataFieldsPane<GaugeCol
         GaugeColumnFieldCollection gauge = new GaugeColumnFieldCollection();
         updateField(category, gauge.getCategory());
         updateField(value, gauge.getValue());
-        filterPane.updateBean(gauge.getCategory().getFilterProperties());
+        gauge.getCategory().setFilterProperties(filterPane.updateBean());
         return gauge;
     }
 

designer-chart/src/main/java/com/fr/design/chartx/fields/diff/ScatterCellDataFieldsPane.java

@@ -76,11 +76,13 @@ public class ScatterCellDataFieldsPane extends AbstractCellDataFieldsPane<Bubble
     public BubbleColumnFieldCollection updateBean() {
         BubbleColumnFieldCollection collection = new BubbleColumnFieldCollection();
         seriesXYValueCorrelationPane.updateBean(collection);
+        collection.setFilterProperties(filterPane.updateBean());
         return collection;
     }
 
     @Override
     public void populateBean(BubbleColumnFieldCollection ob) {
         seriesXYValueCorrelationPane.populateBean(ob);
+        filterPane.populateBean(ob.getFilterProperties());
     }
 }

designer-chart/src/main/java/com/fr/design/chartx/fields/diff/ScatterDataSetFieldsPane.java

@@ -75,17 +75,21 @@ public class ScatterDataSetFieldsPane extends AbstractDataSetFieldsPane<BubbleCo
     @Override
     public BubbleColumnFieldCollection updateBean() {
         BubbleColumnFieldCollection collection = new BubbleColumnFieldCollection();
-        BubbleColumnField field = collection.getBubbleColumnField(0);
+        BubbleColumnField field = new BubbleColumnField();
         updateField(series, field.getSeriesName());
         updateField(xField, field.getXField());
         updateField(yField, field.getYField());
         updateField(size, field.getSizeField());
         field.getSeriesName().setFilterProperties(filterPane.updateBean());
+        collection.add(field);
         return collection;
     }
 
     @Override
     public void populateBean(BubbleColumnFieldCollection ob) {
+        if (ob.getList().isEmpty()){
+            return;
+        }
         BubbleColumnField field = ob.getBubbleColumnField(0);
         populateField(series, field.getSeriesName());
         populateField(xField, field.getXField());

designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java

@@ -118,7 +118,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
                 new Component[]{createLabelPane(new double[]{p, p}, column), null},
                 new Component[]{createLineStylePane(new double[]{p, p, p, p, p}, columnSize), null},
                 new Component[]{createAxisPositionPane(new double[]{p, p, p}, columnSize, isXAxis), null},
-                new Component[]{createDisplayStrategy(new double[]{p, p, p}, columnSize), null},
+                new Component[]{createDisplayStrategy(), null},
                 new Component[]{createValueStylePane(), null},
         };
 
@@ -326,7 +326,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
         }
     }
 
-    protected JPanel createDisplayStrategy(double[] row, double[] col){
+    protected JPanel createDisplayStrategy(){
         limitPane = new LimitPane();
         return limitPane;
     }
@@ -385,8 +385,10 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
     protected void checkAllUse() {
         checkCardPane();
         checkLabelPane();
+        if (limitPane != null){
             limitPane.checkMaxProPortionUse();
         }
+    }
 
     protected void checkCardPane() {
         if(centerPane != null && valueFormatStyle != null){

designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartTimeAxisPane.java

@@ -73,7 +73,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
                 new Component[]{createValueDefinition(),null},
                 new Component[]{createLineStylePane(new double[]{p, p,p,p,p}, columnSize),null},
                 new Component[]{createAxisPositionPane(new double[]{p, p, p}, columnSize, isXAxis),null},
-                new Component[]{createDisplayStrategy(new double[]{p, p,p}, columnSize),null},
+                new Component[]{createDisplayStrategy(),null},
                 new Component[]{createValueStylePane(),null},
         };
 

designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartValueAxisPane.java

@@ -54,7 +54,7 @@ public class VanChartValueAxisPane extends VanChartBaseAxisPane {
                 new Component[]{createMinMaxValuePane(new double[]{p, p}, columnSize), null},
                 new Component[]{createLineStylePane(new double[]{p, p, p, p, p}, columnSize), null},
                 new Component[]{createAxisPositionPane(new double[]{p, p, p}, columnSize, isXAxis), null},
-                new Component[]{createDisplayStrategy(new double[]{p, p, p}, columnSize), null},
+                new Component[]{createDisplayStrategy(), null},
                 new Component[]{createValueStylePane(), null},
         };