Browse Source

Pull request #4662: REPORT-53775 条件属性弹窗概率性 关闭不了

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

* commit '13542e7d680cf099a6602ade7166df987359a55e':
  REPORT-53775 条件属性弹窗概率性 关闭不了
zheng-1641779399395
Hades 3 years ago
parent
commit
6be1e11709
  1. 7
      designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java

7
designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java

@ -249,8 +249,13 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
while (dialog.getParent() != null) { while (dialog.getParent() != null) {
dialog = dialog.getParent(); dialog = dialog.getParent();
if (dialog instanceof Dialog) { if (dialog instanceof Dialog) {
final Dialog finalDialog = (Dialog) dialog;
// 非模态的 直接设置可见 不会阻塞
if (!finalDialog.isModal()) {
finalDialog.setVisible(true);
continue;
}
//这边需要另起一个线程设置可见,防止阻塞 //这边需要另起一个线程设置可见,防止阻塞
final Container finalDialog = dialog;
SwingWorker worker = new SwingWorker() { SwingWorker worker = new SwingWorker() {
@Override @Override
protected Object doInBackground() throws Exception { protected Object doInBackground() throws Exception {

Loading…
Cancel
Save