From 3e7f8e03efd7f7f8957e7f26b344a8b2fcf056ea Mon Sep 17 00:00:00 2001
From: "Bruce.Deng" <bruce.deng@fanruan.com>
Date: Thu, 24 Apr 2025 11:06:20 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-151045=20=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=96=B0=E5=BB=BA=E5=86=B3=E7=AD=96=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manager/impl/ActionSearchManager.java       | 12 ++++++------
 .../main/java/com/fr/start/MainDesigner.java    | 17 ++---------------
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/ActionSearchManager.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/ActionSearchManager.java
index c6b02160f8..05ae9b56cd 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/ActionSearchManager.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/ActionSearchManager.java
@@ -29,7 +29,6 @@ public class ActionSearchManager implements AlphaFineSearchProvider {
     private SearchResult filterModelList;
     private SearchResult lessModelList;
     private SearchResult moreModelList;
-    private SearchResult defaultModelList;
 
     public static ActionSearchManager getInstance() {
         if (instance == null) {
@@ -46,11 +45,7 @@ public class ActionSearchManager implements AlphaFineSearchProvider {
      * 初始化的时候初始化默认功能列表
      * */
     private ActionSearchManager() {
-        defaultModelList = new SearchResult();
-        List<UpdateActionModel> updateActions = UpdateActionManager.getUpdateActionManager().getUpdateActions();
-        for (UpdateActionModel updateActionModel : updateActions) {
-            defaultModelList.add(new ActionModel(updateActionModel.getActionName(), updateActionModel.getParentName(), updateActionModel.getAction()));
-        }
+
     }
 
     /**
@@ -130,6 +125,11 @@ public class ActionSearchManager implements AlphaFineSearchProvider {
 
     @Override
     public SearchResult getDefaultResult() {
+        SearchResult defaultModelList = new SearchResult();
+        List<UpdateActionModel> updateActions = UpdateActionManager.getUpdateActionManager().getUpdateActions();
+        for (UpdateActionModel updateActionModel : updateActions) {
+            defaultModelList.add(new ActionModel(updateActionModel.getActionName(), updateActionModel.getParentName(), updateActionModel.getAction()));
+        }
         return defaultModelList;
     }
 
diff --git a/designer-realize/src/main/java/com/fr/start/MainDesigner.java b/designer-realize/src/main/java/com/fr/start/MainDesigner.java
index 632548607b..dd170159be 100644
--- a/designer-realize/src/main/java/com/fr/start/MainDesigner.java
+++ b/designer-realize/src/main/java/com/fr/start/MainDesigner.java
@@ -11,8 +11,8 @@ import com.fr.design.actions.server.ServerConfigManagerAction;
 import com.fr.design.actions.server.TemplateThemeManagerAction;
 import com.fr.design.actions.server.WidgetManagerAction;
 import com.fr.design.base.mode.DesignModeContext;
-import com.fr.design.carton.latency.DesignerLatencyMetric;
 import com.fr.design.carton.SwitchForSwingChecker;
+import com.fr.design.carton.latency.DesignerLatencyMetric;
 import com.fr.design.constants.DesignerLaunchStatus;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.deeplink.DeepLinkManager;
@@ -45,7 +45,6 @@ import com.fr.design.menu.SeparatorDef;
 import com.fr.design.menu.ShortCut;
 import com.fr.design.module.ChartEmptyDataStyleAction;
 import com.fr.design.module.ChartPreStyleAction;
-import com.fr.design.module.DesignModuleFactory;
 import com.fr.design.monitor.DesignerLifecycleMonitorContext;
 import com.fr.design.notification.ui.NotificationCenterPane;
 import com.fr.design.share.SharableManager;
@@ -217,20 +216,8 @@ public class MainDesigner extends BaseDesigner {
     @Override
     public ShortCut[] createNewFileShortCuts() {
         ArrayList<ShortCut> shortCuts = new ArrayList<ShortCut>();
-//        shortCuts.add(new NewWorkBookXAction());
         shortCuts.add(new NewWorkBookAction());
-        // 决策报表、聚合报表归入其他
-        MenuDef newOtherFileMenuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_New_Other_Template"));
-        newOtherFileMenuDef.setIconPath("/com/fr/design/images/buttonicon/new_other");
-        try {
-            if (DesignModuleFactory.getNewFormAction() != null) {
-                newOtherFileMenuDef.addShortCut((ShortCut) DesignModuleFactory.getNewFormAction().newInstance());
-            }
-        } catch (Exception e) {
-            FineLoggerFactory.getLogger().error(e.getMessage(), e);
-        }
-        newOtherFileMenuDef.addShortCut(new NewPolyReportAction());
-        shortCuts.add(newOtherFileMenuDef);
+        shortCuts.add(new NewPolyReportAction());
         return shortCuts.toArray(new ShortCut[0]);
     }