From fae529f30b079fae11ffd90d5481baa674dc2325 Mon Sep 17 00:00:00 2001
From: XiaXiang <xiaoxia@finereport.com>
Date: Wed, 24 May 2017 19:40:27 +0800
Subject: [PATCH] bug fix

---
 .../alphafine/search/manager/ActionSearchManager.java  |  7 +++----
 .../fr/design/mainframe/toolbar/UpdateActionModel.java | 10 ++++++++++
 2 files changed, 13 insertions(+), 4 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 902ab430fe..32b71eeb33 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
@@ -38,10 +38,9 @@ public class ActionSearchManager implements AlphaFineSearchProcessor {
         if (DesignerEnvManager.getEnvManager().getAlphafineConfigManager().isContainAction()) {
             List<UpdateActionModel> updateActions = UpdateActionManager.getUpdateActionManager().getUpdateActions();
             for (UpdateActionModel updateActionModel : updateActions) {
-                UpdateAction updateAction = updateActionModel.getAction();
-                if (updateAction.getName() != null) {
-                    if (updateAction.getName().toLowerCase().contains(searchText.toLowerCase()) || updateActionModel.getParentName().toLowerCase().contains(searchText.toLowerCase())) {
-                        filterModelList.add(new ActionModel(updateAction.getName(), updateActionModel.getParentName(), updateAction));
+                if (updateActionModel.getActionName() != null) {
+                    if (updateActionModel.getActionName().toLowerCase().contains(searchText.toLowerCase()) || updateActionModel.getParentName().toLowerCase().contains(searchText.toLowerCase())) {
+                        filterModelList.add(new ActionModel(updateActionModel.getActionName(), updateActionModel.getParentName(), updateActionModel.getAction()));
                     }
                 }
             }
diff --git a/designer_base/src/com/fr/design/mainframe/toolbar/UpdateActionModel.java b/designer_base/src/com/fr/design/mainframe/toolbar/UpdateActionModel.java
index b142776184..8bfda2310e 100644
--- a/designer_base/src/com/fr/design/mainframe/toolbar/UpdateActionModel.java
+++ b/designer_base/src/com/fr/design/mainframe/toolbar/UpdateActionModel.java
@@ -7,11 +7,13 @@ import com.fr.design.actions.UpdateAction;
  */
 public class UpdateActionModel {
     private String parentName;
+    private String actionName;
     private UpdateAction action;
 
     public UpdateActionModel(String parentName, UpdateAction action) {
         this.parentName = parentName;
         this.action = action;
+        this.actionName = action.getName();
     }
 
     public String getParentName() {
@@ -29,4 +31,12 @@ public class UpdateActionModel {
     public void setAction(UpdateAction action) {
         this.action = action;
     }
+
+    public String getActionName() {
+        return actionName;
+    }
+
+    public void setActionName(String actionName) {
+        this.actionName = actionName;
+    }
 }