Merge pull request #4679 in DESIGN/design from feature/10.0 to feature/big-screen

* commit '15ad39a88670a10af13851ba6d82ca677014f240':
  REPORT-53625 设计器用户登录策略调整-登录触发页面显示不全
  REPORT-53775 条件属性弹窗概率性 关闭不了

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>
+    <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>
-    <style>
-        body {
-            overflow-y: auto;
-        }
-    </style>
 <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>

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>
+    <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>
-    <style>
-        body {
-            overflow-y: auto;
-        }
-    </style>
 <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>

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 {