Merge pull request #4359 in DESIGN/design from release/10.0 to bugfix/10.0

* commit 'd016733842ee8a36ec84ca248ae035fcffc3d06a':
  REPORT-52824 10.0.16 模板另存不会生成新的模板id
  REPORT-52264 修改弹窗的父窗口为DesignerContext.getDesignerFrame()
  REPORT-52264 模版权限编辑警告弹窗不在页面中间

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

@@ -967,7 +967,7 @@ public class MutilTempalteTabPane extends JComponent {
                     //如果在权限编辑情况下，不允许切换到表单类型的工作簿
                     if (DesignerMode.isAuthorityEditing() && !openedTemplate.get(selectedIndex).isJWorkBook()) {
                         DesignerContext.getDesignerFrame().addAndActivateJTemplate(openedTemplate.get(tempSelectedIndex));
-                        FineJOptionPane.showMessageDialog(MutilTempalteTabPane.this, Toolkit.i18nText("Fine-Design_Basic_Form_Authority_Edited_Cannot_Be_Supported")
+                        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();
                         return;

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

@@ -1465,10 +1465,8 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
             editingFILE = fileChooser.getSelectedFILE();
         }
 
-        // 在保存之前，初始化 templateID
+        //收集和生成templateID  因为是另存为操作 无论怎么样都需要重新生成templateID
-        if (StringUtils.isEmpty(this.template.getTemplateID())) {
+        initForCollect();
-            generateTemplateId();
-        }
 
         FILE finalEditingFILE = editingFILE;
         CallbackSaveWorker worker = new CallbackSaveWorker(new Callable<Boolean>() {