From a01affc9e57d26a7f297938def0f6a54ed65cb2b Mon Sep 17 00:00:00 2001
From: "Destiny.Lin" <destiny.lin@fanruan.com>
Date: Tue, 10 Sep 2024 09:42:10 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-133888=20=E3=80=90fr-fbp=E5=9B=9E?=
 =?UTF-8?q?=E5=BD=92=E3=80=91=E6=96=87=E4=BB=B6=E6=95=B0=E6=8D=AE=E9=9B=86?=
 =?UTF-8?q?excel=E5=8F=AA=E8=83=BD=E8=A2=AB=E9=80=89=E4=B8=80=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/file/FILEChooserPane.java     | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/designer-base/src/main/java/com/fr/file/FILEChooserPane.java b/designer-base/src/main/java/com/fr/file/FILEChooserPane.java
index 2cf1016c48..8b6d645fb3 100644
--- a/designer-base/src/main/java/com/fr/file/FILEChooserPane.java
+++ b/designer-base/src/main/java/com/fr/file/FILEChooserPane.java
@@ -1092,7 +1092,29 @@ public class FILEChooserPane extends BasicPane {
         String lastDirectoryPath = DesignerEnvManager.getEnvManager().getDialogCurrentDirectory();
         String prefix = DesignerEnvManager.getEnvManager().getCurrentDirectoryPrefix();
         FILE lastDirectory = FILEFactory.createFolder(prefix + lastDirectoryPath);
+        dealCurrentDirectory(model, lastDirectory) ;
+    }
+
+
+
+    private void setPlaceListModel4DataFile(AbstractPlaceListModel model) {
+        if (placesList == null) {
+            return;
+        }
+        placesList.setModel(model);
+        String lastDirectoryPath = FILEFactory.ENV_PREFIX;
+        String prefix = ProjectConstants.REPORTLETS_NAME;
+        FILE lastDirectory;
+        if (model instanceof FileDataPlaceListModel) {
+            FileDataFILE file = new FileDataFILE(new FileNode(), false, StringUtils.EMPTY, ((FileDataPlaceListModel) model).getType());
+            lastDirectory = FILEFactory.createFolder(file, prefix + lastDirectoryPath);
+        } else {
+            lastDirectory = FILEFactory.createFolder(prefix + lastDirectoryPath);
+        }
+        dealCurrentDirectory(model, lastDirectory);
+    }
 
+    private void dealCurrentDirectory(AbstractPlaceListModel model, FILE lastDirectory) {
         model.setCD(lastDirectory);
 
         if (currentDirectory != null) {
@@ -1109,6 +1131,7 @@ public class FILEChooserPane extends BasicPane {
         }
     }
 
+
     private void setPlaceListModel() {
         if (placesList == null) {
             return;
@@ -1140,7 +1163,7 @@ public class FILEChooserPane extends BasicPane {
         if (placesList == null) {
             return;
         }
-        setPlaceListModel(new FileDataPlaceListModel(type));
+        setPlaceListModel4DataFile(new FileDataPlaceListModel(type));
     }
 
     protected void setFileCAPlaceListModel() {