Merge remote-tracking branch 'origin/feature/x' into feature/x

designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java

@@ -410,7 +410,9 @@ public class EnvChangeEntrance {
                     DesignerExiter.getInstance().execute();
                 } else {
                     updateNotRememberPwdEnv();
-                    VersionCheckUtils.showVersionCheckDialog(envListPane.getSelectedName());
+                    if (DesignerContext.getDesignerFrame().isVisible()) {
+                        VersionCheckUtils.showVersionCheckDialog(envListPane.getSelectedName());
+                    }
                 }
             }
 

designer-base/src/main/java/com/fr/design/versioncheck/VersionCheckUtils.java

@@ -52,6 +52,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+import javax.swing.SwingWorker;
 
 /**
  * @author pengda
@@ -95,9 +96,23 @@ public class VersionCheckUtils {
     }
 
     public static void showVersionCheckDialog(String envName) {
-        if (!VersionCheckUtils.versionCheck(envName)) {
-            showNotificationDialog(envName);
-        }
+        new SwingWorker<Boolean, Void>() {
+            @Override
+            protected Boolean doInBackground() {
+                return !VersionCheckUtils.versionCheck(envName);
+            }
+
+            @Override
+            protected void done() {
+                try {
+                    if (get()) {
+                        showNotificationDialog(envName);
+                    }
+                } catch (Exception e) {
+                    FineLoggerFactory.getLogger().warn(e.getMessage(), e);
+                }
+            }
+        }.execute();
     }
 
     private static void showNotificationDialog(String envName) {

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

@@ -18,6 +18,7 @@ import com.fr.design.mainframe.DesignerFrame;
 import com.fr.design.mainframe.toolbar.ToolBarMenuDock;
 import com.fr.design.monitor.DesignerLifecycleMonitorContext;
 import com.fr.design.ui.util.UIUtil;
+import com.fr.design.versioncheck.VersionCheckUtils;
 import com.fr.event.Event;
 import com.fr.event.EventDispatcher;
 import com.fr.event.Listener;
@@ -90,10 +91,19 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
                 EventDispatcher.fire(WorkspaceStatus.Prepared);
                 EventDispatcher.asyncFire(LazyStartupEvent.INSTANCE);
                 collectUserInformation();
+                checkVersion();
             }
         });
     }
 
+    private void checkVersion() {
+        try {
+            VersionCheckUtils.showVersionCheckDialog(DesignerEnvManager.getEnvManager().getCurEnvName());
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().warn("Check Service Failed");
+        }
+    }
+
     public void show() {
         UIUtil.invokeLaterIfNeeded(this::refreshTemplateTree);
     }

designer-realize/src/main/java/com/fr/poly/creator/ECBlockEditor.java

@@ -3,7 +3,6 @@
  */
 package com.fr.poly.creator;
 
-import com.fr.base.BaseUtils;
 import com.fr.base.ScreenResolution;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.design.constants.UIConstants;
@@ -11,7 +10,15 @@ import com.fr.design.event.TargetModifiedEvent;
 import com.fr.design.event.TargetModifiedListener;
 import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.gui.frpane.HyperlinkGroupPane;
-import com.fr.design.mainframe.*;
+import com.fr.design.mainframe.CellElementPropertyPane;
+import com.fr.design.mainframe.CellWidgetPropertyPane;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.EastRegionContainerPane;
+import com.fr.design.mainframe.ElementCasePane;
+import com.fr.design.mainframe.HyperlinkGroupPaneActionImpl;
+import com.fr.design.mainframe.JTemplate;
+import com.fr.design.mainframe.JWorkBook;
+import com.fr.design.mainframe.ReportFloatPane;
 import com.fr.design.mainframe.cell.QuickEditorRegion;
 import com.fr.design.present.ConditionAttributesGroupPane;
 import com.fr.grid.GridUtils;
@@ -26,8 +33,9 @@ import com.fr.report.poly.PolyECBlock;
 import com.fr.stable.unit.UNITConstants;
 import com.fr.stable.unit.UnitRectangle;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
 
 /**
  * @author richer
@@ -166,6 +174,7 @@ public class ECBlockEditor extends BlockEditor<ECBlockPane, PolyECBlock> {
             // 条件属性
             ConditionAttributesGroupPane conditionAttributesGroupPane = ConditionAttributesGroupPane.getInstance();
             conditionAttributesGroupPane.populate(editComponent);
+            EastRegionContainerPane.getInstance().replaceConditionAttrPane(conditionAttributesGroupPane);
 
             EastRegionContainerPane.getInstance().updateCellElementState(isSelectedOneCell());
             if (chooseBlock) {

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

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