From fb0d6575de14889736788e0819b4e0d528989cae Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Fri, 23 Apr 2021 14:59:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?REPORT-51317=20=E4=BF=9D=E5=AD=98=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E5=90=8E=EF=BC=8C=E4=BF=9D=E5=AD=98=E4=B8=AD=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E5=8A=A8=E7=94=BB=E8=BF=98=E5=9C=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fr/design/worker/save/SaveWorker.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/designer-base/src/main/java/com/fr/design/worker/save/SaveWorker.java b/designer-base/src/main/java/com/fr/design/worker/save/SaveWorker.java
index 2ce5089705..f6c21f208d 100644
--- a/designer-base/src/main/java/com/fr/design/worker/save/SaveWorker.java
+++ b/designer-base/src/main/java/com/fr/design/worker/save/SaveWorker.java
@@ -52,13 +52,19 @@ public class SaveWorker extends SwingWorker<Boolean, Void> {
         try {
            success = get();
         } catch (Exception e) {
+            processResult();
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
             FineJOptionPane.showMessageDialog(
                     DesignerContext.getDesignerFrame(),
                     Toolkit.i18nText("Fine-Design-Basic_Save_Failure"),
                     com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
                     JOptionPane.ERROR_MESSAGE);
+            return;
         }
+        processResult();
+    }
+
+    private void processResult() {
         this.template.setSaving(false);
         // 恢复界面
         if (slowly && ComparatorUtils.equals(this.template.getName(), HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getName())) {

From e799d65b7ed9b75ddb61d11feaf45e1984b2eef8 Mon Sep 17 00:00:00 2001
From: "Henry.Wang" <Henry.Wang@fanruan.com>
Date: Sun, 25 Apr 2021 11:27:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?CHART-19018=20=E6=8F=92=E5=85=A5=E6=82=AC?=
 =?UTF-8?q?=E6=B5=AE=E5=9B=BE=E8=A1=A8=E5=90=8E=EF=BC=8C=E5=86=8D=E6=8F=92?=
 =?UTF-8?q?=E5=85=A5=E5=8D=95=E5=85=83=E6=A0=BC=E5=9B=BE=E8=A1=A8=EF=BC=8C?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E7=82=B9=E5=87=BA=E5=9B=BE=E8=A1=A8=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E9=9D=A2=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/mainframe/EastRegionContainerPane.java    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java b/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java
index 3d3ab06d01..8097d02f40 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java
@@ -843,10 +843,8 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         }
 
         public void replaceContentPane(JComponent pane) {
-            if (pane != this.contentPane) {
-                contentArea.remove(this.contentPane);
-                contentArea.add(this.contentPane = pane);
-            }
+            contentArea.remove(this.contentPane);
+            contentArea.add(this.contentPane = pane);
             if (popupDialog != null && isPoppedOut) {
                 popupDialog.replaceContentPane(this);
             }