From 21e74c063da0ef0304a1f3c72f2fabcb7ac61afa Mon Sep 17 00:00:00 2001
From: Yvan <Yvan@fanruan.com>
Date: Wed, 13 Apr 2022 13:49:56 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-68726=20=E3=80=90=E8=BF=AD=E4=BB=A3?=
 =?UTF-8?q?=E3=80=91=E3=80=90=E6=95=B0=E6=8D=AE=E9=9B=86=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=91=E5=A4=9A=E5=BC=A0=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E8=A7=A6=E5=8F=91=E6=90=9C=E7=B4=A2=EF=BC=8C?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8=E6=A6=82=E7=8E=87=E5=8D=A1=E4=BD=8F?=
 =?UTF-8?q?=20=E3=80=90=E9=97=AE=E9=A2=98=E5=8E=9F=E5=9B=A0=E3=80=91?=
 =?UTF-8?q?=E4=B9=8B=E5=89=8D=E6=B2=A1=E4=BF=AE=E6=94=B9=E5=A5=BD=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=AF=E8=83=BD=E5=87=BA=E7=8E=B0=E6=90=9C=E7=B4=A2=E6=A1=86?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=E4=B8=8D=E6=B8=85=E7=A9=BA=E7=9A=84=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=20=E3=80=90=E6=94=B9=E5=8A=A8=E6=80=9D=E8=B7=AF?=
 =?UTF-8?q?=E3=80=91=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=AF=8F=E6=AC=A1=E7=A6=BB?=
 =?UTF-8?q?=E5=BC=80=E6=90=9C=E7=B4=A2=E6=A8=A1=E5=BC=8F=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E6=90=9C=E7=B4=A2=E6=A1=86=20=E3=80=90review?=
 =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E3=80=91=E6=97=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../management/search/pane/TreeSearchToolbarPane.java    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/management/search/pane/TreeSearchToolbarPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/management/search/pane/TreeSearchToolbarPane.java
index ea51e1a821..7524efed2a 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/management/search/pane/TreeSearchToolbarPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/management/search/pane/TreeSearchToolbarPane.java
@@ -156,9 +156,7 @@ public class TreeSearchToolbarPane extends JPanel implements TreeSearchStatusCha
         returnLabel.addMouseListener(new MouseAdapter() {
             @Override
             public void mouseClicked(MouseEvent e) {
-                searchTextField.setText(StringUtils.EMPTY);
                 TableDataTreeSearchManager.getInstance().outOfSearchMode();
-                switchPane(TOOLBAR_PANE);
             }
         });
 
@@ -200,6 +198,11 @@ public class TreeSearchToolbarPane extends JPanel implements TreeSearchStatusCha
     @Override
     public void updateTreeSearchChange(TreeSearchStatusChangeEvent event) {
         TreeSearchStatus treeSearchStatus = event.getTreeSearchStatus();
-        switchPane(treeSearchStatus == TreeSearchStatus.NOT_IN_SEARCH_MODE ? TOOLBAR_PANE : SEARCH_PANE);
+        if (treeSearchStatus == TreeSearchStatus.NOT_IN_SEARCH_MODE) {
+            this.searchTextField.setText(StringUtils.EMPTY);
+            switchPane(TOOLBAR_PANE);
+        } else {
+            switchPane(SEARCH_PANE);
+        }
     }
 }