REPORT-30708 单元格配置框不跟随右侧配置按钮 修改代码

designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java

@@ -10,7 +10,6 @@ import com.fr.design.gui.imenu.UIMenuItem;
 import com.fr.design.gui.imenu.UIScrollPopUpMenu;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.DesignerContext;
-import com.fr.design.mainframe.EastRegionContainerPane;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.design.utils.gui.GUIPaintUtils;
@@ -882,8 +881,6 @@ public class MutilTempalteTabPane extends JComponent {
          */
         @Override
         public void mousePressed(MouseEvent e) {
-            //切换文件后清空FixedPopupPane面板
-            EastRegionContainerPane.getInstance().clearCurrentPopupPane();
             //如果在版本管理情况下，不允许切换tab
             if (DesignerMode.isVcsMode()) {
                 return;

designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java

@@ -11,7 +11,6 @@ import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerContext;
-import com.fr.design.mainframe.EastRegionContainerPane;
 import com.fr.file.FILE;
 import com.fr.file.FileNodeFILE;
 import com.fr.file.filetree.FileNode;
@@ -84,8 +83,6 @@ public class TemplateTreePane extends JPanel implements FileOperations {
             @Override
             public void mousePressed(MouseEvent evt) {
                 if (evt.getClickCount() == 2) {
-                    //切换文件后清空FixedPopupPane面板
-                    EastRegionContainerPane.getInstance().clearCurrentPopupPane();
                     openFile();
                 }
             }

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

@@ -974,6 +974,8 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
      * @param jt 添加的模板.
      */
     public void addAndActivateJTemplate(JTemplate<?, ?> jt) {
+        //切换文件后清空FixedPopupPane面板
+        EastRegionContainerPane.getInstance().clearCurrentPopupPane();
         //释放模板对象
         ActionFactory.editorRelease();
         if (jt == null || jt.getEditingFILE() == null) {
@@ -993,6 +995,8 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
      * @param jt 模板
      */
     public void activateJTemplate(JTemplate<?, ?> jt) {
+        //切换文件后清空FixedPopupPane面板
+        EastRegionContainerPane.getInstance().clearCurrentPopupPane();
         //释放模板对象
         ActionFactory.editorRelease();
         if (jt == null || jt.getEditingFILE() == null) {
@@ -1103,7 +1107,8 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
      * @date 2014-10-14-下午6:31:05
      */
     private void openFile(FILE tplFile) {
-
+        //切换文件后清空FixedPopupPane面板
+        EastRegionContainerPane.getInstance().clearCurrentPopupPane();
         if (tplFile != null) {
             int index = HistoryTemplateListCache.getInstance().contains(tplFile);
             if (index != -1) {

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

@@ -1019,11 +1019,13 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
      * @date: 2020/7/30 11:39
      */
     public void freshCurrentPopupPane() {
+        if(currentPopupPane.isVisible()){
             hideCurrentPopupPane();
-        if (currentPopupPane != null && currentButton != null) {
+            if (currentPopupPane != null && currentButton != null && !isRightPaneVisible()) {
                 GUICoreUtils.showPopupMenu(currentPopupPane, currentButton, -currentPopupPane.getPreferredSize().width, 0);
             }
         }
+    }
 
     /**
      * @Description:清空currentPopupPane数据，当切换模板时会调用这个函数