Merge pull request #1468 in BA/design from ~PLOUGH/design:release/8.0 to release/8.0

* commit '526b26e690e779adfd5bc718f1e762ddbb856799':
  REPORT-5687 日期选择了yyyy-M-d但是设计器里显示的不对.

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 {