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

* commit 'c6e31aa55093c1fd557fdf21ad12faaabd1f544d':
  无jira任务，优化模板打开速度

designer/src/com/fr/design/report/mobile/AppFitPreviewPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.report.mobile;
 
+import com.fr.design.constants.UIConstants;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
@@ -31,16 +32,16 @@ public class AppFitPreviewPane extends BasicPane{
     }
 
     private void initCacheImage() {
-        cachedVerticalPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/V0.png")));
-        cachedVerticalPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/V1.png")));
-        cachedVerticalPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/V2.png")));
-        cachedVerticalPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/V3.png")));
-        cachedVerticalPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/V4.png")));
-        cachedHorizonPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/H0.png")));
-        cachedHorizonPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/H1.png")));
-        cachedHorizonPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/H2.png")));
-        cachedHorizonPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/H3.png")));
-        cachedHorizonPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/H4.png")));
+        cachedVerticalPreviewImage.add(new ImageIcon(UIConstants.APPFIT_V0));
+        cachedVerticalPreviewImage.add(new ImageIcon(UIConstants.APPFIT_V1));
+        cachedVerticalPreviewImage.add(new ImageIcon(UIConstants.APPFIT_V2));
+        cachedVerticalPreviewImage.add(new ImageIcon(UIConstants.APPFIT_V3));
+        cachedVerticalPreviewImage.add(new ImageIcon(UIConstants.APPFIT_V4));
+        cachedHorizonPreviewImage.add(new ImageIcon(UIConstants.APPFIT_H0));
+        cachedHorizonPreviewImage.add(new ImageIcon(UIConstants.APPFIT_H1));
+        cachedHorizonPreviewImage.add(new ImageIcon(UIConstants.APPFIT_H2));
+        cachedHorizonPreviewImage.add(new ImageIcon(UIConstants.APPFIT_H3));
+        cachedHorizonPreviewImage.add(new ImageIcon(UIConstants.APPFIT_H4));
     }
 
     private void initComponents() {

designer_base/src/com/fr/design/constants/UIConstants.java

@@ -18,8 +18,19 @@ import java.awt.image.BufferedImage;
 public interface UIConstants {
 
     public static final Icon CPT_ICON = BaseUtils.readIcon("/com/fr/base/images/oem/cpt.png");
-
     public static final Icon BLACK_ICON = BaseUtils.readIcon("/com/fr/base/images/cell/blank.gif");
+
+    public static final Image APPFIT_V0 = BaseUtils.readImage("/com/fr/design/images/dialog/appfit/V0.png");
+    public static final Image APPFIT_V1 = BaseUtils.readImage("/com/fr/design/images/dialog/appfit/V1.png");
+    public static final Image APPFIT_V2 = BaseUtils.readImage("/com/fr/design/images/dialog/appfit/V2.png");
+    public static final Image APPFIT_V3 = BaseUtils.readImage("/com/fr/design/images/dialog/appfit/V3.png");
+    public static final Image APPFIT_V4 = BaseUtils.readImage("/com/fr/design/images/dialog/appfit/V4.png");
+    public static final Image APPFIT_H0 = BaseUtils.readImage("/com/fr/design/images/dialog/appfit/H0.png");
+    public static final Image APPFIT_H1 = BaseUtils.readImage("/com/fr/design/images/dialog/appfit/H1.png");
+    public static final Image APPFIT_H2 = BaseUtils.readImage("/com/fr/design/images/dialog/appfit/H2.png");
+    public static final Image APPFIT_H3 = BaseUtils.readImage("/com/fr/design/images/dialog/appfit/H3.png");
+    public static final Image APPFIT_H4 = BaseUtils.readImage("/com/fr/design/images/dialog/appfit/H4.png");
+
     public static final Border CELL_ATTR_ZEROBORDER = BorderFactory.createEmptyBorder(0, 0, 0, 0);
     public static final Border CELL_ATTR_EMPTYBORDER = BorderFactory.createEmptyBorder(0, 10, 0, 0);
     public static final Border CELL_ATTR_PRESENTBORDER = BorderFactory.createEmptyBorder(0, 5, 0, 0);