Merge pull request #7706 in DESIGN/design from bugfix/10.0 to feature/10.0

* commit '17fd97ab295b2f1268406ae719b8efb44ed4ebaf':
  REPORT-65950 fix 改成toFront
  REPORT-65950 10.0设计器打开11.0模板时，全局样式丢失和大版本不匹配的弹窗顺序不对

designer-base/src/main/java/com/fr/design/dialog/InformationWarnPane.java

@@ -37,6 +37,17 @@ public class InformationWarnPane extends JPanel{
 	public void show() {
 		showWindow(SwingUtilities.getWindowAncestor(this)).setVisible(true);
 	}
+
+	public void showOnFront() {
+		SwingUtilities.invokeLater(new Runnable() {
+			@Override
+			public void run() {
+				AlertDialog dialog = showWindow(SwingUtilities.getWindowAncestor(InformationWarnPane.this));
+				dialog.setVisible(true);
+				dialog.toFront();
+			}
+		});
+	}
 	
 	public InformationWarnPane(String infor, String moreInfo, String title) {
 		this.title = title;

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

@@ -1096,7 +1096,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
             String info = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Open-New_Form_Tip");
             String moreInfo = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Version_Tip_More_Info");
             if (showTipPane) {
-                new InformationWarnPane(info, moreInfo, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips")).show();
+                new InformationWarnPane(info, moreInfo, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips")).showOnFront();
             }
             return true;
         }
@@ -1119,7 +1119,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
             String infor = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Version_Not_Match", DesignUtils.parseVersion(xmlDesignerVersion));
             String moreInfo = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Version_Tip_More_Info");
             if (showTipPane) {
-                new InformationWarnPane(infor, moreInfo, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips")).show();
+                new InformationWarnPane(infor, moreInfo, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips")).showOnFront();
             }
             return true;
         }