Merge pull request #10757 in DESIGN/design from release/11.0 to bugfix/11.0

* commit '2b5601763ff5784b5ccc7fb1e9d61fbd45ed346d':
  REPORT-85600修复一下错误的名称 顺带着改个名字，看着难受
  REPORT-85293【启动优化】起始页新增加载进度条视觉效果确认 全屏效果在 windows 上需要处理一下。
  REPORT-75091 && REPORT-80693 数据脱敏一期&二期 【问题原因】迭代延期，屏蔽功能入口 【改动思路】同上 【review建议】
  REPORT-85293【启动优化】起始页新增加载进度条视觉效果确认 ProgressDialog 用错了，这个只能是使用的时候才创建 不然大小有问题

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

@@ -3,7 +3,7 @@ package com.fr.design.actions.file;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.file.HistoryTemplateListPane;
-import com.fr.design.file.MutilTempalteTabPane;
+import com.fr.design.file.MultiTemplateTabPane;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.menu.KeySetUtils;
 
@@ -28,9 +28,9 @@ public class CloseCurrentTemplateAction extends UpdateAction {
      * @param e 事件
      */
 	public void actionPerformed(ActionEvent e) {
-		MutilTempalteTabPane.getInstance().setIsCloseCurrent(true);
-		MutilTempalteTabPane.getInstance().closeFormat(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate());
-		MutilTempalteTabPane.getInstance().closeSpecifiedTemplate(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate());
+		MultiTemplateTabPane.getInstance().setIsCloseCurrent(true);
+		MultiTemplateTabPane.getInstance().closeFormat(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate());
+		MultiTemplateTabPane.getInstance().closeSpecifiedTemplate(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate());
 	}
 
 	@Override

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

@@ -7,7 +7,7 @@ import com.fr.design.actions.UpdateAction;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.file.FileOperations;
 import com.fr.design.file.HistoryTemplateListCache;
-import com.fr.design.file.MutilTempalteTabPane;
+import com.fr.design.file.MultiTemplateTabPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
@@ -16,7 +16,6 @@ import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.DesignerFrameFileDealerPane;
-import com.fr.design.mainframe.manager.search.TemplateTreeSearchManager;
 import com.fr.design.mainframe.vcs.common.VcsHelper;
 import com.fr.design.utils.TemplateUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
@@ -89,7 +88,7 @@ public class RenameAction extends UpdateAction {
         }
 
         new FileRenameDialog(node);
-        MutilTempalteTabPane.getInstance().repaint();
+        MultiTemplateTabPane.getInstance().repaint();
         DesignerFrameFileDealerPane.getInstance().stateChange();
     }
 

designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java

@@ -162,8 +162,10 @@ public class PreviewTablePane extends BasicPane {
         JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         // 预览行数面板
         northPane.add(initPreviewNumberPane(), BorderLayout.CENTER);
+        /// 迭代延期，暂时屏蔽下功能入口
         // 脱敏预览设置面板
-        northPane.add(initDesensitizationPane(), BorderLayout.EAST);
+//        northPane.add(initDesensitizationPane(), BorderLayout.EAST);
+        initDesensitizationPane();
         return northPane;
     }
 

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

@@ -75,7 +75,7 @@ public class HistoryTemplateListCache implements CallbackEvent {
             historyList.remove(contains(selected));
             selected.getEditingFILE().closeTemplate();
             FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Basic_Template_Closed_Warn_Text", selected.getEditingFILE().getName()));
-            MutilTempalteTabPane.getInstance().refreshOpenedTemplate(historyList);
+            MultiTemplateTabPane.getInstance().refreshOpenedTemplate(historyList);
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
@@ -134,10 +134,10 @@ public class HistoryTemplateListCache implements CallbackEvent {
         if (contains(jt) == -1) {
             addHistory();
         }
-        MutilTempalteTabPane.getInstance().refreshOpenedTemplate(historyList);
+        MultiTemplateTabPane.getInstance().refreshOpenedTemplate(historyList);
         //设置tab栏为当前选中的那一栏
         if (editingTemplate != null) {
-            MutilTempalteTabPane.getInstance().setSelectedIndex(contains(jt));
+            MultiTemplateTabPane.getInstance().setSelectedIndex(contains(jt));
         }
 
     }
@@ -274,7 +274,7 @@ public class HistoryTemplateListCache implements CallbackEvent {
                 historyList.set(i, new JVirtualTemplate(overTemplate.getEditingFILE()));
             }
         }
