Browse Source

Merge branch 'final/11.0' into release/11.0

* final/11.0:
  REPORT-57521 回退代码-远程设计时websocket断开情况下的提示优化

# Conflicts:
#	designer-base/src/main/java/com/fr/design/mainframe/toast/DesignerToastMsgUtil.java
#	designer-base/src/main/java/com/fr/design/mainframe/toast/ToastMsgDialog.java
bugfix/11.0
方磊 3 years ago
parent
commit
843b118cce
  1. 3
      designer-base/src/main/java/com/fr/design/mainframe/toast/DesignerToastMsgUtil.java
  2. 3
      designer-base/src/main/java/com/fr/design/mainframe/toast/ToastMsgDialog.java

3
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) {
toastPane(PROMPT_ICON, contendPane, DesignerContext.getDesignerFrame());
}
@ -117,4 +118,4 @@ public class DesignerToastMsgUtil {
.toString();
}
}
}

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

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