REPORT-5793

【9.0】从alphafine进入模板的web属性，显示的都是上一张模板的设置

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

@@ -2,6 +2,7 @@ package com.fr.design.mainframe.alphafine.search.manager;
 
 import com.fr.base.FRContext;
 import com.fr.base.Utils;
+import com.fr.design.actions.UpdateAction;
 import com.fr.design.mainframe.alphafine.AlphaFineConstants;
 import com.fr.design.mainframe.alphafine.AlphaFineHelper;
 import com.fr.design.mainframe.alphafine.CellType;
@@ -233,8 +234,12 @@ public class RecentSearchManager extends XMLFileManager implements AlphaFineSear
                 SearchResult searchResult = new SearchResult();
                 while (modelIterator.hasNext()) {
                     AlphaCellModel model = modelIterator.next();
-                    if (model.getType() == CellType.ACTION && !UpdateActionManager.getUpdateActionManager().isEnable(((ActionModel) model).getAction())) {
-                        continue;
+                    if (model.getType() == CellType.ACTION) {
+                        UpdateAction action = UpdateActionManager.getUpdateActionManager().getActionByName(model.getName());
+                        if (action != null) {
+                            ((ActionModel) model).setAction(action);
+                            searchResult.add(model);
+                        }
                     } else {
                         searchResult.add(model);
                     }

designer_base/src/com/fr/design/mainframe/toolbar/UpdateActionManager.java

@@ -27,12 +27,18 @@ public class UpdateActionManager {
         this.updateActions = updateActions;
     }
 
-    public boolean isEnable(UpdateAction updateAction) {
+    /**
+     * 根据action name获取action对象
+     *
+     * @param name
+     * @return
+     */
+    public UpdateAction getActionByName(String name) {
         for (UpdateActionModel action : updateActions) {
-            if (ComparatorUtils.equals(updateAction.getName(), action.getActionName()) && action.getAction().isEnabled()) {
-                return true;
+            if (ComparatorUtils.equals(name, action.getActionName()) && action.getAction().isEnabled()) {
+                return action.getAction();
             }
         }
-        return false;
+        return null;
     }
 }