From 232e4395fc379ea53005ec21fdb06e5fc60d4362 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com>
Date: Mon, 23 Dec 2024 15:48:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?REPORT-140744=20=E3=80=90FR=E5=9B=BE?=
 =?UTF-8?q?=E8=A1=A8=E3=80=91=E5=9B=BE=E8=A1=A8=E6=8F=90=E7=A4=BA=E5=AF=8C?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=BC=96=E8=BE=91=E5=AD=97=E6=AE=B5=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E5=90=8E=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/com/fr/design/editor/script/editor.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer-chart/src/main/resources/com/fr/design/editor/script/editor.js b/designer-chart/src/main/resources/com/fr/design/editor/script/editor.js
index 54a268c63d..af69dbd9fc 100644
--- a/designer-chart/src/main/resources/com/fr/design/editor/script/editor.js
+++ b/designer-chart/src/main/resources/com/fr/design/editor/script/editor.js
@@ -129,7 +129,7 @@
                         return;
                     }
 
-                    value = window.transformI18nText(value);
+                    value = window.transformI18nText(value) ? window.transformI18nText(value) : value;
 
                     str += " " + key + "=\"" + value + "\"";
 

From bf2273d4896af05c92829632c28ad2cf8cc1b7e4 Mon Sep 17 00:00:00 2001
From: vito <vito@fanruan.com>
Date: Tue, 24 Dec 2024 14:14:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?REPORT-145036=20=E9=83=A8=E5=88=86=E6=96=B0?=
 =?UTF-8?q?=E5=88=9B=E5=B9=B3=E5=8F=B0=E8=AE=BE=E8=AE=A1=E5=99=A8=E6=89=93?=
 =?UTF-8?q?=E5=BC=80jxbrowser=E5=B4=A9=E6=BA=83=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/fr/design/jxbrowser/JxUIPane.java   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/designer-base/src/main/java/com/fr/design/jxbrowser/JxUIPane.java b/designer-base/src/main/java/com/fr/design/jxbrowser/JxUIPane.java
index 463cf39b7d..b2a0673ed6 100644
--- a/designer-base/src/main/java/com/fr/design/jxbrowser/JxUIPane.java
+++ b/designer-base/src/main/java/com/fr/design/jxbrowser/JxUIPane.java
@@ -23,6 +23,7 @@ import org.jetbrains.annotations.Nullable;
 
 import javax.swing.SwingUtilities;
 import java.awt.BorderLayout;
+import java.awt.Desktop;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -68,12 +69,22 @@ public class JxUIPane<T> extends ModernUIPane<T> {
         if (browser != null) {
             return;
         }
+        hackInITInnovationLinuxDesktop();
         initDebugIfNeeded();
         // 使用公共引擎创建浏览器
         browser = JxEngine.getPublicEngineInstance().newBrowser();
         add(BrowserView.newInstance(browser), BorderLayout.CENTER);
     }
 
+    /**
+     * hack：部分 Linux 信创桌面打开需要先初始化 Desktop
+     */
+    private static void hackInITInnovationLinuxDesktop() {
+        if (OperatingSystem.isLinux()) {
+            Desktop.getDesktop();
+        }
+    }
+
     /**
      * 按需初始化debug界面UI
      */