-        MutilTempalteTabPane.getInstance().refreshOpenedTemplate(historyList);
+        MultiTemplateTabPane.getInstance().refreshOpenedTemplate(historyList);
     }
 
 
@@ -297,7 +297,7 @@ public class HistoryTemplateListCache implements CallbackEvent {
                 int index = iterator.nextIndex();
                 if (size == index + 1 && index > 0) {
                     //如果删除的是后一个Tab，则定位到前一个
-                    MutilTempalteTabPane.getInstance().setSelectedIndex(index - 1);
+                    MultiTemplateTabPane.getInstance().setSelectedIndex(index - 1);
                 }
             }
         }
@@ -307,13 +307,13 @@ public class HistoryTemplateListCache implements CallbackEvent {
             DesignerContext.getDesignerFrame().addAndActivateJTemplate();
         }
 
-        JTemplate selectedFile = MutilTempalteTabPane.getInstance().getSelectedFile();
+        JTemplate selectedFile = MultiTemplateTabPane.getInstance().getSelectedFile();
         if (!isCurrentEditingFile(selectedFile.getPath())) {
             //如果此时面板上的实时刷新的selectedIndex得到的和历史的不一样
             DesignerContext.getDesignerFrame().activateJTemplate(selectedFile);
         }
 
-        MutilTempalteTabPane.getInstance().repaint();
+        MultiTemplateTabPane.getInstance().repaint();
     }
 
 
@@ -474,7 +474,7 @@ public class HistoryTemplateListCache implements CallbackEvent {
         int index = contains(this.editingTemplate);
         this.editingTemplate = jt;
         historyList.set(index, jt);
-        MutilTempalteTabPane.getInstance().refreshOpenedTemplate(historyList);
-        MutilTempalteTabPane.getInstance().setSelectedIndex(contains(jt));
+        MultiTemplateTabPane.getInstance().refreshOpenedTemplate(historyList);
+        MultiTemplateTabPane.getInstance().setSelectedIndex(contains(jt));
     }
 }

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

@@ -18,14 +18,13 @@ import com.fr.design.mainframe.JTemplate;
 import com.fr.design.mainframe.TemplateSavingChecker;
 import com.fr.design.mainframe.manager.search.TemplateTreeSearchManager;
 import com.fr.design.utils.DesignUtils;
+import com.fr.design.utils.TemplateUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.design.utils.gui.GUIPaintUtils;
 import com.fr.design.worker.WorkerManager;
-import com.fr.design.utils.TemplateUtils;
 import com.fr.design.worker.save.CallbackSaveWorker;
 import com.fr.file.FILE;
 import com.fr.general.ComparatorUtils;
-import com.fr.general.GeneralContext;
 import com.fr.general.IOUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.Constants;
@@ -69,7 +68,6 @@ import java.awt.geom.Line2D;
 import java.awt.geom.Path2D;
 import java.awt.geom.RoundRectangle2D;
 import java.util.List;
-import java.util.Locale;
 
 import static com.fr.design.dialog.FineJOptionPane.showConfirmDialog;
 import static javax.swing.JOptionPane.OK_CANCEL_OPTION;
