From 13542e7d680cf099a6602ade7166df987359a55e Mon Sep 17 00:00:00 2001 From: hades Date: Fri, 18 Jun 2021 10:41:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-53775=20=E6=9D=A1=E4=BB=B6=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E5=BC=B9=E7=AA=97=E6=A6=82=E7=8E=87=E6=80=A7=20?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E4=B8=8D=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/write/submit/SmartInsertDBManipulationPane.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java b/designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java index 3fe1268793..7b78673728 100644 --- a/designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java +++ b/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) { dialog = dialog.getParent(); if (dialog instanceof Dialog) { + final Dialog finalDialog = (Dialog) dialog; + // 非模态的 直接设置可见 不会阻塞 + if (!finalDialog.isModal()) { + finalDialog.setVisible(true); + continue; + } //这边需要另起一个线程设置可见,防止阻塞 - final Container finalDialog = dialog; SwingWorker worker = new SwingWorker() { @Override protected Object doInBackground() throws Exception { From 43d83202ed22283948ef20980ccd026d0b950ff3 Mon Sep 17 00:00:00 2001 From: Lanlan Date: Fri, 18 Jun 2021 17:27:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-53625=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E7=AD=96=E7=95=A5=E8=B0=83?= =?UTF-8?q?=E6=95=B4-=E7=99=BB=E5=BD=95=E8=A7=A6=E5=8F=91=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/com/fr/design/login/guide.html | 13 +++++++------ .../fr/design/login/img/icon_close_normal.png | Bin 5057 -> 0 bytes .../resources/com/fr/design/login/login.html | 13 +++++++------ 3 files changed, 14 insertions(+), 12 deletions(-) delete mode 100644 designer-base/src/main/resources/com/fr/design/login/img/icon_close_normal.png diff --git a/designer-base/src/main/resources/com/fr/design/login/guide.html b/designer-base/src/main/resources/com/fr/design/login/guide.html index aeb50ce18b..aada842a10 100644 --- a/designer-base/src/main/resources/com/fr/design/login/guide.html +++ b/designer-base/src/main/resources/com/fr/design/login/guide.html @@ -14,12 +14,13 @@ - - + + \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/login/img/icon_close_normal.png b/designer-base/src/main/resources/com/fr/design/login/img/icon_close_normal.png deleted file mode 100644 index 01855d5632dca882691be00b89e0f93110709173..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5057 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 X@O{GnapI8z00000NkvXXu0mjf;);@X diff --git a/designer-base/src/main/resources/com/fr/design/login/login.html b/designer-base/src/main/resources/com/fr/design/login/login.html index e5091a1cf3..2bd5491a33 100644 --- a/designer-base/src/main/resources/com/fr/design/login/login.html +++ b/designer-base/src/main/resources/com/fr/design/login/login.html @@ -14,12 +14,13 @@ - - + + \ No newline at end of file