Merge pull request #2932 in DESIGN/design from bugfix/10.0 to feature/10.0

* commit 'a9abdaac1067e736bc0fefa36147d16b71e2e7a1':
  REPORT-43905 重试错误输出改成warn
  REPORT-43516 【视觉优化】页面设置与重复与冻结设置图标优化 【问题原因】页面设置和重复与冻结设置的图标重复了 【改动方案】更换重复与冻结设置的图标
  MOBILE-27967 【设计器】tab样式自定义设置以后，切换回标准，在切换自定义之前设置未保留

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileTemplateStyleDefinePane.java

@@ -44,6 +44,7 @@ public abstract class MobileTemplateStyleDefinePane extends BasicBeanPane<Mobile
     private JPanel centerPane;
     protected MobileTemplatePreviewPane previewPane;
     private WCardTagLayout tagLayout;
+    private MobileTemplateStyle customTempStyle;
 
 
     public MobileTemplatePreviewPane getPreviewPane() {
@@ -87,6 +88,14 @@ public abstract class MobileTemplateStyleDefinePane extends BasicBeanPane<Mobile
         custom.addItemListener(new ItemListener() {
             @Override
             public void itemStateChanged(ItemEvent e) {
+                // 自定义 -> 标准
+                if (custom.getSelectedIndex() == 0) {
+                    customTempStyle = getCustomMobileTemplateStyle();
+                }
+                // 标准 -> 自定义
+                if (custom.getSelectedIndex() == 1 && customTempStyle != null) {
+                    populateBean(customTempStyle);
+                }
                 boolean isCustom = custom.getSelectedIndex() == 1;
                 centerPane.setVisible(isCustom);
                 updatePreviewPane();
@@ -182,8 +191,24 @@ public abstract class MobileTemplateStyleDefinePane extends BasicBeanPane<Mobile
 
     protected abstract MobileTemplatePreviewPane createPreviewPane();
 
+    public MobileTemplateStyle getCustomMobileTemplateStyle() {
+        MobileTemplateStyle ob = updateSubStyle();
+        ob.setCustom(true);
+        if (initialColorBox != null) {
+            ob.setInitialColor(initialColorBox.getSelectObject());
+        }
+        if (fontConfPane != null) {
+            TabFontConfig config = new TabFontConfig();
+            config.setSelectColor(ob.getTabFontConfig().getSelectColor());
+            config.setFont(fontConfPane.update());
+            ob.setTabFontConfig(config);
+        }
+        return ob;
+    }
+
     @Override
     public void populateBean(MobileTemplateStyle ob) {
+        customTempStyle = ob.getCustomTemplateStyle();
         centerPane.setVisible(ob.isCustom());
         populateSubStyle(ob);
         custom.setSelectedItem(!ob.isCustom() ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default") :
@@ -211,7 +236,9 @@ public abstract class MobileTemplateStyleDefinePane extends BasicBeanPane<Mobile
 
     public MobileTemplateStyle updateConfig(){
         if (custom.getSelectedIndex() == 0) {
-            return getDefaultTemplateStyle();
+            MobileTemplateStyle mobileTemplateStyle = getDefaultTemplateStyle();
+            mobileTemplateStyle.setCustomTemplateStyle(customTempStyle);
+            return mobileTemplateStyle;
         }
         MobileTemplateStyle ob = updateSubStyle();
         ob.setCustom(custom.getSelectedIndex() == 1);

designer-realize/src/main/java/com/fr/design/actions/report/ReportPageAttrAction.java

@@ -27,7 +27,7 @@ public class ReportPageAttrAction extends ReportComponentAction<WorkSheetDesigne
         this.setMenuKeySet(KeySetUtils.REPORT_PAGE);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/m_file/pageSetup.png"));
+        this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/m_file/repeatAndFrozen.png"));
         this.generateAndSetSearchText(RepeatAndFreezeSettingPane.class.getName());
     }
 

designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java

@@ -131,7 +131,7 @@ public class DesignerSocketIO {
     private static final Emitter.Listener failRetry = new Emitter.Listener() {
         @Override
         public void call(Object... args) {
-            FineLoggerFactory.getLogger().error("failed args: {}", Arrays.toString(args));
+            FineLoggerFactory.getLogger().warn("failed args: {}", Arrays.toString(args));
             status = Status.Disconnecting;
             socket.close();
             count++;

designer-realize/src/main/java/com/fr/start/preload/ImagePreLoader.java

@@ -317,6 +317,7 @@ public class ImagePreLoader {
             "com/fr/web/images/print.png",
             "com/fr/design/images/m_report/watermark.png",
             "com/fr/design/images/m_file/pageSetup.png",
+            "com/fr/design/images/m_file/repeatAndFrozen.png",
             "com/fr/design/images/m_report/header.png",
             "com/fr/design/images/m_report/footer.png",
             "com/fr/design/images/m_report/background.png",