Browse Source

bug fix alphafine

master
XiaXiang 7 years ago
parent
commit
aeec29f711
  1. 2
      designer/src/com/fr/design/mainframe/alphafine/search/manager/ActionSearchManager.java
  2. 8
      designer/src/com/fr/design/mainframe/alphafine/search/manager/DocumentSearchManager.java
  3. 8
      designer/src/com/fr/design/mainframe/alphafine/search/manager/PluginSearchManager.java

2
designer/src/com/fr/design/mainframe/alphafine/search/manager/ActionSearchManager.java

@ -40,7 +40,7 @@ public class ActionSearchManager implements AlphaFineSearchProcessor {
List<UpdateActionModel> updateActions = UpdateActionManager.getUpdateActionManager().getUpdateActions(); List<UpdateActionModel> updateActions = UpdateActionManager.getUpdateActionManager().getUpdateActions();
for (UpdateActionModel updateActionModel : updateActions) { for (UpdateActionModel updateActionModel : updateActions) {
if (StringUtils.isNotBlank(updateActionModel.getSearchKey())) { 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())); filterModelList.add(new ActionModel(updateActionModel.getActionName(), updateActionModel.getParentName(), updateActionModel.getAction()));
} }
} }

8
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 static DocumentSearchManager documentSearchManager = null;
private SearchResult lessModelList; private SearchResult lessModelList;
private SearchResult moreModelList; 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() { public synchronized static DocumentSearchManager getDocumentSearchManager() {
if (documentSearchManager == null) { if (documentSearchManager == null) {
@ -64,7 +64,7 @@ public class DocumentSearchManager implements AlphaFineSearchProcessor {
if (jsonArray.length() > AlphaFineConstants.SHOW_SIZE) { 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)); lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer_COMMUNITY_HELP"), Inter.getLocText("FR-Designer_AlphaFine_ShowAll"),true, CellType.DOCUMENT));
} else { } else {
lessModelList.add(0, titleModel); lessModelList.add(0, TITLE_MODEL);
if (lessModelList.size() == 1) { if (lessModelList.size() == 1) {
lessModelList.add(AlphaFineHelper.noResultModel); lessModelList.add(AlphaFineHelper.noResultModel);
} }
@ -84,7 +84,7 @@ public class DocumentSearchManager implements AlphaFineSearchProcessor {
private SearchResult getNoResultList() { private SearchResult getNoResultList() {
SearchResult result = new SearchResult(); SearchResult result = new SearchResult();
result.add(0, titleModel); result.add(0, TITLE_MODEL);
result.add(AlphaFineHelper.noResultModel); result.add(AlphaFineHelper.noResultModel);
return result; return result;
@ -92,7 +92,7 @@ public class DocumentSearchManager implements AlphaFineSearchProcessor {
private SearchResult getNoConnectList() { private SearchResult getNoConnectList() {
SearchResult result = new SearchResult(); SearchResult result = new SearchResult();
result.add(0, titleModel); result.add(0, TITLE_MODEL);
result.add(AlphaFineHelper.noConnectionModel); result.add(AlphaFineHelper.noConnectionModel);
return result; return result;
} }

8
designer/src/com/fr/design/mainframe/alphafine/search/manager/PluginSearchManager.java

@ -23,7 +23,7 @@ import java.net.URLEncoder;
public class PluginSearchManager implements AlphaFineSearchProcessor { public class PluginSearchManager implements AlphaFineSearchProcessor {
private static PluginSearchManager pluginSearchManager = null; 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; private SearchResult lessModelList;
@ -72,7 +72,7 @@ public class PluginSearchManager implements AlphaFineSearchProcessor {
if (jsonArray.length() > AlphaFineConstants.SHOW_SIZE) { 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)); lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer-Plugin_Addon"), Inter.getLocText("FR-Designer_AlphaFine_ShowAll"),true, CellType.PLUGIN));
} else { } else {
lessModelList.add(0, titleModel); lessModelList.add(0, TITLE_MODEL);
if (lessModelList.size() == 1) { if (lessModelList.size() == 1) {
lessModelList.add(AlphaFineHelper.noResultModel); lessModelList.add(AlphaFineHelper.noResultModel);
} }
@ -94,7 +94,7 @@ public class PluginSearchManager implements AlphaFineSearchProcessor {
private SearchResult getNoResultList() { private SearchResult getNoResultList() {
SearchResult result = new SearchResult(); SearchResult result = new SearchResult();
result.add(0, titleModel); result.add(0, TITLE_MODEL);
result.add(AlphaFineHelper.noResultModel); result.add(AlphaFineHelper.noResultModel);
return result; return result;
@ -102,7 +102,7 @@ public class PluginSearchManager implements AlphaFineSearchProcessor {
private SearchResult getNoConnectList() { private SearchResult getNoConnectList() {
SearchResult result = new SearchResult(); SearchResult result = new SearchResult();
result.add(0, titleModel); result.add(0, TITLE_MODEL);
result.add(AlphaFineHelper.noConnectionModel); result.add(AlphaFineHelper.noConnectionModel);
return result; return result;
} }

Loading…
Cancel
Save