From 68a134524b80de65cd6b546fd1f9827c90d12b70 Mon Sep 17 00:00:00 2001 From: Yvan Date: Fri, 1 Apr 2022 18:37:45 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-66457=20=E5=8E=9F=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E7=AE=A1=E7=90=86=E4=BC=98=E5=8C=96=20=E3=80=90?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=8E=9F=E5=9B=A0=E3=80=91=E8=B7=9F=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E7=A1=AE=E5=AE=9A=E4=BA=86=E5=9C=A8=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E8=BF=87=E7=A8=8B=E4=B8=AD=E5=81=9A=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E7=9A=84=E7=BC=96=E8=BE=91=E3=80=81=E5=88=A0=E9=99=A4=E3=80=81?= =?UTF-8?q?=E7=B2=98=E8=B4=B4=E6=97=B6=EF=BC=8C=E9=9C=80=E8=A6=81=E4=B8=AD?= =?UTF-8?q?=E6=96=AD=E6=90=9C=E7=B4=A2=EF=BC=8C=E5=B1=95=E7=A4=BA=E5=8E=9F?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E6=A0=91=20=E3=80=90=E6=94=B9?= =?UTF-8?q?=E5=8A=A8=E6=80=9D=E8=B7=AF=E3=80=91=E7=BC=96=E8=BE=91=E3=80=81?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E3=80=81=E7=B2=98=E8=B4=B4=E5=A4=84=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=B7=B3=E5=87=BA=E6=90=9C=E7=B4=A2=E7=9A=84=E9=80=BB?= =?UTF-8?q?=E8=BE=91=20=E3=80=90review=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 --- .../fr/design/data/datapane/TableDataTreePane.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 dataWrapperMap = TableDataTreeClipboard.getInstance().takeFromClip(); for (Map.Entry dataWrapperEntry : dataWrapperMap.entrySet()) { // 处理数据集名称