Pull request #6081: REPORT-60071&REPORT-60082 修复视觉问题&补充国际化

Merge in DESIGN/design from ~FANGLEI/design10.0:feature/x to feature/x

* commit '54b42c5491b22bded9216c6560830033cfbbf261':
  REPORT-60082 修复一处可能npe的问题
  REPORT-60071&REPORT-60082 修复视觉问题&补充国际化

designer-form/src/main/java/com/fr/design/designer/beans/models/NewFormModel.java

@@ -1,6 +1,7 @@
 package com.fr.design.designer.beans.models;
 
 import com.fr.design.designer.beans.PredefinedLayout;
+import com.fr.design.i18n.Toolkit;
 import com.fr.general.IOUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
@@ -9,13 +10,20 @@ import com.fr.third.fasterxml.jackson.databind.ObjectMapper;
 import java.io.InputStream;
 import java.io.Serializable;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
 public class NewFormModel implements Serializable {
     private static final String CONFIG_FILE_PATH = "/com/fr/design/form/layouts/config.json";
     private static NewFormModel holder = null;
-    private Map<String, List<PredefinedLayout>> config = new HashMap<>();
+    private Map<String, List<PredefinedLayout>> config = new LinkedHashMap<>();
+
+    private final Map<String, String> i18nMap = new HashMap<String, String>() {{
+        put("2-4", Toolkit.i18nText("Fine-Design_Layout_Two_To_Four_Module"));
+        put("5-7", Toolkit.i18nText("Fine-Design_Layout_Five_To_Seven_Module"));
+        put("multi", Toolkit.i18nText("Fine-Design_Layout_Multi_Module"));
+    }};
 
     public static NewFormModel getInstance() {
         if (holder == null) {
@@ -52,6 +60,9 @@ public class NewFormModel implements Serializable {
     }
 
     public void setConfig(Map<String, List<PredefinedLayout>> config) {
-        this.config = config;
+        for (String key : config.keySet()) {
+            String i18nKey = StringUtils.isNotEmpty(i18nMap.get(key)) ? i18nMap.get(key) : key;
+            this.config.put(i18nKey, config.get(key));
+        }
     }
 }

designer-form/src/main/java/com/fr/design/widget/ui/designer/PredefinedLayoutPane.java

@@ -11,6 +11,7 @@ import com.fr.stable.StringUtils;
 import javax.swing.JPanel;
 import java.awt.CardLayout;
 import java.awt.Color;
+import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Rectangle;
 import java.awt.event.MouseAdapter;
@@ -37,6 +38,7 @@ public class PredefinedLayoutPane extends JPanel {
         this.setLayout(cardLayout);
         this.add(realStyle, 0);
         this.add(simpleStyle, 1);
+        this.setPreferredSize(new Dimension(235, 134));
         this.initListener();
     }
 

designer-form/src/main/resources/com/fr/design/form/layouts/config.json

@@ -1,6 +1,6 @@
 {
     "config":{
-        "2-4模块":[
+        "2-4":[
             {
                 "template":"2-4/1.frm",
                 "realStyle":"real_style_1",
@@ -32,7 +32,7 @@
                 "simpleStyle":"simple_style_6"
             }
         ],
-        "5-7模块":[
+        "5-7":[
             {
                 "template":"5-7/1.frm",
                 "realStyle":"real_style_7",
@@ -64,7 +64,7 @@
                 "simpleStyle":"simple_style_12"
             }
         ],
-        "多模块":[
+        "multi":[
             {
                 "template":"multi/1.frm",
                 "realStyle":"real_style_13",