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; 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; }