From aeec29f711896ecd7daf6c8b6206017134dd1da2 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Thu, 8 Jun 2017 18:36:54 +0800 Subject: [PATCH] bug fix alphafine --- .../alphafine/search/manager/ActionSearchManager.java | 2 +- .../alphafine/search/manager/DocumentSearchManager.java | 8 ++++---- .../alphafine/search/manager/PluginSearchManager.java | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/ActionSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/ActionSearchManager.java index aefb274321..a38c52b434 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/ActionSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/ActionSearchManager.java @@ -40,7 +40,7 @@ public class ActionSearchManager implements AlphaFineSearchProcessor { List updateActions = UpdateActionManager.getUpdateActionManager().getUpdateActions(); for (UpdateActionModel updateActionModel : updateActions) { if (StringUtils.isNotBlank(updateActionModel.getSearchKey())) { - if (updateActionModel.getSearchKey().toLowerCase().contains(searchText.toLowerCase()) ) { + if (updateActionModel.getSearchKey().toLowerCase().contains(searchText.toLowerCase()) && updateActionModel.getAction().isEnabled()) { filterModelList.add(new ActionModel(updateActionModel.getActionName(), updateActionModel.getParentName(), updateActionModel.getAction())); } } diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/DocumentSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/DocumentSearchManager.java index 1468d36e7b..7d5d4a6dfa 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/DocumentSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/DocumentSearchManager.java @@ -21,7 +21,7 @@ public class DocumentSearchManager implements AlphaFineSearchProcessor { private static DocumentSearchManager documentSearchManager = null; private SearchResult lessModelList; private SearchResult moreModelList; - private static final MoreModel titleModel = new MoreModel(Inter.getLocText("FR-Designer_COMMUNITY_HELP"), CellType.DOCUMENT); + private static final MoreModel TITLE_MODEL = new MoreModel(Inter.getLocText("FR-Designer_COMMUNITY_HELP"), CellType.DOCUMENT); public synchronized static DocumentSearchManager getDocumentSearchManager() { if (documentSearchManager == null) { @@ -64,7 +64,7 @@ public class DocumentSearchManager implements AlphaFineSearchProcessor { if (jsonArray.length() > AlphaFineConstants.SHOW_SIZE) { lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer_COMMUNITY_HELP"), Inter.getLocText("FR-Designer_AlphaFine_ShowAll"),true, CellType.DOCUMENT)); } else { - lessModelList.add(0, titleModel); + lessModelList.add(0, TITLE_MODEL); if (lessModelList.size() == 1) { lessModelList.add(AlphaFineHelper.noResultModel); } @@ -84,7 +84,7 @@ public class DocumentSearchManager implements AlphaFineSearchProcessor { private SearchResult getNoResultList() { SearchResult result = new SearchResult(); - result.add(0, titleModel); + result.add(0, TITLE_MODEL); result.add(AlphaFineHelper.noResultModel); return result; @@ -92,7 +92,7 @@ public class DocumentSearchManager implements AlphaFineSearchProcessor { private SearchResult getNoConnectList() { SearchResult result = new SearchResult(); - result.add(0, titleModel); + result.add(0, TITLE_MODEL); result.add(AlphaFineHelper.noConnectionModel); return result; } diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/PluginSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/PluginSearchManager.java index fe2e0d8cec..44266cad27 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/PluginSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/PluginSearchManager.java @@ -23,7 +23,7 @@ import java.net.URLEncoder; public class PluginSearchManager implements AlphaFineSearchProcessor { private static PluginSearchManager pluginSearchManager = null; - private static final MoreModel titleModel = new MoreModel(Inter.getLocText("FR-Designer-Plugin_Addon"), CellType.PLUGIN); + private static final MoreModel TITLE_MODEL = new MoreModel(Inter.getLocText("FR-Designer-Plugin_Addon"), CellType.PLUGIN); private SearchResult lessModelList; @@ -72,7 +72,7 @@ public class PluginSearchManager implements AlphaFineSearchProcessor { if (jsonArray.length() > AlphaFineConstants.SHOW_SIZE) { lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer-Plugin_Addon"), Inter.getLocText("FR-Designer_AlphaFine_ShowAll"),true, CellType.PLUGIN)); } else { - lessModelList.add(0, titleModel); + lessModelList.add(0, TITLE_MODEL); if (lessModelList.size() == 1) { lessModelList.add(AlphaFineHelper.noResultModel); } @@ -94,7 +94,7 @@ public class PluginSearchManager implements AlphaFineSearchProcessor { private SearchResult getNoResultList() { SearchResult result = new SearchResult(); - result.add(0, titleModel); + result.add(0, TITLE_MODEL); result.add(AlphaFineHelper.noResultModel); return result; @@ -102,7 +102,7 @@ public class PluginSearchManager implements AlphaFineSearchProcessor { private SearchResult getNoConnectList() { SearchResult result = new SearchResult(); - result.add(0, titleModel); + result.add(0, TITLE_MODEL); result.add(AlphaFineHelper.noConnectionModel); return result; }