Merge branch 'release/10.0' of https://code.fineres.com/scm/~henry.wang/design into release/10.0

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

@@ -83,7 +83,7 @@ public class TemplateTreePane extends JPanel implements FileOperations {
 
             @Override
             public void mousePressed(MouseEvent evt) {
-                if (evt.getClickCount() == 2) {
+                if (reportletsTree.getPathForLocation(evt.getX(), evt.getY()) != null && evt.getClickCount() == 2) {
                     openFile();
                 }
             }

designer-form/src/main/java/com/fr/design/form/util/FormDesignerUtils.java

@@ -36,6 +36,9 @@ public class FormDesignerUtils {
      * @return
      */
     public static boolean isBodyAbsolute(FormDesigner designer) {
+        if (!designer.getRootComponent().acceptType(XWFitLayout.class)) {
+            return false;
+        }
         WFitLayout root = ((WFitLayout) designer.getRootComponent().toData());
         return root.getBodyLayoutType() == com.fr.form.ui.container.WBodyLayoutType.ABSOLUTE;
     }

designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java

@@ -62,12 +62,12 @@ public class DesignerWorkspaceProvider extends Activator {
                 } else {
                     WorkContext.switchTo(workspace);
                     //在设计器完全启动完成后，对初始环境进行一次服务检测，对主要功能无影响，异常仅做日志提示即可
-                    final DesignerWorkspaceInfo selectEnv = workspaceInfo;
+                    final String selectEnv = current;
                     EventDispatcher.listen(DesignerLaunchStatus.STARTUP_COMPLETE, new Listener<Null>() {
                         @Override
                         public void on(Event event, Null aNull) {
                             try {
-                               VersionCheckUtils.showVersionCheckDialog(selectEnv.getName());
+                               VersionCheckUtils.showVersionCheckDialog(selectEnv);
                             } catch (Exception e) {
                                 FineLoggerFactory.getLogger().warn("Check Service Failed");
                             }