Pull request #15957: REPORT-143738 使用jxbrowser的JxUIPane组件优化卡顿 & REPORT-145158 [jsvg] Paths should be rendered up to the location of error

Merge in DESIGN/design from ~VITO/c-design:fbp/feature to fbp/feature

* commit '43e4b6382339e81588766e0c4e736c958ad0b784':
  REPORT-145158 [jsvg] Paths should be rendered up to the location of error
  无jira任务 代码质量
  REPORT-143738 使用jxbrowser的JxUIPane组件优化卡顿

build.gradle

@@ -116,7 +116,7 @@ allprojects {
         implementation 'com.fr.report:engine-chart:' + frDevVersion
         implementation 'com.fr.report:engine-i18n:' + frDevVersion
         implementation 'com.fr.design:design-i18n:' + frDevVersion
-        implementation 'com.github.weisj:jsvg:1.2.0'
+        implementation 'com.github.weisj:jsvg:1.6.1'
         implementation 'com.formdev:flatlaf:3.4'
         implementation 'com.formdev:flatlaf-extras:3.4'
         implementation 'com.fine.swing.ui:layout:1.0-SNAPSHOT'

designer-base/src/main/java/com/fr/design/jxbrowser/JxUIPane.java

@@ -23,16 +23,24 @@ import com.teamdev.jxbrowser.view.swing.BrowserView;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import javax.swing.JProgressBar;
 import javax.swing.SwingUtilities;
+import javax.swing.SwingWorker;
 import java.awt.BorderLayout;
+import java.awt.Desktop;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.function.Consumer;
 
+import static com.fine.swing.ui.layout.Layouts.cell;
+import static com.fine.swing.ui.layout.Layouts.column;
+import static com.fine.swing.ui.layout.Layouts.flex;
+import static com.fine.swing.ui.layout.Layouts.row;
 import static com.fr.design.ui.ModernUIConstants.COMPONENT_TAG;
 import static com.fr.design.ui.ModernUIConstants.DEFAULT_EXPRESSION;
 import static com.fr.design.ui.ModernUIConstants.DEFAULT_NAMESPACE;
@@ -61,33 +69,85 @@ public class JxUIPane<T> extends BasicPane {
      */
     public static final String COLON = ":";
     private static final String COLON_ESCAPE = "\\:";
-
     private Browser browser;
     private String namespace = "Pool";
     private String variable = "data";
     private String expression = "update()";
-    private JxEngine jxEngine = JxEngine.getInstance();
+    private final JxEngine jxEngine;
-
+    private Consumer<Browser> initCallback = null;
-    private JxUIPane() {
-    }
 
     private JxUIPane(JxEngine jxEngine) {
         this.jxEngine = jxEngine;
     }
 
-    private void initialize() {
+    private void initialize(Consumer<Browser> consumer) {
         setLayout(new BorderLayout());
         if (browser != null) {
             return;
         }
+        hackInITInnovationLinuxDesktop();
+        initCallback = consumer;
         initDebugIfNeeded();
-        browser = jxEngine.getEngine().newBrowser();
+        asyncInitBrowser();
-        if (jxEngine.isDisableWebSecurity()) {
+    }
-            // 忽略证书验证，兼容有些情况下自定义证书与实际域名不匹配的情况。
+
-            // 虽然不是个正确的方式，但真有这么用的还是兼容一下
+    /**
-            browser.set(CertificateErrorCallback.class, (params, action) -> action.allow());
+     * 启动 jxbrowser 引擎，过程包含解压文件等过程，异步操作。
+     */
+    private void asyncInitBrowser() {
+        JProgressBar jProgressBar = showProgressBar();
+        new SwingWorker<Browser, Void>() {
+
+            @Override
+            protected Browser doInBackground() {
+                browser = jxEngine.getEngine().newBrowser();
+                if (jxEngine.isDisableWebSecurity()) {
+                    // 忽略证书验证，兼容有些情况下自定义证书与实际域名不匹配的情况。
+                    // 虽然不是个正确的方式，但真有这么用的还是兼容一下
+                    browser.set(CertificateErrorCallback.class, (params, action) -> action.allow());
+                }
+                return browser;
+            }
+
+            @Override
+            protected void done() {
+                jProgressBar.setVisible(false);
+                try {
+                    Browser mBrowser = get();
+                    add(BrowserView.newInstance(mBrowser), BorderLayout.CENTER);
+                    if (initCallback != null) {
+                        initCallback.accept(mBrowser);
+                    }
+                    initCallback = null;
+                    revalidate();
+                } catch (InterruptedException | ExecutionException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }.execute();
+    }
+
+    /**
+     * hack：部分 Linux 信创桌面打开需要先初始化 Desktop
+     */
+    private static void hackInITInnovationLinuxDesktop() {
+        if (OperatingSystem.isLinux()) {
+            Desktop.getDesktop();
         }
-        add(BrowserView.newInstance(browser), BorderLayout.CENTER);
+    }
+
+    /**
+     * 加载组件时显示一个进度条
+     */
+    private @NotNull JProgressBar showProgressBar() {
+        JProgressBar jProgressBar = new JProgressBar();
+        jProgressBar.setIndeterminate(true);
+        add(row(
+                flex(),
+                column(flex(), cell(jProgressBar), flex()),
+                flex()
+        ).getComponent(), BorderLayout.CENTER);
+        return jProgressBar;
     }
 
     /**
@@ -97,8 +157,23 @@ public class JxUIPane<T> extends BasicPane {
      * @param headers 自定义头
      */
     public void addXHRHeaders(Map<String, String> headers) {
-        if (JxEngine.getInstance() != jxEngine) {
+        warpCallback(browser -> {
-            jxEngine.addXHRHeaders(headers);
+            if (JxEngine.getInstance() != jxEngine) {
+                jxEngine.addXHRHeaders(headers);
+            }
+        });
+    }
+
+    /**
+     * 异步链式调用
+     *
+     * @param then 后续任务
+     */
+    private void warpCallback(Consumer<Browser> then) {
+        if (initCallback != null) {
+            initCallback = initCallback.andThen(then);
+        } else {
+            then.accept(browser);
         }
     }
 
@@ -161,7 +236,7 @@ public class JxUIPane<T> extends BasicPane {
      * @param url 新的地址
      */
     public void redirect(String url) {
-        browser.navigation().loadUrl(encodeWindowsPath(url));
+        warpCallback(browser -> browser.navigation().loadUrl(encodeWindowsPath(url)));
     }
 
     /**
@@ -172,7 +247,7 @@ public class JxUIPane<T> extends BasicPane {
      */
     public void redirect(String url, Map<String, String> map) {
         setMap(map);
-        browser.navigation().loadUrl(encodeWindowsPath(url));
+        warpCallback(browser -> browser.navigation().loadUrl(encodeWindowsPath(url)));
     }
 
     private void setMap(Map<String, String> map) {
@@ -195,19 +270,11 @@ public class JxUIPane<T> extends BasicPane {
      * @param t 数据类
      */
     public void populate(final T t) {
-        setInjectJsCallback(params -> {
+        warpCallback(browser -> setInjectJsCallback(params -> {
             executeJsObject(params.frame(), WINDOW + DOT + namespace)
                     .ifPresent(ns -> ns.putProperty(variable, t));
             return InjectJsCallback.Response.proceed();
-        });
+        }));
-        if (browser.mainFrame().isPresent()) {
-            executeJavaScript(WINDOW + DOT + namespace,
-                    (Consumer<JsObject>) jsObject -> {
-                        if (Objects.nonNull(jsObject)) {
-                            jsObject.putProperty(variable, t);
-                        }
-                    });
-        }
     }
 
     @Nullable
@@ -573,16 +640,17 @@ public class JxUIPane<T> extends BasicPane {
             pane.expression = expression;
             pane.setMap(parameterMap);
             pane.setComponent(component);
-            pane.initialize();
+            pane.initialize(browser -> {
-            injectJs(pane);
+                injectJs(pane);
-            if (!Objects.isNull(listenerPair)) {
+                if (!Objects.isNull(listenerPair)) {
-                pane.browser.navigation().on(listenerPair.getFirst(), listenerPair.getSecond());
+                    browser.navigation().on(listenerPair.getFirst(), listenerPair.getSecond());
-            }
+                }
-            if (StringUtils.isNotEmpty(this.url)) {
+                if (StringUtils.isNotEmpty(url)) {
-                pane.browser.navigation().loadUrl(encodeWindowsPath(this.url));
+                    browser.navigation().loadUrl(encodeWindowsPath(url));
-            } else if (StringUtils.isNotEmpty(this.html)) {
+                } else if (StringUtils.isNotEmpty(html)) {
-                pane.browser.mainFrame().ifPresent(f -> f.loadHtml(html));
+                    browser.mainFrame().ifPresent(f -> f.loadHtml(html));
-            }
+                }
+            });
             return pane;
         }