Browse Source

Merge pull request #16021 in DESIGN/design from bugfix/11.0 to feature/x

* commit '86bd7f03c4168f412d8ced487e918ce829e7021c':
  REPORT-145036 部分新创平台设计器打开jxbrowser崩溃问题
  REPORT-140744 【FR图表】图表提示富文本编辑字段保存后为空
feature/x
superman 1 month ago
parent
commit
855d77ad1d
  1. 11
      designer-base/src/main/java/com/fr/design/jxbrowser/JxUIPane.java
  2. 2
      designer-chart/src/main/resources/com/fr/design/editor/script/editor.js

11
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 javax.swing.SwingUtilities;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Desktop;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
@ -68,12 +69,22 @@ public class JxUIPane<T> extends ModernUIPane<T> {
if (browser != null) { if (browser != null) {
return; return;
} }
hackInITInnovationLinuxDesktop();
initDebugIfNeeded(); initDebugIfNeeded();
// 使用公共引擎创建浏览器 // 使用公共引擎创建浏览器
browser = JxEngine.getPublicEngineInstance().newBrowser(); browser = JxEngine.getPublicEngineInstance().newBrowser();
add(BrowserView.newInstance(browser), BorderLayout.CENTER); add(BrowserView.newInstance(browser), BorderLayout.CENTER);
} }
/**
* hack部分 Linux 信创桌面打开需要先初始化 Desktop
*/
private static void hackInITInnovationLinuxDesktop() {
if (OperatingSystem.isLinux()) {
Desktop.getDesktop();
}
}
/** /**
* 按需初始化debug界面UI * 按需初始化debug界面UI
*/ */

2
designer-chart/src/main/resources/com/fr/design/editor/script/editor.js

@ -129,7 +129,7 @@
return; return;
} }
value = window.transformI18nText(value); value = window.transformI18nText(value) ? window.transformI18nText(value) : value;
str += " " + key + "=\"" + value + "\""; str += " " + key + "=\"" + value + "\"";

Loading…
Cancel
Save