From b5a4577e47874323d88aa3b85da8a4384e1c6e98 Mon Sep 17 00:00:00 2001
From: plough <plough@fanruan.com>
Date: Thu, 16 Nov 2017 14:30:03 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-5687=20=E6=97=A5=E6=9C=9F=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E4=BA=86yyyy-M-d=E4=BD=86=E6=98=AF=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=99=A8=E9=87=8C=E6=98=BE=E7=A4=BA=E7=9A=84=E4=B8=8D=E5=AF=B9?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer_base/src/com/fr/design/gui/style/FormatPane.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer_base/src/com/fr/design/gui/style/FormatPane.java b/designer_base/src/com/fr/design/gui/style/FormatPane.java
index c426bbed26..d799858776 100644
--- a/designer_base/src/com/fr/design/gui/style/FormatPane.java
+++ b/designer_base/src/com/fr/design/gui/style/FormatPane.java
@@ -222,7 +222,7 @@ public class FormatPane extends AbstractBasicStylePane {
 
     private void setPatternComboBoxAndList(int formatStyle, String pattern) {
         this.typeComboBox.setSelectedItem(formatStyle);
-        int i = isArrayContainPattern(FormatField.getInstance().getFormatArray(formatStyle), pattern);
+        int i = isArrayContainPattern(FormatField.getInstance().getFormatArray(formatStyle, false), pattern);
         if (i == -1) {
             this.patternList.setSelectedIndices(ArrayUtils.EMPTY_INT_ARRAY);
         } else {