Pull request #1645: CHART-13814 标记点配置面板调整

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

* commit '9de0f783bf02d8b495c6a17fc4e6d8fda4e781df':
  CHART-13814 标记点配置面板调整

designer-chart/src/main/java/com/fr/van/chart/designer/component/marker/VanChartCommonMarkerPane.java

@@ -1,12 +1,14 @@
 package com.fr.van.chart.designer.component.marker;
 
 import com.fr.chart.chartglyph.Marker;
-import com.fr.design.i18n.Toolkit;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.constants.LayoutConstants;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
 import com.fr.design.gui.xcombox.MarkerComboBox;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
 import com.fr.plugin.chart.base.VanChartAttrMarker;
 import com.fr.plugin.chart.marker.type.MarkerType;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
@@ -42,6 +44,7 @@ public class VanChartCommonMarkerPane extends BasicBeanPane<VanChartAttrMarker>
             MarkerType.MARKER_TRIANGLE_HOLLOW
     };
     private static Marker[] normalMarkers = null;
+
     protected static Marker[] getNormalMarkers() {
         if (normalMarkers == null) {
             normalMarkers = new Marker[NORMAL_TYPES.length];
@@ -80,6 +83,7 @@ public class VanChartCommonMarkerPane extends BasicBeanPane<VanChartAttrMarker>
             MarkerType.MARKER_TRIANGLE_HOLLOW
     };
     private static Marker[] mapMarkers = null;
+
     protected static Marker[] getMapScatterMarkers() {
         if (mapMarkers == null) {
             mapMarkers = new Marker[MAP_TYPES.length];
@@ -99,6 +103,7 @@ public class VanChartCommonMarkerPane extends BasicBeanPane<VanChartAttrMarker>
             MarkerType.MARKER_STAR
     };
     private static Marker[] ganttMarkers = null;
+
     protected static Marker[] getGanttMarkers() {
         if (ganttMarkers == null) {
             ganttMarkers = new Marker[GANTT_TYPES.length];
@@ -121,10 +126,22 @@ public class VanChartCommonMarkerPane extends BasicBeanPane<VanChartAttrMarker>
     public VanChartCommonMarkerPane() {
         markerTypeComboBox = new MarkerComboBox(getMarkers());
         markerFillColor = new VanChartMarkerBackgroundPane() {
+            protected JPanel initContentPanel() {
+                double p = TableLayout.PREFERRED;
+                double f = TableLayout.FILL;
+
+                double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
+                double[] columnSize = {f, e};
+                double[] rowSize = {p, p, p};
+
+                return TableLayoutHelper.createGapTableLayoutPane(getPaneComponents(), rowSize, columnSize, 0, LayoutConstants.VGAP_MEDIUM);
+            }
+
             protected Component[][] getPaneComponents() {
                 return new Component[][]{
-                        new Component[]{typeComboBox, null},
+                        new Component[]{null, null},
-                        new Component[]{centerPane, null},
+                        new Component[]{null, typeComboBox},
+                        new Component[]{null, centerPane},
                 };
             }
         };
@@ -214,6 +231,7 @@ public class VanChartCommonMarkerPane extends BasicBeanPane<VanChartAttrMarker>
     protected MarkerType populateMarkType(VanChartAttrMarker marker) {
         return marker.getMarkerType();
     }
+
     /**
      * Update.
      */