From 833dc98a7f594b206bba0dd5b93df4b5f19290fc Mon Sep 17 00:00:00 2001 From: vito Date: Thu, 15 Jun 2023 10:30:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=B4=A8=E9=87=8F=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/jxbrowser/MimeType.java | 2 +- .../design/jxbrowser/NxInterceptRequestCallback.java | 2 +- .../com/fr/design/login/DesignerLoginBridge.java | 6 ++++++ .../component/richText/VanChartRichEditorPane.java | 12 ++++++++++++ 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/jxbrowser/MimeType.java b/designer-base/src/main/java/com/fr/design/jxbrowser/MimeType.java index 583340ccf..602e46380 100644 --- a/designer-base/src/main/java/com/fr/design/jxbrowser/MimeType.java +++ b/designer-base/src/main/java/com/fr/design/jxbrowser/MimeType.java @@ -74,7 +74,7 @@ public enum MimeType { this.mimeType = mimeType; } - public String parseMimeType() { + public String getMimeType() { return mimeType; } diff --git a/designer-base/src/main/java/com/fr/design/jxbrowser/NxInterceptRequestCallback.java b/designer-base/src/main/java/com/fr/design/jxbrowser/NxInterceptRequestCallback.java index 014c52ff2..6a578afa6 100644 --- a/designer-base/src/main/java/com/fr/design/jxbrowser/NxInterceptRequestCallback.java +++ b/designer-base/src/main/java/com/fr/design/jxbrowser/NxInterceptRequestCallback.java @@ -113,7 +113,7 @@ public class NxInterceptRequestCallback implements InterceptUrlRequestCallback { } private boolean isHtml(String mimeType) { - return MimeType.HTML.parseMimeType().equals(mimeType); + return MimeType.HTML.getMimeType().equals(mimeType); } private Optional generateBasicUrlRequestJob(Params params, String mimeType, byte[] bytes) { diff --git a/designer-base/src/main/java/com/fr/design/login/DesignerLoginBridge.java b/designer-base/src/main/java/com/fr/design/login/DesignerLoginBridge.java index 1b196bedd..ad7d18055 100644 --- a/designer-base/src/main/java/com/fr/design/login/DesignerLoginBridge.java +++ b/designer-base/src/main/java/com/fr/design/login/DesignerLoginBridge.java @@ -55,6 +55,12 @@ public class DesignerLoginBridge { private final Map params; + /** + * 获取 js-java bridge + * + * @param window 全局环境 + * @return bridge + */ public static DesignerLoginBridge getBridge(JsObject window, Map params) { return new DesignerLoginBridge(window, params); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartRichEditorPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartRichEditorPane.java index de141f863..4a976ef42 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartRichEditorPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartRichEditorPane.java @@ -121,11 +121,23 @@ public class VanChartRichEditorPane { fieldNames.addAll(Arrays.asList(columnNames)); } + /** + * 创建富文本编辑器 + * + * @param richEditor 属性 + * @return 富文本编辑器 + */ public static JxUIPane createRichEditorPane(AttrTooltipRichText richEditor) { VanChartRichEditorModel model = getRichEditorModel(richEditor); return createRichEditorPane(model); } + /** + * 创建富文本编辑器 + * + * @param model 模型 + * @return 富文本编辑器 + */ public static JxUIPane createRichEditorPane(VanChartRichEditorModel model) { if (richEditorPane == null) { richEditorPane = initPane(model);