Merge pull request #7580 in DESIGN/design from release/10.0 to bugfix/10.0

* commit '3f786016c6ff26cc70ac49f277b36c886708f5db':
  REPORT-58799 模版缺失插件提示无法关闭

designer-realize/src/main/java/com/fr/design/mainframe/app/DesignerAppUtils.java

@@ -8,7 +8,6 @@ import com.fr.design.extra.exe.callback.ModifyStatusCallback;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.app.PluginRemote.PluginStatus;
-import com.fr.design.ui.util.UIUtil;
 import com.fr.locale.InterProviderFactory;
 import com.fr.plugin.context.PluginMarker;
 import com.fr.plugin.context.PluginMarkerAdapter;
@@ -27,6 +26,7 @@ import com.fr.third.guava.cache.CacheBuilder;
 import com.fr.third.guava.collect.Multimap;
 import com.fr.workspace.WorkContext;
 
+import javax.swing.SwingUtilities;
 import java.time.Duration;
 import java.util.Collection;
 import java.util.Map;
@@ -167,8 +167,8 @@ public class DesignerAppUtils {
         disable.clear();
         // 从所有未安装中过滤远程未启用的，添加到未启用列表
         disable.addAll(notInstall.stream().filter(plugin ->
-                pluginRemoteStatus.containsKey(plugin.getPluginID())
+                        pluginRemoteStatus.containsKey(plugin.getPluginID())
-                        && !pluginRemoteStatus.get(plugin.getPluginID()).isRunning())
+                                && !pluginRemoteStatus.get(plugin.getPluginID()).isRunning())
                 .collect(Collectors.toList()));
         // 清理未安装中所有远程安装过的插件（包含启用和未启用）
         notInstall.removeIf(adapter -> pluginRemoteStatus.containsKey(adapter.getPluginID()));
@@ -183,7 +183,7 @@ public class DesignerAppUtils {
         // 试图获取多行读取错误提示并缓存待处理列表
         String detail = dealWithErrorDetailMultiLineAndCache(path);
         if (detail.length() > 0) {
-            UIUtil.invokeLaterIfNeeded(() -> {
+            SwingUtilities.invokeLater(() -> {
                 if (WorkContext.getCurrent().isLocal()) {
                     UIExpandDialog.Builder()
                             .owner(DesignerContext.getDesignerFrame())