From a1e3c0027038e589b5b3ec8f45e924f955d9001f Mon Sep 17 00:00:00 2001
From: "John.Ying" <John.Ying@fanruan.com>
Date: Fri, 14 Oct 2022 15:16:39 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-82112=20=E6=A8=A1=E6=9D=BF=E9=94=81?=
 =?UTF-8?q?=E5=AE=9A=EF=BC=8C=E8=B6=85=E7=AE=A1=E5=BC=BA=E5=88=B6=E8=A7=A3?=
 =?UTF-8?q?=E9=94=81=E7=9A=84=E6=8C=89=E9=92=AE=E6=B2=A1=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignerFrameFileDealerPane.java          | 21 ++++++++++++++++---
 .../pane/TemplateTreeSearchToolbarPane.java   |  6 ++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
index 04a513d5b..bdf0aa56c 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
@@ -172,8 +172,8 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         tooBarPane.add(new UIMenuHighLight(), BorderLayout.SOUTH);
 
         searchToolbarPane = new TemplateTreeSearchToolbarPane(toolBar);
+        searchToolbarPane.add(createUpToolBarPane(), BorderLayout.EAST);
         searchToolbarPane.setPreferredSize(new Dimension(this.getWidth(), 23));
-
         add(searchToolbarPane, BorderLayout.NORTH);
         CardLayout card;
         JPanel cardPane = new JPanel(card = new CardLayout());
@@ -183,7 +183,6 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         card.show(cardPane, FILE);
 
         TemplateTreePane.getInstance().setToolbarStateChangeListener(this);
-
         add(cardPane, BorderLayout.CENTER);
         stateChange();
     }
@@ -219,7 +218,6 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
 
     private JPanel createUpToolBarPane() {
         JPanel panel = new JPanel(new BorderLayout());
-        panel.add(toolBar, BorderLayout.CENTER);
         if (WorkContext.getCurrent().isRoot()) {
             rightToolBar = new UIToolbar(FlowLayout.RIGHT);
             rightToolBar.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIConstants.TOOLBAR_BORDER_COLOR));
@@ -461,6 +459,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         public void actionPerformed(ActionEvent e) {
             // 交换层级
             searchToolbarPane.switchPane(TemplateTreeSearchToolbarPane.SEARCH_PANE);
+            refreshRightToolBarByContentPaneType();
             TemplateTreePane.getInstance().refreshDockingView();
             TemplateTreeSearchManager.getInstance().switchToSearch(TemplateTreePane.getInstance().getTemplateFileTree());
         }
@@ -595,8 +594,24 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         }
     }
 
+    /**
+     * 搜索状态下不显示rightToolBar
+     */
+    public void refreshRightToolBarByContentPaneType() {
+        if (rightToolBar != null) {
+            if (StringUtils.equals(TemplateTreeSearchToolbarPane.CONTENT_PANE_TYPE, TemplateTreeSearchToolbarPane.SEARCH_PANE)) {
+                rightToolBar.setVisible(false);
+            }
+        }
+    }
+
     public void refreshRightToolBarBy(FileNode fileNode) {
+
         if (rightToolBar != null) {
+            if (StringUtils.equals(TemplateTreeSearchToolbarPane.CONTENT_PANE_TYPE, TemplateTreeSearchToolbarPane.SEARCH_PANE)) {
+                rightToolBar.setVisible(false);
+                return;
+            }
             boolean locked = fileNode != null
                             && StringUtils.isNotEmpty(fileNode.getLock())
                             && !ComparatorUtils.equals(fileNode.getLock(), fileNode.getUserID());
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/manager/search/searcher/control/pane/TemplateTreeSearchToolbarPane.java b/designer-base/src/main/java/com/fr/design/mainframe/manager/search/searcher/control/pane/TemplateTreeSearchToolbarPane.java
index bb98561bf..2154c9f93 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/manager/search/searcher/control/pane/TemplateTreeSearchToolbarPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/manager/search/searcher/control/pane/TemplateTreeSearchToolbarPane.java
@@ -39,6 +39,11 @@ public class TemplateTreeSearchToolbarPane extends JPanel implements TreeSearchS
 
     public static final String SEARCH_PANE = "searchPane";
 
+    /**
+     * 判断工具栏是处于搜索栏还是非搜索栏
+     */
+    public static  String CONTENT_PANE_TYPE = "toolbarPane";
+
     /**
      * 工具栏
      */
@@ -187,6 +192,7 @@ public class TemplateTreeSearchToolbarPane extends JPanel implements TreeSearchS
      */
     public void switchPane(String name) {
         cardLayout.show(contentPane, name);
+        CONTENT_PANE_TYPE = name;
     }
 
     public void setPlaceHolder(String placeHolder) {