From 9c287606d8fef68fda99e2d1cb6000d32c93ca3d Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Fri, 20 Nov 2020 17:02:10 +0800
Subject: [PATCH 1/3] =?UTF-8?q?MOBILE-27967=20=E3=80=90=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=99=A8=E3=80=91tab=E6=A0=B7=E5=BC=8F=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E8=AE=BE=E7=BD=AE=E4=BB=A5=E5=90=8E=EF=BC=8C=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E5=9B=9E=E6=A0=87=E5=87=86=EF=BC=8C=E5=9C=A8=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E8=87=AA=E5=AE=9A=E4=B9=89=E4=B9=8B=E5=89=8D=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E6=9C=AA=E4=BF=9D=E7=95=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/MobileTemplateStyleDefinePane.java     | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileTemplateStyleDefinePane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileTemplateStyleDefinePane.java
index 6dc2da5e9..ae8cbeb3a 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileTemplateStyleDefinePane.java
+++ b/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);

From 8c462edfddfe614315ad84f4a450d42d8c34a0b9 Mon Sep 17 00:00:00 2001
From: Yvan <Yvan@fanruan.com>
Date: Mon, 23 Nov 2020 09:55:30 +0800
Subject: [PATCH 2/3] =?UTF-8?q?REPORT-43516=20=E3=80=90=E8=A7=86=E8=A7=89?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=91=E9=A1=B5=E9=9D=A2=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=8E=E9=87=8D=E5=A4=8D=E4=B8=8E=E5=86=BB=E7=BB=93=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E5=9B=BE=E6=A0=87=E4=BC=98=E5=8C=96=20=E3=80=90?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=8E=9F=E5=9B=A0=E3=80=91=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=92=8C=E9=87=8D=E5=A4=8D=E4=B8=8E=E5=86=BB?=
 =?UTF-8?q?=E7=BB=93=E8=AE=BE=E7=BD=AE=E7=9A=84=E5=9B=BE=E6=A0=87=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E4=BA=86=20=E3=80=90=E6=94=B9=E5=8A=A8=E6=96=B9?=
 =?UTF-8?q?=E6=A1=88=E3=80=91=E6=9B=B4=E6=8D=A2=E9=87=8D=E5=A4=8D=E4=B8=8E?=
 =?UTF-8?q?=E5=86=BB=E7=BB=93=E8=AE=BE=E7=BD=AE=E7=9A=84=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/images/m_file/repeatAndFrozen.png   | Bin 0 -> 233 bytes
 .../actions/report/ReportPageAttrAction.java      |   4 ++--
 .../java/com/fr/start/preload/ImagePreLoader.java |   1 +
 3 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 designer-base/src/main/resources/com/fr/design/images/m_file/repeatAndFrozen.png

diff --git a/designer-base/src/main/resources/com/fr/design/images/m_file/repeatAndFrozen.png b/designer-base/src/main/resources/com/fr/design/images/m_file/repeatAndFrozen.png
new file mode 100644
index 0000000000000000000000000000000000000000..adc5428a7dc046443c015e18c5df47ceb2b0dc33
GIT binary patch
literal 233
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-FJY5_^
zECkmEIr23q@Gw7SuIcKm`2O-<>yhO@n3qfv+O(tj0bgEn_U^`GC9_!TB4ctMavrq*
zp~lq3r+dnD+3W-rY4@amC%reExqsru<vmRC3)U!vt~hXPO8m83!nKCSEa&=ngfcN*
zWMRJXJK6coon40yhcv~Ui}#tl=8t}l;-Y(u4l#?>CU3NAjA3+`clC%?V~A56bEH1Y
hrW12kvHW?L-}llnWZHV6$w0R<c)I$ztaD0e0sxoDT#x_&

literal 0
HcmV?d00001

diff --git a/designer-realize/src/main/java/com/fr/design/actions/report/ReportPageAttrAction.java b/designer-realize/src/main/java/com/fr/design/actions/report/ReportPageAttrAction.java
index 8c804863e..2b819a398 100644
--- a/designer-realize/src/main/java/com/fr/design/actions/report/ReportPageAttrAction.java
+++ b/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());
     }
 
@@ -58,4 +58,4 @@ public class ReportPageAttrAction extends ReportComponentAction<WorkSheetDesigne
         dlg.setVisible(true);
         return returnValue;
     }
-}
\ No newline at end of file
+}
diff --git a/designer-realize/src/main/java/com/fr/start/preload/ImagePreLoader.java b/designer-realize/src/main/java/com/fr/start/preload/ImagePreLoader.java
index 1204f9a88..0c38d731e 100644
--- a/designer-realize/src/main/java/com/fr/start/preload/ImagePreLoader.java
+++ b/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",

From 23f9133c0b0baf4400749d13095879684d5a1562 Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Mon, 23 Nov 2020 15:50:51 +0800
Subject: [PATCH 3/3] =?UTF-8?q?REPORT-43905=20=E9=87=8D=E8=AF=95=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E8=BE=93=E5=87=BA=E6=94=B9=E6=88=90warn?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/mainframe/socketio/DesignerSocketIO.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java b/designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java
index 2316a19a3..33b3b80f7 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java
+++ b/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++;