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

* commit '0ff7bb3058f3d2a124a97364ed9dcb9891673d4a':
  CHART-11424 fix 数据集面板-数据筛选

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

@@ -57,7 +57,7 @@ public class FunnelDataSetFieldsPane extends AbstractDataSetFieldsWithSeriesValu
         ColumnFieldCollectionWithSeriesValue collection = new ColumnFieldCollectionWithSeriesValue();
         updateSeriesValuePane(collection);
         SeriesValueCorrelationDefinition seriesValueCorrelationDefinition = collection.getSeriesValueCorrelationDefinition();
-        filterPane.updateBean(seriesValueCorrelationDefinition.getFilterProperties());
+        seriesValueCorrelationDefinition.setFilterProperties(filterPane.updateBean());
         return collection;
     }
 

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

@@ -69,7 +69,7 @@ public class GaugeDataSetFieldsPane extends AbstractDataSetFieldsPane<GaugeColum
         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/ScatterDataSetFieldsPane.java

@@ -24,7 +24,6 @@ public class ScatterDataSetFieldsPane extends AbstractDataSetFieldsPane<BubbleCo
     private UIComboBox yField;
     private UIComboBoxWithNone size;
 
-    //todo 数据筛选
     private AbstractSingleFilterPane filterPane;
 
 
@@ -81,7 +80,7 @@ public class ScatterDataSetFieldsPane extends AbstractDataSetFieldsPane<BubbleCo
         updateField(xField, field.getXField());
         updateField(yField, field.getYField());
         updateField(size, field.getSizeField());
-        filterPane.updateBean(field.getSeriesName().getFilterProperties());
+        field.getSeriesName().setFilterProperties(filterPane.updateBean());
         return collection;
     }