From b50ce9f52b7996a2cf7abc9794f26082044c540f Mon Sep 17 00:00:00 2001
From: XiaXiang <xiaoxia@finereport.com>
Date: Tue, 13 Jun 2017 15:59:36 +0800
Subject: [PATCH] =?UTF-8?q?alphafine=20=E7=8C=9C=E6=82=A8=E5=96=9C?=
 =?UTF-8?q?=E6=AC=A2=E5=92=8C=E6=9C=AC=E5=9C=B0=E5=B8=B8=E7=94=A8=E5=8E=BB?=
 =?UTF-8?q?=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../alphafine/search/manager/RecentSearchManager.java      | 7 +++++++
 .../alphafine/search/manager/RecommendSearchManager.java   | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecentSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecentSearchManager.java
index 7e97c6ecd..ef9a8bcd9 100644
--- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecentSearchManager.java
+++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecentSearchManager.java
@@ -4,7 +4,9 @@ import com.fr.base.FRContext;
 import com.fr.base.Utils;
 import com.fr.design.mainframe.alphafine.AlphaFineConstants;
 import com.fr.design.mainframe.alphafine.AlphaFineHelper;
+import com.fr.design.mainframe.alphafine.CellType;
 import com.fr.design.mainframe.alphafine.cell.CellModelHelper;
+import com.fr.design.mainframe.alphafine.cell.model.ActionModel;
 import com.fr.design.mainframe.alphafine.cell.model.AlphaCellModel;
 import com.fr.design.mainframe.alphafine.cell.model.MoreModel;
 import com.fr.design.mainframe.alphafine.model.SearchResult;
@@ -224,6 +226,11 @@ public class RecentSearchManager extends XMLFileManager implements AlphaFineSear
             if (ComparatorUtils.equals(key, searchText)) {
                 recentModelList = recentKVModelMap.get(searchText);
                 int size = recentModelList.size();
+                for (AlphaCellModel model : recentModelList) {
+                    if (model.getType() == CellType.ACTION && !((ActionModel)model).getAction().isEnabled()) {
+                        recentModelList.remove(model);
+                    }
+                }
                 if (size > MAX_SIZE) {
                     return recentModelList.subList(size - MAX_SIZE, size);
                 }
diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecommendSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecommendSearchManager.java
index 053eac54e..17287b59b 100644
--- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecommendSearchManager.java
+++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecommendSearchManager.java
@@ -2,7 +2,9 @@ package com.fr.design.mainframe.alphafine.search.manager;
 
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.mainframe.alphafine.AlphaFineHelper;
+import com.fr.design.mainframe.alphafine.CellType;
 import com.fr.design.mainframe.alphafine.cell.CellModelHelper;
+import com.fr.design.mainframe.alphafine.cell.model.ActionModel;
 import com.fr.design.mainframe.alphafine.cell.model.AlphaCellModel;
 import com.fr.design.mainframe.alphafine.cell.model.MoreModel;
 import com.fr.design.mainframe.alphafine.model.SearchResult;
@@ -66,6 +68,11 @@ public class RecommendSearchManager implements AlphaFineSearchProcessor {
             } catch (JSONException e) {
                 FRLogger.getLogger().error("recommend search error! :" + e.getMessage());
             }
+            for (AlphaCellModel model : recommendModelList) {
+                if (model.getType() == CellType.ACTION && !((ActionModel)model).getAction().isEnabled()) {
+                    recommendModelList.remove(model);
+                }
+            }
             if (recommendModelList.size() > 0) {
                 modelList.add(new MoreModel(Inter.getLocText("FR-Designer_AlphaFine_Recommend"), false));
                 modelList.addAll(recommendModelList);