Pull request #4185: REPORT-51305 打开/保存模板时切换时 右侧面板可用问题 + 第一次打开时加载动画问题

Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0

* commit '189e1c9e9a06d58eceb486f715739b553dde6ffc':
  REPORT-51305 打开/保存模板时切换时 右侧面板可用问题 + 第一次打开时加载动画问题

designer-base/src/main/java/com/fr/design/mainframe/DesktopCardPane.java

@@ -89,6 +89,7 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener
     private void checkLoadingPane() {
         if (layeredPane.getComponent(LOADING_LAYER) != loadingPane) {
             layeredPane.add(loadingPane, LOADING_LAYER);
+            component.setVisible(false);
         }
     }
 
@@ -108,11 +109,13 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener
         transparentPane.start();
         layeredPane.moveToFront(transparentPane);
         DesignerContext.getDesignerFrame().refreshUIToolBar();
+        EastRegionContainerPane.getInstance().updateAllPropertyPane();
     }
 
     public void hideCover() {
         transparentPane.stop();
         layeredPane.moveToFront(component);
+        EastRegionContainerPane.getInstance().updateAllPropertyPane();
     }
 
     protected JTemplate<?, ?> getSelectedJTemplate() {

designer-base/src/main/java/com/fr/design/worker/open/OpenWorker.java

@@ -6,7 +6,6 @@ import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.DesignerFrameFileDealerPane;
-import com.fr.design.mainframe.EastRegionContainerPane;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.worker.WorkerManager;
 import com.fr.exception.DecryptTemplateException;
@@ -99,11 +98,10 @@ public class OpenWorker<T> extends SwingWorker<T, Void> {
                     currentTemplate.whenClose();
                     DesignerContext.getDesignerFrame().addAndActivateJTemplate(book);
                     HistoryTemplateListCache.getInstance().replaceCurrentEditingTemplate(book);
-                    EastRegionContainerPane.getInstance().updateAllPropertyPane();
                 } else {
                     // 当前tab页是其他模板
                     for (int i = 0, len = HistoryTemplateListCache.getInstance().getHistoryCount(); i < len; i++) {
-                        JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().get(i);
+                        JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().getTemplate(i);
                         if (ComparatorUtils.equals(template.getEditingFILE(), book.getEditingFILE())) {
                             template.whenClose();
                             HistoryTemplateListCache.getInstance().getHistoryList().set(i, book);

designer-base/src/main/java/com/fr/design/worker/save/SaveWorker.java

@@ -68,7 +68,6 @@ public class SaveWorker extends SwingWorker<Boolean, Void> {
         this.template.setSaving(false);
         // 恢复界面
         if (slowly && ComparatorUtils.equals(this.template.getName(), HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getName())) {
-            EastRegionContainerPane.getInstance().updateAllPropertyPane();
             DesignerContext.getDesignerFrame().refreshUIToolBar();
             DesignerContext.getDesignerFrame().getCenterTemplateCardPane().hideCover();
         }