From 8a7cd57cf3b82d3302065716b366b5b65eb27698 Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Fri, 15 Sep 2017 13:45:43 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-4617=20=E5=BC=B9=E5=87=BA=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=A0=BC=E5=85=83=E7=B4=A0=EF=BC=8C=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E9=80=89=E4=B8=AD=E5=8D=95=E5=85=83=E6=A0=BC=EF=BC=8C=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=A0=BC=E5=85=83=E7=B4=A0=E5=8F=AF=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mainframe/EastRegionContainerPane.java    | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
index 2edfce1d6..0ae101996 100644
--- a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
+++ b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
@@ -155,21 +155,28 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
     }
 
     public void updateCellElementState(boolean isSelectedOneCell) {
+        PropertyItem cellElement = propertyItemMap.get(KEY_CELL_ELEMENT);
         if (isSelectedOneCell) {
-            enableCellElementPane();
+            enableCellElementPane(cellElement);
         } else {  // 如果选中多个单元格，禁用单元格元素 tab
-            disableCellElementPane();
+            disableCellElementPane(cellElement);
             refreshRightPane();
         }
     }
 
     // 禁用单元格元素tab
-    private void disableCellElementPane() {
-        propertyItemMap.get(KEY_CELL_ELEMENT).setEnabled(false);
+    private void disableCellElementPane(PropertyItem cellElement) {
+        cellElement.setEnabled(false);
+        if (cellElement.isPoppedOut()) {
+            cellElement.popupDialog.showDefaultPane();
+        }
     }
     // 禁用单元格元素tab
-    private void enableCellElementPane() {
-        propertyItemMap.get(KEY_CELL_ELEMENT).setEnabled(true);
+    private void enableCellElementPane(PropertyItem cellElement) {
+        cellElement.setEnabled(true);
+        if (cellElement.isPoppedOut()) {
+            cellElement.popupDialog.replaceContentPane(cellElement);
+        }
     }
 
     private void initContentPane() {