diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java
index d8f0dbd8c..06d086aef 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java
@@ -385,6 +385,10 @@ public class TableDataTreePane extends BasicTableDataTreePane {
      */
     @Override
     public void dgEdit(final AbstractTableDataPane<?> tableDataPane, String originalName, boolean isUpdate) {
+        // 编辑时如果正在搜索，跳回原树
+        if (TableDataTreeSearchManager.getInstance().isInSearchMode()) {
+            TableDataTreeSearchManager.getInstance().outOfSearchMode();
+        }
         tableDataPane.addStoreProcedureWorkerListener(new StoreProcedureWorkerListener() {
             public void fireDoneAction() {
                 if (tableDataTree.getSelectionPath() == null) {
@@ -1031,6 +1035,10 @@ public class TableDataTreePane extends BasicTableDataTreePane {
                 @Override
                 public void doOk() {
                     Object[] selectedValues = checkBoxList.getSelectedValues();
+                    // 删除时如果正在搜索，跳回原树
+                    if (TableDataTreeSearchManager.getInstance().isInSearchMode()) {
+                        TableDataTreeSearchManager.getInstance().outOfSearchMode();
+                    }
                     for (Object toRemove : selectedValues) {
                         doRemove((NameObject) toRemove);
                     }
@@ -1092,6 +1100,10 @@ public class TableDataTreePane extends BasicTableDataTreePane {
 
         @Override
         public void actionPerformed(ActionEvent e) {
+            // 粘贴时如果正在搜索，跳回原树
+            if (TableDataTreeSearchManager.getInstance().isInSearchMode()) {
+                TableDataTreeSearchManager.getInstance().outOfSearchMode();
+            }
             Map<String, AbstractTableDataWrapper> dataWrapperMap = TableDataTreeClipboard.getInstance().takeFromClip();
             for (Map.Entry<String, AbstractTableDataWrapper> dataWrapperEntry : dataWrapperMap.entrySet()) {
                 // 处理数据集名称