diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/management/search/control/TreeSearchCallback.java b/designer-base/src/main/java/com/fr/design/data/datapane/management/search/control/TreeSearchCallback.java
index 3122bd207..a3c8c5c98 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/management/search/control/TreeSearchCallback.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/management/search/control/TreeSearchCallback.java
@@ -1,6 +1,5 @@
 package com.fr.design.data.datapane.management.search.control;
 
-import com.fr.design.data.datapane.management.search.searcher.TreeSearcher;
 
 /**
  * 搜索任务回调
diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/management/search/control/common/TableDataSearchCallBack.java b/designer-base/src/main/java/com/fr/design/data/datapane/management/search/control/common/TableDataSearchCallBack.java
index d4233d8bf..6b17f23a4 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/management/search/control/common/TableDataSearchCallBack.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/management/search/control/common/TableDataSearchCallBack.java
@@ -24,6 +24,8 @@ public class TableDataSearchCallBack implements TreeSearchCallback {
         if (TableDataTreeSearchManager.getInstance().getTreeSearchStatus() != TreeSearchStatus.SEARCHING) {
             return;
         }
+        // 搜索计数
+        TableDataTreeSearchManager.getInstance().decreaseCount();
         if (treeSearchResult.isSuccess()) {
             // 添加结果
             addToTreeSearcher(treeSearchResult);
@@ -38,8 +40,6 @@ public class TableDataSearchCallBack implements TreeSearchCallback {
                 return;
             }
             TableDataTreeSearchManager.getInstance().updateTableDataTree();
-            // 搜索计数
-            TableDataTreeSearchManager.getInstance().decreaseCount();
         });
     }
 
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 aa88ed48e..2d37395b4 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
@@ -142,6 +142,7 @@ public class TreeSearchToolbarPane extends Panel implements TreeSearchStatusChan
             public void changedUpdate(DocumentEvent e) {
             }
         });
+        this.searchTextField.addKeyListener(enterPressed);
         // 右侧返回图标
         UILabel returnLabel = new UILabel(IconUtils.readIcon("/com/fr/design/images/data/clear"));
         returnLabel.setToolTipText(Toolkit.i18nText("Fine-Design_Tree_Search_Return"));
@@ -178,12 +179,6 @@ public class TreeSearchToolbarPane extends Panel implements TreeSearchStatusChan
      * 交换当前面板层级
      */
     public void switchPane(String name) {
-        if (StringUtils.equals(name, TOOLBAR_PANE)) {
-            searchTextField.removeKeyListener(enterPressed);
-            searchTextField.setText(StringUtils.EMPTY);
-        } else if (StringUtils.equals(name, SEARCH_PANE)) {
-            searchTextField.addKeyListener(enterPressed);
-        }
         cardLayout.show(contentPane, name);
     }
 
diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/management/search/searcher/TableDataTreeSearcher.java b/designer-base/src/main/java/com/fr/design/data/datapane/management/search/searcher/TableDataTreeSearcher.java
index 4d9d458c9..672ef1e38 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/management/search/searcher/TableDataTreeSearcher.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/management/search/searcher/TableDataTreeSearcher.java
@@ -10,8 +10,6 @@ import com.fr.design.data.datapane.management.search.control.pre.TableDataPreSea
 import com.fr.design.data.datapane.management.search.control.pre.TableDataPreSearchTask;
 import com.fr.design.data.tabledata.wrapper.TableDataWrapper;
 
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -19,7 +17,6 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.function.Consumer;
 
 /**
  * @author Yvan