From 13542e7d680cf099a6602ade7166df987359a55e Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
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 3fe126879..7b7867372 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 <Lanlan@fanruan.com>
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 aeb50ce18..aada842a1 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 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" type="text/css" href="lib/bundle.css"/>
     <script type="text/javascript" charset="UTF-8" src="lib/locale/login_zh_CN.js?_=compatible"></script>
-    <script type="text/javascript" charset="UTF-8" src="lib/locale/login_${language}.js"></script><script type="text/javascript" charset="UTF-8" src="lib/fineui.min.js"></script><script type="text/javascript"></script>
-    <style>
-        body {
-            overflow-y: auto;
-        }
-    </style>
+    <script type="text/javascript" charset="UTF-8" src="lib/locale/login_${language}.js"></script><script type="text/javascript" charset="UTF-8" src="lib/fineui.min.js"></script>
 <link href="guide.css" rel="stylesheet"></head>
 </html>
+<script type="text/javascript">
+    if (!/macintosh|mac os x/i.test(navigator.userAgent.toLowerCase())) {
+        document.body.style.zoom = 1 / window.devicePixelRatio;
+        document.body.style.overflow = 'hidden';
+    }
+</script>
 <script type="text/javascript" src="guide.js"></script>
\ 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 e5091a1cf..2bd5491a3 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 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" type="text/css" href="lib/bundle.css"/>
     <script type="text/javascript" charset="UTF-8" src="lib/locale/login_zh_CN.js?_=compatible"></script>
-    <script type="text/javascript" charset="UTF-8" src="lib/locale/login_${language}.js"></script><script type="text/javascript" charset="UTF-8" src="lib/fineui.min.js"></script><script type="text/javascript"></script>
-    <style>
-        body {
-            overflow-y: auto;
-        }
-    </style>
+    <script type="text/javascript" charset="UTF-8" src="lib/locale/login_${language}.js"></script><script type="text/javascript" charset="UTF-8" src="lib/fineui.min.js"></script>
 <link href="login.css" rel="stylesheet"></head>
 </html>
+<script type="text/javascript">
+    if (!/macintosh|mac os x/i.test(navigator.userAgent.toLowerCase())) {
+        document.body.style.zoom = 1 / window.devicePixelRatio;
+        document.body.style.overflow = 'hidden';
+    }
+</script>
 <script type="text/javascript" src="login.js"></script>
\ No newline at end of file