Merge pull request #1969 in DESIGN/design from bugfix/10.0 to feature/10.0

* commit 'dc47f908900569c4d6e3fac7f19b27932096c826':
  REPORT-30708 单元格配置框不跟随右侧配置按钮 npe问题修改

designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java

@@ -1019,9 +1019,9 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
      * @date: 2020/7/30 11:39
      */
     public void freshCurrentPopupPane() {
-        if(currentPopupPane.isVisible()){
+        if (currentPopupPane != null && currentPopupPane.isVisible()) {
             hideCurrentPopupPane();
-            if (currentPopupPane != null && currentButton != null && !isRightPaneVisible()) {
+            if (currentButton != null && !isRightPaneVisible()) {
                 GUICoreUtils.showPopupMenu(currentPopupPane, currentButton, -currentPopupPane.getPreferredSize().width, 0);
             }
         }