Pull request #9049: REPORT-72233 图表样式配置千分比样式后查看配置格式变成了数字

Merge in DESIGN/design from ~PENGDA/design:feature/x to feature/x

* commit 'af618b896c7f516b217cfc326f5663f529423e9e':
  REPORT-72233  图表样式配置千分比样式后查看配置格式变成了数字

designer-base/src/main/java/com/fr/design/gui/style/FormatPane.java

@@ -255,6 +255,9 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObse
                 } else if (pattern.indexOf("%") > 0) {
                     setPatternComboBoxAndList(FormatContents.PERCENT, pattern);
                     this.roundingBox.setSelected(((CoreDecimalFormat) format).getRoundingMode().equals(RoundingMode.HALF_UP));
+                } else if (pattern.indexOf("‰") > 0) {
+                    setPatternComboBoxAndList(FormatContents.THOUSANDTHS, pattern);
+                    this.roundingBox.setSelected(((CoreDecimalFormat) format).getRoundingMode().equals(RoundingMode.HALF_UP));
                 } else if (pattern.indexOf("E") > 0) {
                     setPatternComboBoxAndList(FormatContents.SCIENTIFIC, pattern);
                 } else {

designer-base/src/main/java/com/fr/design/style/FormatPane.java

@@ -240,7 +240,7 @@ public class FormatPane extends BasicPane {
         } else if (pattern.endsWith("%")) {
             this.percentRadioButton.setSelected(true);
             this.applyRadioActionListener(this.percentRadioButton);
-        } else if (pattern.equals("‰")){
+        } else if (pattern.endsWith("‰")){
             this.thousandthsRadioButton.setSelected(true);
             this.applyRadioActionListener(this.thousandthsRadioButton);
         } else if (pattern.indexOf("E") > 0) {