Pull request #1829: REPORT-35108 && REPORT-34895

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

* commit '1a7bf4bfe0e50341a6451afee254b166ad31d790':
  REPORT-35108 && REPORT-34895

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

@@ -1,6 +1,7 @@
 package com.fr.design.actions.file;
 
 import java.awt.event.ActionEvent;
+import java.io.File;
 import java.util.List;
 
 import com.fr.base.BaseUtils;
@@ -11,6 +12,7 @@ import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.menu.KeySetUtils;
 import com.fr.design.menu.MenuDef;
 import com.fr.file.FILEFactory;
+import com.fr.file.FileFILE;
 
 /**
  * Open Resent MenuDef.
@@ -68,8 +70,13 @@ public class OpenRecentReportMenuDef extends MenuDef {
          * @param e 事件
          */
         public void actionPerformed(ActionEvent e) {
+            File file = new File(this.getPath());
+            if (file.exists()) {
+                DesignerContext.getDesignerFrame().openTemplate(new FileFILE(file));
+            } else {
                 DesignerContext.getDesignerFrame().openTemplate(FILEFactory.createFILE(this.getPath()));
             }
+        }
 
         public String getPath() {
             return this.getName();

designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java

@@ -238,6 +238,7 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
 
         dlg.setModal(false);
         dlg.setVisible(true);
+        dlg.setAlwaysOnTop(true);
     }
 
     private void showDialogAfterAddCellAction() {