Merge pull request #1358 in DESIGN/design from ~NEIL/design:final/10.0 to persist/10.0

* commit '062b8576593e3be9431f8aa5eaec51d31b1c2889':
  MOBILE-24561 通过箭头按钮触发下拉框，进行修改，会导致保存失败
  REPORT-24997 升级12.08jar包以后决策报表中插入的地图设置有问题

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

@@ -12,6 +12,7 @@ import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.design.widget.FRWidgetFactory;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.StringUtils;
+import com.fr.stable.os.OperatingSystem;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Cursor;
@@ -262,7 +263,9 @@ abstract class UIControlPane extends JControlPane {
                 @Override
                 public void windowLostFocus(WindowEvent e) {
                     //在Linux上拉回焦点，不然导致一些面板关不掉
-                    requestFocus();
+                    if(OperatingSystem.isLinux()) {
+                        requestFocus();
+                    }
                     hideDialog();
                 }
             });

designer-base/src/main/java/com/fr/design/gui/icombocheckbox/UIComboCheckBox.java

@@ -15,6 +15,8 @@ import javax.swing.Icon;
 import javax.swing.JComponent;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
+import javax.swing.event.PopupMenuEvent;
+import javax.swing.event.PopupMenuListener;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
@@ -149,6 +151,22 @@ public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNam
                         attributeChange();
                     }
                 });
+                UIComboCheckBox.this.popup.addPopupMenuListener(new PopupMenuListener() {
+                    @Override
+                    public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
+                        // do nothing
+                    }
+
+                    @Override
+                    public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
+                        attributeChange();
+                    }
+
+                    @Override
+                    public void popupMenuCanceled(PopupMenuEvent e) {
+                        // do nothing
+                    }
+                });
             }
         };
         editor.setEditable(false);