From 2835206968969e4b146dd5732a18865f30beba2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com>
Date: Fri, 20 Mar 2020 11:19:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?CHART-13049=20=E8=8B=B1=E6=96=87=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E4=B8=8B=E5=B8=83=E5=B1=80=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/gui/data/table/SeriesTypeUseComboxPane.java  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesTypeUseComboxPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesTypeUseComboxPane.java
index 3779ff8417..804ca541ba 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesTypeUseComboxPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesTypeUseComboxPane.java
@@ -14,11 +14,13 @@ import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.data.ChartDataFilterPane;
 import com.fr.design.utils.gui.GUICoreUtils;
 
-
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
 import java.util.ArrayList;
 import java.util.List;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
 
 /**
  * 属性表: 柱形, 饼图 数据集界面, "系列名使用"界面.
@@ -57,7 +59,7 @@ public class SeriesTypeUseComboxPane extends UIComboBoxPane<ChartCollection> {
         this.add(cardPane, BorderLayout.CENTER);
         dataScreeningPane =  new ChartDataFilterPane(this.initplot, parent);
         JPanel panel = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter"), 290, 24, dataScreeningPane);
-        panel.setBorder(BorderFactory.createEmptyBorder(0,5,0,5));
+        panel.setBorder(BorderFactory.createEmptyBorder(0,10,0,10));
         dataScreeningPane.setBorder(BorderFactory.createEmptyBorder(10,5,0,5));
         this.add(panel, BorderLayout.SOUTH);
     }

From 38c8770933d676ff6ddfc164f29dfc51f9d586ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com>
Date: Fri, 20 Mar 2020 16:40:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?CHART-12820=20=E5=9C=B0=E5=9B=BE=E8=BE=B9?=
 =?UTF-8?q?=E7=95=8C=E5=86=85=E7=BC=BA=E5=B0=91=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/mainframe/chart/gui/type/MapPlotPane.java  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MapPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MapPlotPane.java
index 96cae8b43f..a6c78de948 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MapPlotPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MapPlotPane.java
@@ -71,6 +71,11 @@ public class MapPlotPane extends AbstractDeprecatedChartTypePane {
 
 	}
 
+	@Override
+	public String getPlotID() {
+		return ChartConstants.MAP_CHART;
+	}
+
 	/**
 	 * 界面标题
      * @return 界面标题