Merge pull request #16568 in DESIGN/design from release/11.0 to bugfix/11.0

* commit '894ae6943051c38ba03f5b39715d79957112dd2c':
  REPORT-147166 linux下，条件属性-超链设置 打开之后，设置超链的窗口无法聚焦

designer-base/src/main/java/com/fr/design/gui/controlpane/UIControlPane.java

@@ -100,7 +100,7 @@ public abstract class UIControlPane extends JControlPane {
         this.checkButtonEnabled();
     }
 
-    protected Window getPopupEditDialog(){
+    protected Window getPopupEditDialog() {
         return this.popupEditDialog;
     }
 
@@ -241,6 +241,11 @@ public abstract class UIControlPane extends JControlPane {
 
         private void hideDialog() {
             if (needToHidePopupEditDialog()) {
+                //在Linux上拉回焦点，不然导致一些面板关不掉
+                if (OperatingSystem.isLinux()) {
+                    requestFocus();
+                }
+
                 saveSettings();
                 setVisible(false);
                 PopupDialogSaveAction saveAction = OSSupportCenter.getAction(PopupDialogSaveAction.class);
@@ -252,10 +257,6 @@ public abstract class UIControlPane extends JControlPane {
             addWindowFocusListener(new WindowAdapter() {
                 @Override
                 public void windowLostFocus(WindowEvent e) {
-                    //在Linux上拉回焦点，不然导致一些面板关不掉
-                    if(OperatingSystem.isLinux()) {
-                        requestFocus();
-                    }
                     hideDialog();
                 }
             });
@@ -263,8 +264,8 @@ public abstract class UIControlPane extends JControlPane {
     }
 
     /**
-    * 是否需要隐藏popupEditDialog
+     * 是否需要隐藏popupEditDialog
-    */
+     */
     protected boolean needToHidePopupEditDialog() {
         // 检查是否有子弹窗，如果有，则不隐藏
         for (Window window : popupEditDialog.getOwnedWindows()) {