Merge pull request #1515 in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0

* commit '38c8770933d676ff6ddfc164f29dfc51f9d586ef':
  CHART-12820 地图边界内缺少数据
  CHART-13049 英文环境下布局的问题

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.BorderFactory;
-import javax.swing.*;
+import javax.swing.JPanel;
-import java.awt.*;
 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);
     }

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 界面标题