From 4c3ed1fcba66e1654cc5b17709225f127dbdb584 Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Tue, 22 Aug 2017 11:54:06 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-3163=20=E5=90=88=E4=BD=9C=E5=BC=80?=
 =?UTF-8?q?=E5=8F=919.0=E8=AE=BE=E8=AE=A1=E5=99=A8=3D>=E4=BA=A4=E4=BA=92?=
 =?UTF-8?q?=E9=AA=8C=E6=94=B6=3D=E3=80=8B=E7=94=A8=E4=B8=8D=E5=88=B0?=
 =?UTF-8?q?=E7=9A=84=E5=B1=9E=E6=80=A7=E9=9D=A2=E6=9D=BF=E4=B8=8D=E7=BB=A7?=
 =?UTF-8?q?=E6=89=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/mainframe/EastRegionContainerPane.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
index 595e301f3..c5f81a9d8 100644
--- a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
+++ b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
@@ -494,8 +494,12 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         public void updateStatus() {
             setEnabled(enableModes.contains(currentMode));
             setVisible(visibleModes.contains(currentMode));
-            if (!isEnabled() && isPoppedOut()) {
-                popupDialog.showDefaultPane();
+            if (isPoppedOut()) {
+                if (!isVisible()) {
+                    popToFrame();
+                } else if (!isEnabled()) {
+                    popupDialog.showDefaultPane();
+                }
             }
         }