DEC-5580 【10.0.2迭代验收】【全局水印】设计器字号可选范围与平台不统一

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

@@ -37,9 +37,12 @@ import java.util.Vector;
  * Pane to edit Font.
  */
 public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObserver {
+    public static final Integer[] FONT_SIZES = {
+            6, 8, 9, 10, 11, 12, 13, 14, 16,
+            18, 20, 22, 24, 26, 28, 30, 32, 34,
+            36, 38, 40, 48, 64, 72, 128
+    };
     private static final int MAX_FONT_SIZE = 100;
-    public static Integer[] FONT_SIZES = {new Integer(6), new Integer(8), new Integer(9), new Integer(10), new Integer(11), new Integer(12), new Integer(14), new Integer(16),
-            new Integer(18), new Integer(20), new Integer(22), new Integer(24), new Integer(26), new Integer(28), new Integer(36), new Integer(48), new Integer(72)};
     private static final Dimension BUTTON_SIZE = new Dimension(20, 18);
     private static final Dimension UNDER_LINE_SIZE = new Dimension(87, 20);
     private static final Dimension HIDE_SIZE = new Dimension(0, 0);

designer-base/src/main/java/com/fr/design/report/WatermarkPane.java

@@ -29,12 +29,6 @@ import java.awt.event.ItemListener;
  * Created by plough on 2018/5/15.
  */
 public class WatermarkPane extends BasicPane {
-    private static final Integer[] FONT_SIZES = {
-            6, 8, 9, 10, 11, 12, 13, 14, 16,
-            18, 20, 22, 24, 26, 28, 30, 32, 34,
-            36, 38, 40, 48, 64, 72, 128
-    };
-
     private static final int MAX_WIDTH = 160;
 
     // 水印预览面板
@@ -102,7 +96,8 @@ public class WatermarkPane extends BasicPane {
 
     protected UIScrollPane initRightPane(){
         formulaPane = new TinyFormulaPane();
-        fontSizeComboBox = new UIComboBox(FONT_SIZES);
+        fontSizeComboBox = new UIComboBox(FRFontPane.FONT_SIZES);
+        fontSizeComboBox.setEditable(true);
         JPanel fontSizeTypePane = new JPanel(new BorderLayout(10,0));
         fontSizeTypePane.add(fontSizeComboBox, BorderLayout.CENTER);