Merge pull request #1244 in BA/design from ~PLOUGH/design:release/9.0 to release/9.0

* commit 'b986cf0385abd072a43f0aa5aa1d22243b4d531f':
  REPORT-4617 弹出单元格元素，批量选中单元格，单元格元素可设置

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() {