@@ -77,11 +75,14 @@ import static javax.swing.JOptionPane.OK_OPTION;
 import static javax.swing.JOptionPane.WARNING_MESSAGE;
 
 /**
- * Author : daisy
- * Date: 13-8-5
- * Time: 下午6:12
- */
-public class MutilTempalteTabPane extends JComponent {
+ * 改个名字，一个拼写 n 个错误
+ *
+ * @author daisy
+ * @version 11.0
+ * <p>
+ * created by daisy on 2013/08/05
+ **/
+public class MultiTemplateTabPane extends JComponent {
 
     private static Icon LIST_DOWN = BaseUtils.readIcon("/com/fr/design/images/buttonicon/list_normal.png");
     private static Icon MOUSE_OVER_LIST_DOWN = BaseUtils.readIcon("/com/fr/design/images/buttonicon/list_pressed.png");
@@ -110,7 +111,7 @@ public class MutilTempalteTabPane extends JComponent {
     private static final int MINWIDTH = 100;
 
 
-    private static MutilTempalteTabPane THIS;
+    private static MultiTemplateTabPane THIS;
     //用于存放工作簿
     private java.util.List<JTemplate<?, ?>> openedTemplate;
     //选中的Tab项
@@ -144,9 +145,9 @@ public class MutilTempalteTabPane extends JComponent {
     private JTemplate<?, ?> temTemplate = null;
 
 
-    public static MutilTempalteTabPane getInstance() {
+    public static MultiTemplateTabPane getInstance() {
         if (THIS == null) {
-            THIS = new MutilTempalteTabPane();
+            THIS = new MultiTemplateTabPane();
         }
         return THIS;
     }
@@ -155,7 +156,7 @@ public class MutilTempalteTabPane extends JComponent {
     /**
      * 多工作簿面板
      */
-    public MutilTempalteTabPane() {
+    public MultiTemplateTabPane() {
         this.setLayout(new BorderLayout(0, 0));
         this.addMouseListener(new MultiTemplateTabMouseListener());
         this.addMouseMotionListener(new MultiTemplateTabMouseMotionListener());
@@ -169,7 +170,7 @@ public class MutilTempalteTabPane extends JComponent {
             public void eventDispatched(AWTEvent event) {
                 if (event instanceof MouseEvent) {
                     MouseEvent mv = (MouseEvent) event;
-                    if (mv.getClickCount() > 0 && !ComparatorUtils.equals(mv.getSource(), MutilTempalteTabPane.this)) {
+                    if (mv.getClickCount() > 0 && !ComparatorUtils.equals(mv.getSource(), MultiTemplateTabPane.this)) {
                         isShowList = false;
                     }
                 }
@@ -203,7 +204,7 @@ public class MutilTempalteTabPane extends JComponent {
                         //根据当前i18n语言环境，动态调整popupMenu的宽度
                         menu.setPreferredSize(new Dimension((int) DesignSizeI18nManager.getInstance().
                                 i18nDimension("com.fr.design.file.MultiTemplateTabPane.popUpMenu").getWidth(), height));
-                        GUICoreUtils.showPopupMenu(menu, MutilTempalteTabPane.getInstance(), e.getX(), MutilTempalteTabPane.getInstance().getY() - 1 + MutilTempalteTabPane.getInstance().getHeight());
+                        GUICoreUtils.showPopupMenu(menu, MultiTemplateTabPane.getInstance(), e.getX(), MultiTemplateTabPane.getInstance().getY() - 1 + MultiTemplateTabPane.getInstance().getHeight());
                     }
                 }
             }
@@ -335,7 +336,7 @@ public class MutilTempalteTabPane extends JComponent {
                     DesignerContext.getDesignerFrame().activateJTemplate(currentTemplate);
                 }
 
-                MutilTempalteTabPane.getInstance().repaint();
+                MultiTemplateTabPane.getInstance().repaint();
             }
         }
 
@@ -349,7 +350,7 @@ public class MutilTempalteTabPane extends JComponent {
                     //判断关闭的模板是不是格式刷的被参照的模板
                     openedTemplate.remove(jTemplate);
                     if (jTemplate != currentTemplate) {
-                        MutilTempalteTabPane.getInstance().closeFormat(jTemplate);
+                        MultiTemplateTabPane.getInstance().closeFormat(jTemplate);
                         HistoryTemplateListCache.getInstance().closeSelectedReport(jTemplate);
                         closeAndFreeLock(jTemplate);
                     }
@@ -530,7 +531,7 @@ public class MutilTempalteTabPane extends JComponent {
         for (int i = 0; i < items.length; i++) {
             menu.add(items[i]);
         }
-        GUICoreUtils.showPopupMenu(menu, MutilTempalteTabPane.getInstance(), MutilTempalteTabPane.getInstance().getWidth() - menu.getPreferredSize().width, getY() - 1 + getHeight());
+        GUICoreUtils.showPopupMenu(menu, MultiTemplateTabPane.getInstance(), MultiTemplateTabPane.getInstance().getWidth() - menu.getPreferredSize().width, getY() - 1 + getHeight());
     }
 
 
@@ -1106,7 +1107,7 @@ public class MutilTempalteTabPane extends JComponent {
             listDownMode = LIST_DOWN;
             closeIconIndex = -1;
             mouseOveredIndex = -1;
-            MutilTempalteTabPane.this.repaint();
+            MultiTemplateTabPane.this.repaint();
         }
 
         /**
@@ -1185,7 +1186,7 @@ public class MutilTempalteTabPane extends JComponent {
                         DesignerContext.getDesignerFrame().addAndActivateJTemplate(openedTemplate.get(tempSelectedIndex));
                         FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Form_Authority_Edited_Cannot_Be_Supported")
                                 + "!", Toolkit.i18nText("Fine-Design_Basic_Alert"), JOptionPane.WARNING_MESSAGE);
-                        MutilTempalteTabPane.this.repaint();
+                        MultiTemplateTabPane.this.repaint();
                         return;
                     }
                     JTemplate evtXTemplate = openedTemplate.get(getTemplateIndex(evtX));
@@ -1193,7 +1194,7 @@ public class MutilTempalteTabPane extends JComponent {
                 }
                 isShowList = false;
             }
-            MutilTempalteTabPane.this.repaint();
+            MultiTemplateTabPane.this.repaint();
 
 
         }
@@ -1234,7 +1235,7 @@ public class MutilTempalteTabPane extends JComponent {
             boolean isOverCloseIcon = isOverCloseIcon(evtX);
             clodeMode = isOverCloseIcon ? MOUSE_OVER_CLOSE : CLOSE;
             closeIconIndex = isOverCloseIcon ? mouseOveredIndex : -1;
-            MutilTempalteTabPane.this.repaint();
+            MultiTemplateTabPane.this.repaint();
         }
     }
 

designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java

@@ -21,8 +21,8 @@ import java.awt.Frame;
 /**
  * 加载进度弹窗
  * <em>使用注意点:</em>
- * 1-需要等到 父frame 启动好之后，才能启动进度条。
- * 2-或者到使用时再初始化，不要作为属性存在
+ * 必须到使用时再初始化，不要作为属性存在
+ * 因为涉及到 大小/位置 相对于 parent 的相对判断
  * 见 {@link com.fr.design.gui.iprogressbar.ProgressDialogTest}
  */
 public class ProgressDialog extends UIDialog {

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

@@ -4,7 +4,7 @@ import com.fr.design.DesignState;
 import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.file.HistoryTemplateListCache;
-import com.fr.design.file.MutilTempalteTabPane;
+import com.fr.design.file.MultiTemplateTabPane;
 import com.fr.design.file.NewTemplatePane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.imenu.UIMenuHighLight;
@@ -87,7 +87,7 @@ public class CenterRegionContainerPane extends JPanel {
         eastCenterPane.add(combineUp, BorderLayout.NORTH);
         templateTabPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         templateTabPane.add(newWorkBookPane = getToolBarMenuDock().getNewTemplatePane(), BorderLayout.WEST);
-        templateTabPane.add(MutilTempalteTabPane.getInstance(), BorderLayout.CENTER);
+        templateTabPane.add(MultiTemplateTabPane.getInstance(), BorderLayout.CENTER);
         eastCenterPane.add(templateTabPane, BorderLayout.CENTER);
 
         eastPane.add(eastCenterPane, BorderLayout.CENTER);

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

@@ -21,7 +21,7 @@ import com.fr.design.event.TargetModifiedEvent;
 import com.fr.design.event.TargetModifiedListener;
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.file.HistoryTemplateListPane;
-import com.fr.design.file.MutilTempalteTabPane;
+import com.fr.design.file.MultiTemplateTabPane;
 import com.fr.design.file.SaveSomeTemplatePane;
 import com.fr.design.file.TemplateTreePane;
 import com.fr.design.fun.OemProcessor;
@@ -1110,7 +1110,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         // 新的form不往前兼容
         if (inValidDesigner(jt)) {
             this.addAndActivateJTemplate();
-            MutilTempalteTabPane.getInstance().setTemTemplate(
+            MultiTemplateTabPane.getInstance().setTemTemplate(
                     HistoryTemplateListCache.getInstance().getCurrentEditingTemplate());
         } else {
             this.addAndActivateJTemplate(jt);

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

@@ -21,7 +21,7 @@ import com.fr.design.file.FileOperations;
 import com.fr.design.file.FileToolbarStateChangeListener;
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.file.HistoryTemplateListPane;
-import com.fr.design.file.MutilTempalteTabPane;
+import com.fr.design.file.MultiTemplateTabPane;
 import com.fr.design.file.TemplateTreePane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ilable.UILabel;
@@ -275,7 +275,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter());
         HistoryTemplateListPane.getInstance().setCurrentEditingTemplate(jt);
         //处理自动新建的模板
-        MutilTempalteTabPane.getInstance().doWithtemTemplate();
+        MultiTemplateTabPane.getInstance().doWithtemTemplate();
         if (DesignerMode.isAuthorityEditing()) {
             RolesAlreadyEditedPane.getInstance().refreshDockingView();
         }
@@ -547,10 +547,10 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
             for (JTemplate jTemplate : HistoryTemplateListCache.getInstance().getHistoryList()) {
                 if (ComparatorUtils.equals(jTemplate.getEditingFILE().getPath(), path)) {
                     if (isCurrentEditing) {
-                        MutilTempalteTabPane.getInstance().setIsCloseCurrent(true);
+                        MultiTemplateTabPane.getInstance().setIsCloseCurrent(true);
                     }
-                    MutilTempalteTabPane.getInstance().closeFormat(jTemplate);
-                    MutilTempalteTabPane.getInstance().closeSpecifiedTemplate(jTemplate);
+                    MultiTemplateTabPane.getInstance().closeFormat(jTemplate);
+                    MultiTemplateTabPane.getInstance().closeSpecifiedTemplate(jTemplate);
                     return;
                 }
             }

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

@@ -1,7 +1,7 @@
 package com.fr.design.mainframe.vcs.ui;
 
 import com.fr.design.file.HistoryTemplateListCache;
-import com.fr.design.file.MutilTempalteTabPane;
+import com.fr.design.file.MultiTemplateTabPane;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.DesignerFrameFileDealerPane;
 import com.fr.design.mainframe.JTemplate;
@@ -57,9 +57,9 @@ public class FileVersionCellEditor extends AbstractCellEditor implements TableCe
             jt.stopEditing();
             //只有模板路径一致时关闭当前模板
             if (ComparatorUtils.equals(fileOfVersion, jt.getPath())) {
-                MutilTempalteTabPane.getInstance().setIsCloseCurrent(true);
-                MutilTempalteTabPane.getInstance().closeFormat(jt);
-                MutilTempalteTabPane.getInstance().closeSpecifiedTemplate(jt);
+                MultiTemplateTabPane.getInstance().setIsCloseCurrent(true);
+                MultiTemplateTabPane.getInstance().closeFormat(jt);
+                MultiTemplateTabPane.getInstance().closeSpecifiedTemplate(jt);
             }
 
             //再打开cache中的模板

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

@@ -5,7 +5,7 @@ import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.base.mode.DesignerMode;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.file.HistoryTemplateListCache;
-import com.fr.design.file.MutilTempalteTabPane;
+import com.fr.design.file.MultiTemplateTabPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilable.UILabel;
@@ -115,9 +115,9 @@ public class FileVersionsPanel extends BasicPane {
 
         // 关闭当前打开的版本
         JTemplate<?, ?> jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
-        MutilTempalteTabPane.getInstance().setIsCloseCurrent(true);
-        MutilTempalteTabPane.getInstance().closeFormat(jt);
-        MutilTempalteTabPane.getInstance().closeSpecifiedTemplate(jt);
+        MultiTemplateTabPane.getInstance().setIsCloseCurrent(true);
+        MultiTemplateTabPane.getInstance().closeFormat(jt);
+        MultiTemplateTabPane.getInstance().closeSpecifiedTemplate(jt);
 
         updateDesignerFrame(true);
 

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

@@ -3,7 +3,7 @@ package com.fr.design.worker.open;
 import com.fr.base.chart.exception.ChartNotFoundException;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.file.HistoryTemplateListCache;
-import com.fr.design.file.MutilTempalteTabPane;
+import com.fr.design.file.MultiTemplateTabPane;
 import com.fr.design.file.TemplateTreePane;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.lock.LockInfoDialog;
@@ -87,7 +87,7 @@ public class OpenWorker<T> extends SwingWorker<T, Void> {
                                                   UIManager.getIcon("OptionPane.errorIcon"));
             }
             if (cause.getCause() instanceof TplLockedException) {
-                MutilTempalteTabPane.getInstance().closeCurrentTpl();
+                MultiTemplateTabPane.getInstance().closeCurrentTpl();
                 TemplateTreePane.getInstance().getFileNode().setLock(UUID.randomUUID().toString());
                 LockInfoDialog.show(null);
             }

designer-base/src/main/java/com/fr/nx/app/designer/toolbar/TemplateTransformer.java

@@ -2,7 +2,7 @@ package com.fr.nx.app.designer.toolbar;
 
 import com.fr.base.extension.FileExtension;
 import com.fr.design.file.HistoryTemplateListCache;
-import com.fr.design.file.MutilTempalteTabPane;
+import com.fr.design.file.MultiTemplateTabPane;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.file.FILE;
@@ -103,9 +103,9 @@ public enum TemplateTransformer {
             DesignerContext.getDesignerFrame().openTemplate(file);
             return;
         }
-        MutilTempalteTabPane.getInstance().setIsCloseCurrent(true);
-        MutilTempalteTabPane.getInstance().closeFormat(jt);
-        MutilTempalteTabPane.getInstance().closeSpecifiedTemplate(jt);
+        MultiTemplateTabPane.getInstance().setIsCloseCurrent(true);
+        MultiTemplateTabPane.getInstance().closeFormat(jt);
+        MultiTemplateTabPane.getInstance().closeSpecifiedTemplate(jt);
         DesignerContext.getDesignerFrame().openTemplate(file);
     }
 

designer-base/src/main/java/com/fr/start/BaseDesigner.java

@@ -8,7 +8,7 @@ import com.fr.design.DesignerEnvManager;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.constants.DesignerLaunchStatus;
 import com.fr.design.file.HistoryTemplateListPane;
-import com.fr.design.file.MutilTempalteTabPane;
+import com.fr.design.file.MultiTemplateTabPane;
 import com.fr.design.file.TemplateTreePane;
 import com.fr.design.fun.DesignerStartOpenFileProcessor;
 import com.fr.design.fun.impl.DesignerStartWithEmptyFile;
@@ -193,7 +193,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
         } else {
             df.addAndActivateJTemplate();
             // 如果没有模板，则需要确认一下
-            MutilTempalteTabPane.getInstance().setTemTemplate(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate());
+            MultiTemplateTabPane.getInstance().setTemTemplate(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate());
         }
     }
     
@@ -253,7 +253,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
     private boolean createNewTemplate(DesignerFrame df) {
         df.addAndActivateJTemplate();
         // 如果没有模板，则需要确认一下
-        MutilTempalteTabPane.getInstance().setTemTemplate(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate());
+        MultiTemplateTabPane.getInstance().setTemTemplate(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate());
         return true;
     }
     

designer-base/src/main/java/com/fr/start/common/DesignerOpenEmptyPanel.java

@@ -3,7 +3,7 @@ package com.fr.start.common;
 import com.fr.base.svg.IconUtils;
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.file.HistoryTemplateListPane;
-import com.fr.design.file.MutilTempalteTabPane;
+import com.fr.design.file.MultiTemplateTabPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.DesignSizeI18nManager;
 import com.fr.design.i18n.Toolkit;
@@ -59,7 +59,7 @@ public class DesignerOpenEmptyPanel extends JPanel {
                 HistoryTemplateListCache.getInstance().setCurrentEditingTemplate(null);
                 df.addAndActivateJTemplate();
                 // 如果没有模板，则需要确认一下
-                MutilTempalteTabPane.getInstance().setTemTemplate(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate());
+                MultiTemplateTabPane.getInstance().setTemTemplate(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate());
             }
         });
         createButton.setBorder(new EmptyBorder(0, 10, 0, 10));

designer-base/src/main/java/com/fr/startup/ui/StartupPageWindow.java

@@ -11,12 +11,14 @@ import com.fr.design.layout.VerticalFlowLayout;
 import com.fr.design.ui.util.UIUtil;
 import com.fr.design.utils.ColorUtils;
 import com.fr.design.utils.ThemeUtils;
+import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.exit.DesignerExiter;
 import com.fr.general.GeneralUtils;
 import com.fr.general.IOUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ProductConstants;
 import com.fr.stable.collections.CollectionUtils;
+import com.fr.stable.os.OperatingSystem;
 import com.fr.start.common.DesignerStartupContext;
 import com.fr.startup.metric.DesignerMetrics;
 import org.jetbrains.annotations.NotNull;
@@ -56,9 +58,6 @@ import java.util.Map;
  **/
 public class StartupPageWindow extends JFrame {
     
-    private static final int CONTENT_LAYER = 0;
-    private static final int TRANSPARENT_LAYER = 1;
-    
     private static final Color HOVER_COLOR = new Color(65, 155, 249);
     private static final Color SEP_COLOR = new Color(224, 224, 225);
     
@@ -81,8 +80,6 @@ public class StartupPageWindow extends JFrame {
     
     private JPanel body;
     
-    private StartupLoadingPanel loadingPanel;
-    
     public StartupPageWindow(StartupPageModel pageModel) {
     
         patchUIAction(pageModel);
@@ -102,9 +99,6 @@ public class StartupPageWindow extends JFrame {
         
         setFullScreen();
     
-        // 必须放最后
-        // 见 https://work.fineres.com/browse/REPORT-85293
-        loadingPanel = new StartupLoadingPanel(this);
     }
     
     private void initCenter(StartupPageModel pageModel) {
@@ -181,11 +175,18 @@ public class StartupPageWindow extends JFrame {
         return headerPanel;
     }
     
+    /**
+     * 1-mac启动时全屏
+     * 2-windows 则居中处理
+     */
     private void setFullScreen() {
-        
-        Dimension screenSize = java.awt.Toolkit.getDefaultToolkit().getScreenSize();
-        this.setLocation(0, 0);
-        this.setSize(screenSize.width, screenSize.height);
+    
+        if (OperatingSystem.isMacos()) {
+            this.setLocation(0, 0);
+            this.setSize(SCREEN_SIZE.width, SCREEN_SIZE.height);
+        } else {
+            GUICoreUtils.setWindowFullScreen(this);
+        }
     }
     
     private void addDefaultListeners() {
@@ -232,45 +233,49 @@ public class StartupPageWindow extends JFrame {
     private void enterWorkspace(Runnable action) {
     
         UIUtil.invokeAndWaitIfNeeded(() -> {
+    
+            // 必须直接初始化
+            // 见 https://work.fineres.com/browse/REPORT-85293
+            StartupLoadingPanel loadingPanel = new StartupLoadingPanel(this);
             loadingPanel.show();
             setEnabled(false);
-        });
-        
-        SwingWorker<Void, Void> task = new SwingWorker<Void, Void>() {
-            @Override
-            protected Void doInBackground() throws Exception {
-                action.run();
-                return null;
-            }
     
-            @Override
-            protected void done() {
-    
-                try {
-                    Void result = get();
-                    setVisible(false);
-                } catch (Exception e) {
-                    // 处理错误
-                    UIUtil.invokeLaterIfNeeded(() -> {
-                        UIExpandDialog.Builder()
-                                .owner(StartupPageWindow.this)
-                                .title(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Try"))
-                                .message(Toolkit.i18nText("Fine-Design_Basic_Connection_Failed"))
-                                .messageType(UIExpandDialog.WARNING_MESSAGE)
-                                .detail(e.getMessage())
-                                .expand(true)
-                                .modal(false)
-                                .build()
-                                .setVisible(true);
-                        setEnabled(true);
-                    });
-                    FineLoggerFactory.getLogger().error(e.getMessage(), e);
-                } finally {
-                    loadingPanel.hide();
+            SwingWorker<Void, Void> task = new SwingWorker<Void, Void>() {
+                @Override
+                protected Void doInBackground() throws Exception {
+                    action.run();
+                    return null;
                 }
-            }
-        };
-        task.execute();
+        
+                @Override
+                protected void done() {
+            
+                    try {
+                        Void result = get();
+                        setVisible(false);
+                    } catch (Exception e) {
+                        // 处理错误
+                        UIUtil.invokeLaterIfNeeded(() -> {
+                            UIExpandDialog.Builder()
+                                    .owner(StartupPageWindow.this)
+                                    .title(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Try"))
+                                    .message(Toolkit.i18nText("Fine-Design_Basic_Connection_Failed"))
+                                    .messageType(UIExpandDialog.WARNING_MESSAGE)
+                                    .detail(e.getMessage())
+                                    .expand(true)
+                                    .modal(false)
+                                    .build()
+                                    .setVisible(true);
+                            setEnabled(true);
+                        });
+                        FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                    } finally {
+                        loadingPanel.hide();
+                    }
+                }
+            };
+            task.execute();
+        });
     }
     
     private JPanel generateRecentOpenPanel(StartupPageModel pageModel) {

designer-form/src/main/java/com/fr/design/fit/common/TemplateTool.java

@@ -1,7 +1,7 @@
 package com.fr.design.fit.common;
 
 import com.fr.design.file.HistoryTemplateListCache;
-import com.fr.design.file.MutilTempalteTabPane;
+import com.fr.design.file.MultiTemplateTabPane;
 import com.fr.design.fit.NewJForm;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JTemplate;
@@ -86,7 +86,7 @@ public class TemplateTool {
             JTemplate oldJTemplate = jTemplateList.get(i);
             if (oldJTemplate != null && ComparatorUtils.equals(oldJTemplate.getEditingFILE(), newJTemplate.getEditingFILE())) {
                 jTemplateList.set(i, newJTemplate);
-                MutilTempalteTabPane.getInstance().refreshOpenedTemplate(jTemplateList);
+                MultiTemplateTabPane.getInstance().refreshOpenedTemplate(jTemplateList);
                 return;
             }
         }

designer-form/src/main/java/com/fr/design/preview/DeveloperPreview.java

@@ -1,7 +1,7 @@
 package com.fr.design.preview;
 
 import com.fr.design.file.HistoryTemplateListCache;
-import com.fr.design.file.MutilTempalteTabPane;
+import com.fr.design.file.MultiTemplateTabPane;
 import com.fr.design.fun.impl.AbstractPreviewProvider;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.JForm;
@@ -66,7 +66,7 @@ public class DeveloperPreview extends AbstractPreviewProvider {
     }
 
     private void onPreview(JTemplate<?, ?> jt) {
-        MutilTempalteTabPane.getInstance().closeCurrentTpl();
+        MultiTemplateTabPane.getInstance().closeCurrentTpl();
         jt.generateForBiddenTemplate();
     }
 

designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java

@@ -6,8 +6,6 @@ import com.fr.base.Parameter;
 import com.fr.base.ScreenResolution;
 import com.fr.base.TRL;
 import com.fr.base.extension.FileExtension;
-import com.fr.base.theme.FineColorGather;
-import com.fr.base.theme.FineColorManager;
 import com.fr.base.theme.FineColorSynchronizer;
 import com.fr.base.theme.ReportTheme;
 import com.fr.base.theme.TemplateTheme;
@@ -41,7 +39,7 @@ import com.fr.design.designer.TargetComponent;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.file.HistoryTemplateListPane;
-import com.fr.design.file.MutilTempalteTabPane;
+import com.fr.design.file.MultiTemplateTabPane;
 import com.fr.design.fun.PreviewProvider;
 import com.fr.design.fun.PropertyItemPaneProvider;
 import com.fr.design.fun.ReportSupportedFileUIProvider;
@@ -80,7 +78,6 @@ import com.fr.file.FILEChooserPane;
 import com.fr.file.FileNodeFILE;
 import com.fr.file.filetree.FileNode;
 import com.fr.file.filter.ChooseFileFilter;
-import com.fr.form.main.Form;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.ModuleContext;
 import com.fr.grid.Grid;
@@ -1178,7 +1175,7 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
     public boolean saveShareFile() {
         FILE newFile = createNewEmptyFile();
         //如果文件已经打开, 那么就覆盖关闭掉他
-        MutilTempalteTabPane.getInstance().closeFileTemplate(newFile);
+        MultiTemplateTabPane.getInstance().closeFileTemplate(newFile);
         final WorkBook tpl = this.getTarget();
         // 弹出输入参数
         java.util.Map<String, Object> parameterMap = inputParameters(tpl);

designer-realize/src/main/java/com/fr/start/MainDesigner.java

@@ -16,7 +16,7 @@ import com.fr.design.constants.UIConstants;
 import com.fr.design.deeplink.DeepLinkManager;
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.file.HistoryTemplateListPane;
-import com.fr.design.file.MutilTempalteTabPane;
+import com.fr.design.file.MultiTemplateTabPane;
 import com.fr.design.fun.MenuHandler;
 import com.fr.design.fun.OemProcessor;
 import com.fr.design.gui.ibutton.UIButton;
@@ -387,7 +387,7 @@ public class MainDesigner extends BaseDesigner {
                 for (int i = 0; i < items.length; i++) {
                     menu.add(items[i]);
                 }
-                GUICoreUtils.showPopupMenu(menu, MutilTempalteTabPane.getInstance(), MutilTempalteTabPane.getInstance().getX() - PREVIEW_DOWN_X_GAP, MutilTempalteTabPane.getInstance().getY() - 1 + MutilTempalteTabPane.getInstance().getHeight());
+                GUICoreUtils.showPopupMenu(menu, MultiTemplateTabPane.getInstance(), MultiTemplateTabPane.getInstance().getX() - PREVIEW_DOWN_X_GAP, MultiTemplateTabPane.getInstance().getY() - 1 + MultiTemplateTabPane.getInstance().getHeight());
             }
 
             @Override
@@ -409,8 +409,8 @@ public class MainDesigner extends BaseDesigner {
             return;
         }
         saveButton.setEnabled(!jt.isSaved() && !DesignModeContext.isVcsMode() && jt.checkEnable());
-        MutilTempalteTabPane.getInstance().refreshOpenedTemplate(HistoryTemplateListCache.getInstance().getHistoryList());
-        MutilTempalteTabPane.getInstance().repaint();
+        MultiTemplateTabPane.getInstance().refreshOpenedTemplate(HistoryTemplateListCache.getInstance().getHistoryList());
+        MultiTemplateTabPane.getInstance().repaint();
         if (DesignerEnvManager.getEnvManager().isSupportUndo()) {
             undo.setEnabled(jt.canUndo());
             redo.setEnabled(jt.canRedo());