From b6052c4af2ea525d8f530706362c61869fed114d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com>
Date: Mon, 11 May 2020 10:39:53 +0800
Subject: [PATCH] =?UTF-8?q?CHART-13814=20=20=E6=A0=87=E8=AE=B0=E7=82=B9?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/marker/VanChartCommonMarkerPane.java     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/marker/VanChartCommonMarkerPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/marker/VanChartCommonMarkerPane.java
index bda44ccf3..15cba5c8d 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/marker/VanChartCommonMarkerPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/marker/VanChartCommonMarkerPane.java
@@ -2,7 +2,6 @@ package com.fr.van.chart.designer.component.marker;
 
 import com.fr.chart.chartglyph.Marker;
 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;
@@ -57,6 +56,7 @@ public class VanChartCommonMarkerPane extends BasicBeanPane<VanChartAttrMarker>
     }
 
     private static Marker[] normalMarkersWithAuto = null;
+
     protected static Marker[] getNormalMarkersWithAuto() {
         if (normalMarkersWithAuto == null) {
             normalMarkersWithAuto = new Marker[NORMAL_TYPES.length + 1];
@@ -130,17 +130,17 @@ public class VanChartCommonMarkerPane extends BasicBeanPane<VanChartAttrMarker>
                 double p = TableLayout.PREFERRED;
                 double f = TableLayout.FILL;
 
-                double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
+                double e = getColumnSize()[1];
                 double[] columnSize = {f, e};
                 double[] rowSize = {p, p, p};
 
-                return TableLayoutHelper.createGapTableLayoutPane(getPaneComponents(), rowSize, columnSize, 0, LayoutConstants.VGAP_MEDIUM);
+                return TableLayoutHelper.createTableLayoutPane(getPaneComponents(), rowSize, columnSize);
             }
 
             protected Component[][] getPaneComponents() {
                 return new Component[][]{
                         new Component[]{null, null},
-                        new Component[]{null, typeComboBox},
+                        new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Fill_Color")), typeComboBox},
                         new Component[]{null, centerPane},
                 };
             }
@@ -175,7 +175,7 @@ public class VanChartCommonMarkerPane extends BasicBeanPane<VanChartAttrMarker>
 
     protected Component[][] getMarkerConfigComponent() {
         return new Component[][]{
-                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Fill_Color")), markerFillColor},
+                new Component[]{markerFillColor, null},
                 new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Radius")), radius}
         };
     }