From 59cc56f41d13291ae4901b28da1dae384008c164 Mon Sep 17 00:00:00 2001
From: "Wim.Zhai" <Wim.Zhai@fanruan.com>
Date: Mon, 25 Nov 2019 16:32:35 +0800
Subject: [PATCH] =?UTF-8?q?CHART-11424=20fix=20=E8=A1=A5=E5=85=85=E5=87=A0?=
 =?UTF-8?q?=E7=A7=8D=E5=9B=BE=E8=A1=A8=E5=8D=95=E5=85=83=E6=A0=BC=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9D=A2=E6=9D=BF=20=E6=95=B0=E6=8D=AE=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/chartx/fields/diff/FunnelCellDataFieldsPane.java | 2 +-
 .../design/chartx/fields/diff/GaugeCellDataFieldsPane.java  | 2 +-
 .../chartx/fields/diff/ScatterCellDataFieldsPane.java       | 2 ++
 .../design/chartx/fields/diff/ScatterDataSetFieldsPane.java | 6 +++++-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelCellDataFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelCellDataFieldsPane.java
index abf40ea529..5d9aaf7b0e 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelCellDataFieldsPane.java
+++ b/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;
     }
 
diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/GaugeCellDataFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/GaugeCellDataFieldsPane.java
index 5df78ff2ba..b125516ff4 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/GaugeCellDataFieldsPane.java
+++ b/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;
     }
 
diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/ScatterCellDataFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/ScatterCellDataFieldsPane.java
index 920538f431..06a177ea9a 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/ScatterCellDataFieldsPane.java
+++ b/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());
     }
 }
diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/ScatterDataSetFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/ScatterDataSetFieldsPane.java
index 656d1421bf..21ef67b295 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/ScatterDataSetFieldsPane.java
+++ b/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());