From 6479efca90317e0ce14c9c78238d3ff0c366473c Mon Sep 17 00:00:00 2001
From: shine <zheng@fanruan.com>
Date: Thu, 4 Nov 2021 16:52:29 +0800
Subject: [PATCH] =?UTF-8?q?CHART-21418=20fix:=E7=AC=AC=E4=BA=8C=E6=AC=A1?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=8C=BA=E5=88=86=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=E5=9C=A8=E4=B8=8A=E9=9D=A2=E8=BF=98=E6=98=AF=E4=B8=8B=E9=9D=A2?=
 =?UTF-8?q?=20=E5=A6=82=E6=9E=9C=E5=9C=A8=E4=B8=8A=E9=9D=A2=20=E5=88=99?=
 =?UTF-8?q?=E6=98=AF=E4=BB=8EdisplayComponent=E4=B8=8B=E9=9D=A2=E7=A6=BB?=
 =?UTF-8?q?=E5=BC=80=20=E9=9A=90=E8=97=8F=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/style/AbstractSelectBox.java    | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/style/AbstractSelectBox.java b/designer-base/src/main/java/com/fr/design/style/AbstractSelectBox.java
index 41eeacdba..4e82d3805 100644
--- a/designer-base/src/main/java/com/fr/design/style/AbstractSelectBox.java
+++ b/designer-base/src/main/java/com/fr/design/style/AbstractSelectBox.java
@@ -10,6 +10,7 @@ import com.fr.stable.Constants;
 
 import javax.swing.AbstractButton;
 import javax.swing.JPanel;
+import javax.swing.JWindow;
 import javax.swing.border.AbstractBorder;
 import javax.swing.event.AncestorEvent;
 import javax.swing.event.AncestorListener;
@@ -20,6 +21,7 @@ import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Insets;
+import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.RenderingHints;
 import java.awt.event.MouseAdapter;
@@ -99,9 +101,25 @@ public abstract class AbstractSelectBox<T> extends AbstractPopBox implements Mou
 		displayComponent.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseExited(MouseEvent e) {
+				if (!isPopupVisible()) {
+					//如果弹出框==null 或者 弹出框不可见 直接return
+					return;
+				}
+				Point popMenuP = getControlWindow().getLocation();
+				Point displayComponentP = displayComponent.getLocationOnScreen();
+				if (popMenuP.getX() < displayComponentP.getX() - 1) {
+					//如果 弹出框横向超出屏幕 往左调整了 和displayComponent横向错开 就不处理了
+					return;
+				}
+
 				Rectangle rectangle = displayComponent.getBounds();
-				if (e.getY() < rectangle.y) {
-					//如果是从displayComponent上面离开的，隐藏弹出界面。
+				boolean bottomPopAndExitTop = displayComponentP.getY() < popMenuP.getY() && e.getY() <= rectangle.y;
+				boolean topPopAndExitBottom = displayComponentP.getY() > popMenuP.getY() && e.getY() >= rectangle.y + rectangle.getHeight();
+				boolean exitLeftOrRight = rectangle.x > e.getX() || rectangle.x + rectangle.getWidth() < e.getX();
+				if (bottomPopAndExitTop || topPopAndExitBottom || exitLeftOrRight) {
+					//弹出框在displayComponent下面 且 鼠标是从displayComponent上面离开的，隐藏弹出界面。
+					//弹出框在displayComponent上面 且 鼠标是从displayComponent下面离开的，隐藏弹出界面。
+					//鼠标从displayComponent左边 或者 右边 离开，隐藏弹出界面。
 					hidePopupMenu();
 				}