Pull request #12486: REPORT-98345 版本管理三期 修复部分bug

Merge in DESIGN/design from ~DESTINY.LIN/design:release/11.0 to release/11.0

* commit 'eb348a6389cadfc0817afc967cb0cae79a43b5a5':
  REPORT-98345 版本管理三期 版本大小判断错误
  REPORT-100959 【版本管理三期】删除模板目录树不会自动刷新
  REPORT-100960 【版本管理三期】模板未保存的状态下触发还原，还原异常

designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java

@@ -378,8 +378,6 @@ public class TemplateTreePane extends JPanel implements FileOperations {
                 deleteNodes(deletableNodes);
             }
         }
-        Set<FileNode> deletedFileNode = deletableNodes.stream().map(treeNode -> (FileNode) treeNode.getUserObject()).collect(Collectors.toSet());
-        refreshAfterDelete(deletedFileNode);
     }
 
     private void refreshAfterDelete(Set<FileNode> deletedPaths) {
@@ -426,6 +424,8 @@ public class TemplateTreePane extends JPanel implements FileOperations {
                     if (!get()) {
                         showErrorDialog();
                     }
+                    Set<FileNode> deletedFileNode = nodes.stream().map(treeNode -> (FileNode) treeNode.getUserObject()).collect(Collectors.toSet());
+                    refreshAfterDelete(deletedFileNode);
                 } catch (InterruptedException | ExecutionException e) {
                     throw new RuntimeException(e);
                 }

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

@@ -501,10 +501,10 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         public void actionPerformed(ActionEvent e) {
             String path = DesignerFrameFileDealerPane.getInstance().getSelectedOperation().getFilePath();
             path = StableUtils.pathJoin(ProjectConstants.REPORTLETS_NAME, path);
+            boolean currentEditing = isCurrentEditing(path);
+            // 如果模板已经打开了，关掉，避免出现2个同名tab（1个是模板，1个是版本）
+            closeOpenedTemplate(path, currentEditing);
             if (VcsHelper.getInstance().isLegacyMode()) {
-                boolean currentEditing = isCurrentEditing(path);
-                // 如果模板已经打开了，关掉，避免出现2个同名tab（1个是模板，1个是版本）
-                closeOpenedTemplate(path, currentEditing);
                 FileVersionsPanel fileVersionTablePanel = FileVersionsPanel.getInstance();
                 fileVersionTablePanel.showFileVersionsPane();
                 stateChange();

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

@@ -16,7 +16,7 @@ public class VcsTableEntity implements TableEntity{
     private static final String MB = "MB";
 
     private static final String VERSION = "V.";
-    private static final double MB_SIZE = 1024.0;
+    private static final double MB_SIZE = 1024.0 * 1024;
     private VcsEntity entity;