Browse Source

Merge pull request #1453 in BA/design from ~MOMEAK/design9.0:release/9.0 to release/9.0

* commit 'c159dde5486978b0996d3f0ccfacfbfdf615ca88':
  REPORT-5659 [9.0三轮回归]单元格格式日期型,无法保存
  REPORT-5659 [9.0三轮回归]单元格格式日期型,无法保存
master
superman 7 years ago
parent
commit
d246d50705
  1. 5
      designer_base/src/com/fr/design/gui/style/FormatPane.java

5
designer_base/src/com/fr/design/gui/style/FormatPane.java

@ -258,12 +258,7 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObs
private void setPatternComboBoxAndList(int formatStyle, String pattern) { private void setPatternComboBoxAndList(int formatStyle, String pattern) {
this.typeComboBox.setSelectedItem(formatStyle); this.typeComboBox.setSelectedItem(formatStyle);
int i = isArrayContainPattern(FormatField.getInstance().getFormatArray(formatStyle), pattern);
if (i == -1) {
this.textField.setSelectedItem(pattern); this.textField.setSelectedItem(pattern);
} else {
this.textField.setSelectedIndex(i);
}
} }
private boolean isTimeType(String pattern) { private boolean isTimeType(String pattern) {

Loading…
Cancel
Save