From c00b7db525fa89929de4307d0014338d515e898f Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Fri, 14 Aug 2020 11:19:50 +0800
Subject: [PATCH] =?UTF-8?q?CHART-15054=20=E8=B0=83=E6=95=B4=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9D=A2=E6=9D=BF=E6=A0=87=E7=AD=BE=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../table/SeriesNameUseFieldValuePane.java     | 18 +++++++++++-------
 .../report/BoxPlotReportDataContentPane.java   |  2 +-
 .../BoxPlotTableResultDataSeriesPane.java      |  2 +-
 ...oxPlotTableSeriesNameUseFieldValuePane.java |  7 +++++++
 .../data/table/UIComboBoxWithEditLabel.java    |  2 +-
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldValuePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldValuePane.java
index 8511430b3..889e6f530 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldValuePane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldValuePane.java
@@ -99,13 +99,13 @@ public class SeriesNameUseFieldValuePane extends FurtherBasicBeanPane<ChartColle
         double f = TableLayout.FILL;
         double[] columnSize = {f};
         double[] rowSize = {p, p, p, p};
-        UILabel Label1 = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Series_Name"));
-        Label1.setPreferredSize(new Dimension(75, 20));
-        UILabel Label2 = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Series_Value"));
-        Label2.setPreferredSize(new Dimension(75, 20));
-        UILabel Label3 = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Summary_Method"));
-        Label3.setPreferredSize(new Dimension(75, 20));
-        Component[][] components = getUseComponentWithOutSummary(Label1, Label2, Label3);
+        UILabel label1 = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Series_Name"));
+        label1.setPreferredSize(getLabelDimension());
+        UILabel label2 = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Series_Value"));
+        label2.setPreferredSize(getLabelDimension());
+        UILabel label3 = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Summary_Method"));
+        label3.setPreferredSize(getLabelDimension());
+        Component[][] components = getUseComponentWithOutSummary(label1, label2, label3);
 
         centerPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 4, 6);
         centerPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 1));
@@ -113,6 +113,10 @@ public class SeriesNameUseFieldValuePane extends FurtherBasicBeanPane<ChartColle
         this.add(centerPane, BorderLayout.CENTER);
     }
 
+    protected Dimension getLabelDimension() {
+        return new Dimension(75, 20);
+    }
+
     protected Component[][] getUseComponent(UILabel Label1, UILabel Label2, UILabel Label3) {
         return new Component[][]{
                 new Component[]{GUICoreUtils.createBorderLayoutPane(new Component[]{seriesName, null, null, Label1, null})},
diff --git a/designer-chart/src/main/java/com/fr/van/chart/box/data/report/BoxPlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/box/data/report/BoxPlotReportDataContentPane.java
index a2cf8628b..f6d609035 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/box/data/report/BoxPlotReportDataContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/box/data/report/BoxPlotReportDataContentPane.java
@@ -58,7 +58,7 @@ public class BoxPlotReportDataContentPane extends AbstractReportDataContentPane
 
         pane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{dataType, null, null, label, null}));
         pane.setPreferredSize(new Dimension(246, 30));
-        pane.setBorder(BorderFactory.createEmptyBorder(0, 24, 10, 15));
+        pane.setBorder(BorderFactory.createEmptyBorder(0, 18, 10, 15));
 
         return pane;
     }
diff --git a/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableResultDataSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableResultDataSeriesPane.java
index bdaf58a34..cfd3ea8d5 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableResultDataSeriesPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableResultDataSeriesPane.java
@@ -65,7 +65,7 @@ public class BoxPlotTableResultDataSeriesPane extends AbstractTableDataContentPa
 
     private JPanel createUIComboBoxPane(UIComboBox comboBox, String title) {
         UILabel label = new UILabel(title);
-        label.setPreferredSize(new Dimension(75, 20));
+        label.setPreferredSize(new Dimension(80, 20));
 
         JPanel panel = new JPanel();
 
diff --git a/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableSeriesNameUseFieldValuePane.java b/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableSeriesNameUseFieldValuePane.java
index 93319f5c3..f8069d30c 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableSeriesNameUseFieldValuePane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableSeriesNameUseFieldValuePane.java
@@ -1,12 +1,19 @@
 package com.fr.van.chart.box.data.table;
 
 import com.fr.chart.chartdata.OneValueCDDefinition;
+import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.data.table.SeriesNameUseFieldValuePane;
 import com.fr.plugin.chart.box.data.VanBoxOneValueCDDefinition;
 
+import java.awt.Dimension;
+
 public class BoxPlotTableSeriesNameUseFieldValuePane extends SeriesNameUseFieldValuePane {
 
     protected OneValueCDDefinition createOneValueCDDefinition() {
         return new VanBoxOneValueCDDefinition();
     }
+
+    protected Dimension getLabelDimension() {
+        return new Dimension(ChartDataPane.LABEL_WIDTH, ChartDataPane.LABEL_HEIGHT);
+    }
 }
diff --git a/designer-chart/src/main/java/com/fr/van/chart/box/data/table/UIComboBoxWithEditLabel.java b/designer-chart/src/main/java/com/fr/van/chart/box/data/table/UIComboBoxWithEditLabel.java
index 339203860..3ba858364 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/box/data/table/UIComboBoxWithEditLabel.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/box/data/table/UIComboBoxWithEditLabel.java
@@ -29,7 +29,7 @@ public abstract class UIComboBoxWithEditLabel extends JPanel implements UIObserv
             }
         };
 
-        editLabel.setPreferredSize(new Dimension(75, 20));
+        editLabel.setPreferredSize(new Dimension(80, 20));
         comboBox = new UIComboBox();
 
         this.setLayout(new BorderLayout(4, 0));