From 05484d3f2e180215dbc1c974a3775f7f2ea23f4c Mon Sep 17 00:00:00 2001
From: zheng <zheng@finereport.com>
Date: Thu, 13 Sep 2018 21:44:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extended/chart/AbstractExtendedChartReportDataPane.java | 6 +++---
 .../fr/extended/chart/ExtendedCustomFieldComboBoxPane.java  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java b/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java
index cfc0886a46..82ebbda6e8 100644
--- a/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java
+++ b/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java
@@ -43,14 +43,14 @@ public abstract class AbstractExtendedChartReportDataPane<T extends AbstractData
         if (hasCustomFieldPane()) {
             seriesPane = new TinyFormulaPane();
             valuePane = new TinyFormulaPane();
-            components[len] = new Component[]{new UILabel("series", SwingConstants.LEFT), seriesPane};
-            components[len + 1] = new Component[]{new UILabel("series", SwingConstants.LEFT), valuePane};
+            components[len] = new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name"), SwingConstants.LEFT), seriesPane};
+            components[len + 1] = new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value"), SwingConstants.LEFT), valuePane};
         }
 
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
         double[] columnSize = {f, COMPONENT_WIDTH};
-        double[] rowSize = new double[len];
+        double[] rowSize = new double[len + (hasCustomFieldPane() ? 2 : 0)];
         Arrays.fill(rowSize, p);
 
         JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 24, 6);
diff --git a/designer-chart/src/main/java/com/fr/extended/chart/ExtendedCustomFieldComboBoxPane.java b/designer-chart/src/main/java/com/fr/extended/chart/ExtendedCustomFieldComboBoxPane.java
index 7d1d1aa039..4201812f31 100644
--- a/designer-chart/src/main/java/com/fr/extended/chart/ExtendedCustomFieldComboBoxPane.java
+++ b/designer-chart/src/main/java/com/fr/extended/chart/ExtendedCustomFieldComboBoxPane.java
@@ -123,9 +123,9 @@ public class ExtendedCustomFieldComboBoxPane extends UIComboBoxPane<AbstractData
             function = new CalculateComboBox();
 
             Component[][] components = new Component[][]{
-                    new Component[]{new UILabel("series", SwingConstants.LEFT), series},
-                    new Component[]{new UILabel("value", SwingConstants.LEFT), value},
-                    new Component[]{new UILabel("function", SwingConstants.LEFT), function},
+                    new Component[]{new UILabel(HEADS[1], SwingConstants.LEFT), series},
+                    new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value"), SwingConstants.LEFT), value},
+                    new Component[]{new UILabel(HEADS[2], SwingConstants.LEFT), function},
             };
 
             double p = TableLayout.PREFERRED;