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

* commit '0b6e3debe4f3d649c00c8815d9d24d56c2362fe0':
  REPORT-4957 [9.0内测] 右边内容属性表窗口变粉红，不可用

designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java

@@ -589,7 +589,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
             if (popupDialog != null && isPoppedOut) {
                 popupDialog.replaceContentPane(this);
             }
-            if (popupPane != null && !isRightPaneVisible()) {
+            if (popupPane != null && popupPane.isVisible()) {
                 popupPane.replaceContentPane(contentArea);
             }
 
@@ -627,7 +627,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
             if (isRightPaneVisible()) {
                 hideCurrentPopupPane();
                 replaceContentPane(contentPane);
-            } else if(popupPane != null) {
+            } else if(popupPane != null && popupPane.isVisible()) {
                 popupPane.replaceContentPane(contentArea);
             }
         }