From df58ea9ae29ec08d7b7ecea53152ca751162ea00 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Thu, 25 Jul 2024 10:43:06 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-127453=20frm=E9=97=AE=E9=A2=98=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/startup/ui/StartupPageModel.java | 12 ++++++++++-- .../boot/env/function/app/DesignAppComponent.java | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/designer-base/src/main/java/com/fr/startup/ui/StartupPageModel.java b/designer-base/src/main/java/com/fr/startup/ui/StartupPageModel.java index a461ee33b5..62b20d50d0 100644 --- a/designer-base/src/main/java/com/fr/startup/ui/StartupPageModel.java +++ b/designer-base/src/main/java/com/fr/startup/ui/StartupPageModel.java @@ -1,5 +1,6 @@ package com.fr.startup.ui; +import com.fr.base.extension.FileExtension; import com.fr.design.DesignerEnvManager; import com.fr.design.env.DesignerWorkspaceInfo; import com.fr.design.env.DesignerWorkspaceType; @@ -19,7 +20,8 @@ import java.util.stream.Collectors; * created by Harrison on 2022/07/06 **/ public class StartupPageModel { - + private static final String FRM = "frm"; + private static final String FORM = "form"; private StartupWorkspaceBean selectWorkspaceInfo; private List workspaceInfos = new ArrayList<>(); @@ -57,7 +59,13 @@ public class StartupPageModel { for (StartupWorkspaceBean info : infos) { String name = info.getName(); List recentFiles = envManager.getRecentOpenedFilePathList4Env(name); - recentFileMap.put(name, recentFiles); + List checkFiles = new ArrayList<>(); + for (String s : recentFiles) { + if (!s.endsWith(FRM) && !s.endsWith(FORM)) { + checkFiles.add(s); + } + } + recentFileMap.put(name, checkFiles); } return new StartupPageModel(infos, recentFileMap); } diff --git a/designer-realize/src/main/java/com/fanruan/boot/env/function/app/DesignAppComponent.java b/designer-realize/src/main/java/com/fanruan/boot/env/function/app/DesignAppComponent.java index e2f59dba9c..55ceb2de9d 100644 --- a/designer-realize/src/main/java/com/fanruan/boot/env/function/app/DesignAppComponent.java +++ b/designer-realize/src/main/java/com/fanruan/boot/env/function/app/DesignAppComponent.java @@ -56,6 +56,6 @@ public class DesignAppComponent { */ @Supplemental public void prepare() { - Carina.getApplicationContext().group(AppGroup.class).addAll(new CptApp(), new CptxApp(), new FormApp(), new XlsApp(), new XlsxApp()); + Carina.getApplicationContext().group(AppGroup.class).addAll(new CptApp(), new CptxApp(), new XlsApp(), new XlsxApp()); } }