From 18041fcbfe9b6215b496a4b42e131aaabde6b12e Mon Sep 17 00:00:00 2001
From: "Wim.Zhai" <Wim.Zhai@fanruan.com>
Date: Tue, 29 Jan 2019 18:14:16 +0800
Subject: [PATCH] =?UTF-8?q?CHART-3791=20=E4=BB=8E=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E5=88=87=E6=8D=A2=E8=87=B3=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=EF=BC=8C=E9=87=8D=E7=BD=AE=E5=9C=B0=E5=9B=BE=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../van/chart/designer/type/AbstractVanChartTypePane.java  | 5 +++++
 .../van/chart/map/designer/type/VanChartMapPlotPane.java   | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java
index 68386f309..b16c9237e 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java
@@ -109,6 +109,7 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane{
         resetTitleAttr(chart);
         //重置监控刷新选项
         resetRefreshMoreLabelAttr((VanChart)chart);
+        resetFilterDefinition(chart);
 
     }
 
@@ -118,6 +119,10 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane{
         chart.setTitle(vanChartPlot.getDefaultTitle());
     }
 
+    //重置数据配置
+    protected void resetFilterDefinition(Chart chart){
+
+    }
 
     //重置监控刷新面板
     protected void resetRefreshMoreLabelAttr(VanChart chart){
diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapPlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapPlotPane.java
index 76a47afd8..244660adf 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapPlotPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapPlotPane.java
@@ -6,10 +6,10 @@ import com.fr.chart.chartattr.Plot;
 import com.fr.design.mainframe.chart.gui.type.ChartImagePane;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.log.FineLoggerFactory;
-
 import com.fr.plugin.chart.base.VanChartTools;
 import com.fr.plugin.chart.map.MapIndependentVanChart;
 import com.fr.plugin.chart.map.VanChartMapPlot;
+import com.fr.plugin.chart.map.data.VanMapDefinition;
 import com.fr.plugin.chart.map.server.CompatibleGEOJSONHelper;
 import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
 
@@ -129,6 +129,11 @@ public class VanChartMapPlotPane extends AbstractVanChartTypePane {
 
     }
 
+    @Override
+    protected void resetFilterDefinition(Chart chart) {
+        chart.setFilterDefinition(new VanMapDefinition());
+    }
+
     protected void resetAttr(Plot plot) {
         sourceChoosePane.resetComponentValue((VanChartMapPlot) plot);
     }