Merge pull request #4110 in DESIGN/design from feature/10.0 to research/10.0

* commit '5ffdbc7480a67019e16bd9383d2c20d0f00588e5':
  CHART-19018 插入悬浮图表后，再插入单元格图表，无法点出图表属性面板
  REPORT-51317 保存失败后，保存中加载动画还在

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.remove(this.contentPane);
+            contentArea.add(this.contentPane = pane);
-                contentArea.add(this.contentPane = pane);
-            }
             if (popupDialog != null && isPoppedOut) {
                 popupDialog.replaceContentPane(this);
             }

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())) {