From 362829e230ccaaab782285d8cbf07fa52535cc58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com>
Date: Tue, 3 Dec 2019 17:07:35 +0800
Subject: [PATCH] =?UTF-8?q?CHART-11424=20=E6=B0=94=E6=B3=A1=E5=9B=BE?=
 =?UTF-8?q?=EF=BC=8C=E6=95=A3=E7=82=B9=E5=9B=BE=E7=9A=84=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E8=AE=BE=E7=BD=AE=20&&=20CHART-11278=20?=
 =?UTF-8?q?=E5=9B=BE=E4=BE=8B=E7=95=8C=E9=9D=A2=E5=B8=83=E5=B1=80=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/chartx/fields/diff/ScatterDataSetFieldsPane.java   | 4 ++--
 .../fr/van/chart/designer/style/VanChartPlotLegendPane.java   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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 21ef67b295..c5f4fdc3d8 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
@@ -80,7 +80,7 @@ public class ScatterDataSetFieldsPane extends AbstractDataSetFieldsPane<BubbleCo
         updateField(xField, field.getXField());
         updateField(yField, field.getYField());
         updateField(size, field.getSizeField());
-        field.getSeriesName().setFilterProperties(filterPane.updateBean());
+        collection.setFilterProperties(filterPane.updateBean());
         collection.add(field);
         return collection;
     }
@@ -95,6 +95,6 @@ public class ScatterDataSetFieldsPane extends AbstractDataSetFieldsPane<BubbleCo
         populateField(xField, field.getXField());
         populateField(yField, field.getYField());
         populateField(size, field.getSizeField());
-        filterPane.populateBean(field.getSeriesName().getFilterProperties());
+        filterPane.populateBean(ob.getFilterProperties());
     }
 }
diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartPlotLegendPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartPlotLegendPane.java
index 2d4245148a..b29e75265d 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartPlotLegendPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartPlotLegendPane.java
@@ -176,7 +176,7 @@ public class VanChartPlotLegendPane extends BasicPane {
         initPositionListener();
 
         JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components,row,col);
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Position"), panel);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Form_Layout"), panel);
     }
 
     private void initPositionListener(){