Pull request #1797: CHART-14120 英文设计器地图数据面板截断

Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0

* commit '3285d11d499de50aaa79a003aadee974ae45181c':
  CHART-14120 英文设计器地图数据面板截断

designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanPointMapPlotTableDataContentPane.java

@@ -4,9 +4,11 @@ import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.ilable.BoldFontTextLabel;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
+import com.fr.design.widget.FRWidgetFactory;
 import com.fr.plugin.chart.map.data.VanMapTableDefinitionProvider;
 import com.fr.van.chart.map.designer.data.component.table.AbstractLongLatAreaPane;
 import com.fr.van.chart.map.designer.data.component.table.AreaPane;
@@ -91,6 +93,7 @@ public class VanPointMapPlotTableDataContentPane extends VanAreaMapPlotTableData
 
             double p = TableLayout.PREFERRED;
             double f = TableLayout.FILL;
+            double labelWidth = 65;
 
             this.setLayout(new BorderLayout(0, 5));
             centerPane = new JPanel(new CardLayout()) {
@@ -122,13 +125,14 @@ public class VanPointMapPlotTableDataContentPane extends VanAreaMapPlotTableData
 
             locationType.setSelectedIndex(0);
 
-            double[] columnSize = {p, f};
+            double[] columnSize = {labelWidth, f};
             double[] rowSize = {p};
+            UILabel label = FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Chart_Geographic"));
             Component[][] components = new Component[][]{
-                    new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Geographic")), locationType},
+                    new Component[]{label, locationType},
             };
 
-            JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 30, 6);
+            JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 5, 6);
 
             this.add(panel, BorderLayout.NORTH);
             this.add(centerPane, BorderLayout.CENTER);
@@ -219,7 +223,7 @@ public class VanPointMapPlotTableDataContentPane extends VanAreaMapPlotTableData
         return new PointMapAreaPane(longLatAreaTableComboPane) {
             protected void initAreaPane(VanPointMapPlotTableDataContentPane.LongLatAreaTableComboPane parentPane) {
                 areaPane = new AreaPane(parentPane) {
-                    protected Component[][] getComponent () {
+                    protected Component[][] getComponent() {
                         return new Component[][]{
                                 new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name")), VanPointMapPlotTableDataContentPane.this.createAreaPanel(areaNameCom)}
                         };