From 9b2405bf34f46d4280f9e72f956c5cde46e62016 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Mon, 12 Jun 2017 19:30:56 +0800 Subject: [PATCH] =?UTF-8?q?bug=20fix=20ds=20=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/alphafine/component/AlphaFineDialog.java | 5 +++++ .../alphafine/search/manager/FileSearchManager.java | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java index d8293f772..eb986cb13 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java +++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java @@ -80,6 +80,7 @@ public class AlphaFineDialog extends UIDialog { private static final String CPT_MARK = "k:cpt "; private static final String FRM_MARK = "k:frm "; private static final String DS_MARK = "k:ds "; + private static final String DS_NAME = "dsname=\""; private static final String PLUGIN_MARK_SHORT = "k:4 "; private static final String PLUGIN_MARK = "k:shop "; @@ -296,6 +297,10 @@ public class AlphaFineDialog extends UIDialog { } else if (searchText.startsWith(CPT_MARK) || searchText.startsWith(FRM_MARK)) { getFileList(searchText); return; + } else if (searchText.startsWith(DS_MARK)) { + getFileList(DS_NAME + searchText.substring(searchText.indexOf(" ") + 1, searchText.length())); + return; + } else if (searchText.startsWith(PLUGIN_MARK_SHORT) || searchText.startsWith(PLUGIN_MARK)) { getPluginList(searchText.substring(searchText.indexOf(" ") + 1, searchText.length())); return; diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/FileSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/FileSearchManager.java index 80c9d4b64..a7d9fbe65 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/FileSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/FileSearchManager.java @@ -10,6 +10,7 @@ import com.fr.design.mainframe.alphafine.cell.model.FileModel; import com.fr.design.mainframe.alphafine.cell.model.MoreModel; import com.fr.design.mainframe.alphafine.model.SearchResult; import com.fr.file.filetree.FileNode; +import com.fr.general.ComparatorUtils; import com.fr.general.FRLogger; import com.fr.general.Inter; import com.fr.stable.StableUtils; @@ -25,6 +26,7 @@ import java.util.List; */ public class FileSearchManager implements AlphaFineSearchProcessor { private static final int MARK_LENGTH = 6; + private static final String DS_NAME = "dsname=\""; private static final MoreModel TITLE_MODEL = new MoreModel(Inter.getLocText("FR-Designer_Templates"), CellType.FILE); private static FileSearchManager fileSearchManager = null; private SearchResult filterModelList; @@ -68,7 +70,7 @@ public class FileSearchManager implements AlphaFineSearchProcessor { isContainFrm = false; searchText = searchText.substring(MARK_LENGTH, searchText.length()); } - if (StringUtils.isBlank(searchText)) { + if (StringUtils.isBlank(searchText) || ComparatorUtils.equals(searchText, DS_NAME)) { lessModelList.add(TITLE_MODEL); return lessModelList; }