From 1c728c920e078041a53f794920527749dc4a55ad Mon Sep 17 00:00:00 2001
From: Yvan <Yvan@fanruan.com>
Date: Thu, 13 Aug 2020 19:54:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=B8=8B=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E6=9D=A1=E4=BB=B6=EF=BC=8C=E9=81=BF=E5=85=8D=E4=BB=A5?=
 =?UTF-8?q?=E5=90=8E=E9=87=8D=E5=A4=8D=E5=86=99=E5=88=A4=E6=96=AD=E5=88=86?=
 =?UTF-8?q?=E6=94=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/fr/design/report/ReportColumnsPane.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/design/report/ReportColumnsPane.java b/designer-realize/src/main/java/com/fr/design/report/ReportColumnsPane.java
index 3d36ecd06..108b61e65 100644
--- a/designer-realize/src/main/java/com/fr/design/report/ReportColumnsPane.java
+++ b/designer-realize/src/main/java/com/fr/design/report/ReportColumnsPane.java
@@ -18,6 +18,7 @@ import com.fr.general.GeneralContext;
 import com.fr.general.IOUtils;
 import com.fr.report.stable.WorkSheetAttr;
 import com.fr.report.worksheet.WorkSheet;
+import com.fr.stable.ArrayUtils;
 import com.fr.stable.ColumnRow;
 import com.fr.stable.Constants;
 import com.fr.stable.StringUtils;
@@ -38,11 +39,12 @@ import java.awt.Graphics;
 import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.List;
 
 public class ReportColumnsPane extends BasicPane{
     public static final int ROW = 0;
     public static final int COLUMN = 1;
-    private static final String LOCALE_LANGUAGE_EN = "en";
+    private static final List<String> LOCALE_LANGUAGE = ArrayUtils.toList(new String[]{"en"});
     private int rowOrColumn;
     private boolean isRepeate;
 
@@ -314,7 +316,7 @@ public class ReportColumnsPane extends BasicPane{
         rowPane.setBorder(explainBorder);
         rowPane.setLayout(new FlowLayout(FlowLayout.LEFT, 5,13));
         // Yvan: REPORT-37398 判断设计器语言是否为英文
-        if (StringUtils.equals(GeneralContext.getLocale().getLanguage(), LOCALE_LANGUAGE_EN)) {
+        if (LOCALE_LANGUAGE.contains(GeneralContext.getLocale().getLanguage())) {
             // 如果是英文，需要为这个panel设置更大的height，否则显示不全
             rowPane.setPreferredSize(new Dimension(500,135));
         } else {