Merge pull request #12363 in DESIGN/design from final/11.0 to release/11.0

* commit '0bd8a0cc451eed63ad0bae4016f873b136daa1f3':
  REPORT-89867 插件管理整体优化 fix:兼容问题
  REPORT-98903 fix: jxbrowser v7自动启动V6

designer-base/src/main/java/com/fr/design/jxbrowser/JxUIPane.java

@@ -262,6 +262,8 @@ public class JxUIPane<T> extends ModernUIPane<T> {
         private String html;
 
         public Builder() {
+            // 为了兼容继承关系，但又不允许创建，用这个方式先处理一下
+            super((ModernUIPane<T>) null);
             this.namespace = DEFAULT_NAMESPACE;
             this.variable = DEFAULT_VARIABLE;
             this.expression = DEFAULT_EXPRESSION;

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