From 6c7e0f066148ac94eb56a6b21ec9d3bd0e1a72ca Mon Sep 17 00:00:00 2001 From: vito Date: Mon, 3 Jul 2023 16:22:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-98903=20fix:=20jxbrowser=20v7?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=90=AF=E5=8A=A8V6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/jxbrowser/JxUIPane.java | 2 ++ 1 file changed, 2 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 efbca4a47e..97ffeadc75 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 @@ -262,6 +262,8 @@ public class JxUIPane extends ModernUIPane { private String html; public Builder() { + // 为了兼容继承关系，但又不允许创建，用这个方式先处理一下 + super((ModernUIPane) null); this.namespace = DEFAULT_NAMESPACE; this.variable = DEFAULT_VARIABLE; this.expression = DEFAULT_EXPRESSION; From 76f4b22b2c7d246dd4d470ed68a7f1bcff0b85ec Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Mon, 3 Jul 2023 18:21:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=20REPORT-89867=20=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=95=B4=E4=BD=93=E4=BC=98=E5=8C=96=20fix:?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer-base/src/main/java/com/fr/design/upm/UpmUtils.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/designer-base/src/main/java/com/fr/design/upm/UpmUtils.java b/designer-base/src/main/java/com/fr/design/upm/UpmUtils.java index 3d8252b759..3c8fe1caec 100644 --- a/designer-base/src/main/java/com/fr/design/upm/UpmUtils.java +++ b/designer-base/src/main/java/com/fr/design/upm/UpmUtils.java @@ -4,6 +4,7 @@ import com.fr.common.annotations.Negative; import com.fr.config.ServerPreferenceConfig; import com.fr.general.CloudCenter; import com.fr.general.GeneralContext; +import com.fr.general.GeneralUtils; import com.fr.stable.StringUtils; import java.util.ArrayList; @@ -32,6 +33,7 @@ public class UpmUtils { Map map4Tpl = new HashMap<>(); map4Tpl.put("version", ServerPreferenceConfig.getInstance().getOptimizedUPMVersion()); map4Tpl.put("new_version", fetchLatestVersion()); + map4Tpl.put("designer_version", GeneralUtils.getVersion()); map4Tpl.put("language", GeneralContext.getLocale().toString()); return map4Tpl; }