Merge pull request #16772 in DESIGN/design from fbp/feature to fbp/research

* commit 'fbfa1927d0c7d78ffd8cb0d287023b3450d52aa5':
  REPORT-148326 fix:【NewUI】优化远程切换加载动画为indeterminate
  REPORT-148456 fix:【NewUI】遮罩层阻断鼠标事件
  REPORT-148456 fix:【NewUI】折叠面板动画问题修复

designer-base/src/main/java/com/fine/component/popup/GlassPopupManager.java

@@ -1,5 +1,6 @@
 package com.fine.component.popup;
 
+import javax.swing.JComponent;
 import javax.swing.JLayeredPane;
 import javax.swing.JRootPane;
 import javax.swing.SwingUtilities;
@@ -90,6 +91,16 @@ public class GlassPopupManager {
         JRootPane rootPane = SwingUtilities.getRootPane(container);
         instance.contentPane = rootPane.getContentPane();
         rootPane.setGlassPane(instance.layerPane);
+
+        interceptMouseEvents(instance.layerPane);
+    }
+
+    private static void interceptMouseEvents(JComponent layerPane) {
+        // 拦截鼠标事件
+        layerPane.addMouseListener(new MouseAdapter() {
+        });
+        layerPane.addMouseMotionListener(new MouseAdapter() {
+        });
     }
 
     /**

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));

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());
+    }
+
 }

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

designer-base/src/main/java/com/fr/design/foldablepane/UIExpandablePane.java

@@ -128,6 +128,7 @@ public class UIExpandablePane extends JPanel {
             HeaderPane hp = (HeaderPane) e.getSource();
             if (!Animator.useAnimation()) {
                 contentPanel.setVisible(!showExpand);
+                showExpand = !showExpand;
             } else if (!animator.isRunning()) {
                 animator.start();
             }