Browse Source

Pull request #5373: REPORT-57057 远程设计报错规范-启动远程状态下的设计器时,报错弹窗被 切换工作目录的弹窗覆盖

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

* commit '1d76a4bbcd64046b86afc76e2b07c445c5a8aad9':
  REPORT-57057 远程设计报错规范-启动远程状态下的设计器时,报错弹窗被 切换工作目录的弹窗覆盖
feature/10.0
Hades 3 years ago
parent
commit
bc894b6c66
  1. 5
      designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java
  2. 5
      designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java

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

@ -407,7 +407,7 @@ public class EnvChangeEntrance {
/**
* 处理异常
*/
public void dealEvnExceptionWhenStartDesigner() {
public void dealEvnExceptionWhenStartDesigner(Throwable e, DesignerWorkspaceInfo workspaceInfo) {
ProcessEventPipe eventPipe = FineProcessContext.getParentPipe();
if (eventPipe != null) {
eventPipe.fire(new CarryMessageEvent(ReportState.STOP.getValue()));
@ -435,6 +435,9 @@ public class EnvChangeEntrance {
DesignerExiter.getInstance().execute();
}
});
if (e != null) {
RemoteDesignExceptionHandler.getInstance().handleInStart(e, workspaceInfo);
}
envListDialog.setVisible(true);
}

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

@ -59,7 +59,7 @@ public class DesignerWorkspaceProvider extends Activator {
Workspace workspace = DesignerWorkspaceGenerator.generate(workspaceInfo);
boolean checkValid = workspace != null && workspaceInfo.checkValid();
if (!checkValid) {
EnvChangeEntrance.getInstance().dealEvnExceptionWhenStartDesigner();
EnvChangeEntrance.getInstance().dealEvnExceptionWhenStartDesigner(null, workspaceInfo);
} else {
WorkContext.switchTo(workspace);
//在设计器完全启动完成后,对初始环境进行一次服务检测,对主要功能无影响,异常仅做日志提示即可
@ -76,8 +76,7 @@ public class DesignerWorkspaceProvider extends Activator {
});
}
} catch (Throwable e) {
RemoteDesignExceptionHandler.getInstance().handleInStart(e, workspaceInfo);
EnvChangeEntrance.getInstance().dealEvnExceptionWhenStartDesigner();
EnvChangeEntrance.getInstance().dealEvnExceptionWhenStartDesigner(e, workspaceInfo);
}
}
pluginErrorRemind();

Loading…
Cancel
Save