From e788cf35fa623689ba6c721cb6407cd1708e8e61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?=
 <Levy.Xie@fanruan.com>
Date: Thu, 20 Feb 2025 14:27:21 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-148326=20fix:=E3=80=90NewUI=E3=80=91?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BF=9C=E7=A8=8B=E5=88=87=E6=8D=A2=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E5=8A=A8=E7=94=BB=E4=B8=BAindeterminate?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fine/component/popup/ProgressChild.java  |  9 +++++++++
 .../java/com/fine/theme/utils/GlassLayerLoader.java   | 11 +++++++++++
 .../main/java/com/fr/design/EnvChangeEntrance.java    |  4 ++--
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/designer-base/src/main/java/com/fine/component/popup/ProgressChild.java b/designer-base/src/main/java/com/fine/component/popup/ProgressChild.java
index d56cafc95a..50d814f662 100644
--- a/designer-base/src/main/java/com/fine/component/popup/ProgressChild.java
+++ b/designer-base/src/main/java/com/fine/component/popup/ProgressChild.java
@@ -85,6 +85,15 @@ public class ProgressChild extends GlassPaneChild {
         return this;
     }
 
+    /**
+     * 设置进度条为不确定模式、无限加载
+     *
+     */
+    public ProgressChild asIndeterminate() {
+        progressBar.setIndeterminate(true);
+        return this;
+    }
+
     private void initLayout() {
         setLayout(new BorderLayout());
         setPreferredSize(FineUIScale.createScaleDimension(400, 100));
diff --git a/designer-base/src/main/java/com/fine/theme/utils/GlassLayerLoader.java b/designer-base/src/main/java/com/fine/theme/utils/GlassLayerLoader.java
index ced8ba30df..8b7540b7f3 100644
--- a/designer-base/src/main/java/com/fine/theme/utils/GlassLayerLoader.java
+++ b/designer-base/src/main/java/com/fine/theme/utils/GlassLayerLoader.java
@@ -100,4 +100,15 @@ public class GlassLayerLoader {
         runWithLoader(task, DesignerContext.getDesignerFrame(), new ProgressChild(info).setMaxWait(maxWait));
     }
 
+    /**
+     * 进度条遮罩加载动画，进度条持续加载
+     *
+     * @param task         耗时任务
+     * @param info         显示加载面板的 JFrame
+     * @param <T>          任务的返回值类型
+     */
+    public <T> void runWithProgressLoader(Callable<T> task, String info) {
+        runWithLoader(task, DesignerContext.getDesignerFrame(), new ProgressChild(info).asIndeterminate());
+    }
+
 }
diff --git a/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java b/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java
index 75afa6e934..1b4eeea9c8 100644
--- a/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java
+++ b/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java
@@ -108,7 +108,7 @@ public class EnvChangeEntrance {
                 VersionCheckUtils.showVersionCheckDialog(envName);
             }
             return null;
-        }, Toolkit.i18nText("Fine-Design_Basic_M_Switch_Workspace"), 5);
+        }, Toolkit.i18nText("Fine-Design_Basic_M_Switch_Workspace"));
     }
 
     /**
@@ -540,7 +540,7 @@ public class EnvChangeEntrance {
                         VersionCheckUtils.showVersionCheckDialog(envListPane.getSelectedName());
                     }
                     return null;
-                }, Toolkit.i18nText("Fine-Design_Basic_M_Switch_Workspace"), 5);
+                }, Toolkit.i18nText("Fine-Design_Basic_M_Switch_Workspace"));
             }
 
             @Override