From 180ab3eba5947a95bf3864b20c2187bf64a87c58 Mon Sep 17 00:00:00 2001 From: Yvan Date: Sat, 2 Apr 2022 15:47:57 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-69108=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=E6=90=9C=E7=B4=A2=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E4=B8=AD=E6=9B=B4=E6=96=B0=E5=85=B3=E9=94=AE=E5=AD=97=EF=BC=8C?= =?UTF-8?q?=E6=A6=82=E7=8E=87=E5=8D=A1=E6=AD=BB=20=E3=80=90=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=8E=9F=E5=9B=A0=E3=80=91=E4=B8=BA=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=A1=86add=E7=9A=84keyListener=E6=AF=94remove=E7=9A=84?= =?UTF-8?q?=E6=AC=A1=E6=95=B0=E5=A4=9A=EF=BC=8C=E6=89=80=E4=BB=A5=E4=BC=9A?= =?UTF-8?q?=E7=B4=AF=E7=A7=AF=E6=80=A7=E7=9A=84=E9=87=8D=E5=A4=8D=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=9B=91=E5=90=AC=EF=BC=8C=E5=AF=BC=E8=87=B4=E5=A4=9A?= =?UTF-8?q?=E6=AC=A1=E6=90=9C=E7=B4=A2=E5=90=8E=E4=BC=9A=E5=A4=9A=E6=AC=A1?= =?UTF-8?q?=E8=A7=A6=E5=8F=91=EF=BC=8C=E7=9B=B4=E5=88=B0=E5=8D=A1=E6=AD=BB?= =?UTF-8?q?=20=E3=80=90=E6=94=B9=E5=8A=A8=E6=80=9D=E8=B7=AF=E3=80=91=201.?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E4=B8=8Bremove=E5=92=8Cadd=E7=9A=84?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E5=8F=AA=E5=9C=A8=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E8=BE=93=E5=85=A5=E6=A1=86=E6=97=B6add=E4=B8=80?= =?UTF-8?q?=E6=AC=A1=EF=BC=9B=E4=B9=8B=E5=89=8D=E5=9C=A8=E8=BF=99=E9=87=8C?= =?UTF-8?q?remove=E9=82=A3=E6=98=AF=E5=88=9A=E5=86=99=E8=BF=AD=E4=BB=A3?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E4=BB=A3=E7=A0=81=E9=87=8C=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E6=8A=8A=E8=BE=93=E5=85=A5=E6=A1=86=E6=B8=85=E7=A9=BA?= =?UTF-8?q?=EF=BC=8C=E5=BD=93=E6=97=B6=E6=B8=85=E7=A9=BA=E5=90=8E=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E6=9C=89=E9=97=AE=E9=A2=98=EF=BC=8C=E6=89=80=E4=BB=A5?= =?UTF-8?q?=E5=B0=B1add+remove=EF=BC=8C=E5=90=8E=E9=9D=A2=E9=82=A3?= =?UTF-8?q?=E8=BE=B9=E6=B8=85=E7=A9=BA=E7=9A=84=E9=80=BB=E8=BE=91=E6=94=B9?= =?UTF-8?q?=E5=A5=BD=E4=BA=86=EF=BC=8C=E8=BF=99=E9=87=8C=E5=BF=98=E6=94=B9?= =?UTF-8?q?=E5=9B=9E=E6=9D=A5=E4=BA=86=202.=20=E5=B0=86=E8=AE=A1=E6=95=B0?= =?UTF-8?q?=E6=8F=90=E5=89=8D=EF=BC=8C=E5=90=A6=E5=88=99=E5=8F=96=E6=95=B0?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84=E4=BB=BB=E5=8A=A1=E4=B8=8D=E4=BC=9A?= =?UTF-8?q?=E8=AE=A1=E6=95=B0=20=E3=80=90review=E5=BB=BA=E8=AE=AE=E3=80=91?= =?UTF-8?q?=E6=97=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../management/search/control/TreeSearchCallback.java | 1 - .../search/control/common/TableDataSearchCallBack.java | 4 ++-- .../management/search/pane/TreeSearchToolbarPane.java | 7 +------ .../management/search/searcher/TableDataTreeSearcher.java | 3 --- 4 files changed, 3 insertions(+), 12 deletions(-) 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