Browse Source

Pull request #6559: 无JIRA任务 解决冲突

Merge in DESIGN/design from ~FANGLEI/design:release/11.0 to release/11.0

* commit '843b118cce801a3300c0598768ab2dda7c29772e':
  REPORT-57521 回退代码-远程设计时websocket断开情况下的提示优化
bugfix/11.0
ju|剧浩宇 3 years ago
parent
commit
42c8089a6a
  1. 1
      designer-base/src/main/java/com/fr/design/mainframe/toast/DesignerToastMsgUtil.java
  2. 1
      designer-base/src/main/java/com/fr/design/mainframe/toast/ToastMsgDialog.java

1
designer-base/src/main/java/com/fr/design/mainframe/toast/DesignerToastMsgUtil.java

@ -31,6 +31,7 @@ public class DesignerToastMsgUtil {
} }
public static void toastPrompt(JPanel contendPane) { public static void toastPrompt(JPanel contendPane) {
toastPane(PROMPT_ICON, contendPane, DesignerContext.getDesignerFrame()); toastPane(PROMPT_ICON, contendPane, DesignerContext.getDesignerFrame());
} }

1
designer-base/src/main/java/com/fr/design/mainframe/toast/ToastMsgDialog.java

@ -159,4 +159,5 @@ public class ToastMsgDialog extends UIDialog {
super.dispose(); super.dispose();
} }
} }
Loading…
Cancel
Save