Browse Source

Pull request #5497: REPORT-56047 设计器11.0适配内容处理

Merge in DESIGN/design from ~HADES/design:feature/x to feature/x

* commit 'e6c0f39b7de951e914439468f706cbfe0119e1e9':
  REPORT-56047 设计器11.0适配内容处理
  REPORT-56047 设计器11.0适配内容处理
  REPORT-56047 设计器11.0适配内容处理
research/11.0
ju|剧浩宇 3 years ago
parent
commit
678cbb3a31
  1. 5
      designer-base/src/main/java/com/fr/design/env/LocalDesignerWorkspaceInfo.java

5
designer-base/src/main/java/com/fr/design/env/LocalDesignerWorkspaceInfo.java vendored

@ -21,11 +21,12 @@ public class LocalDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
private static final String REPORT_ENGINE_KEY = "report-engine-key"; private static final String REPORT_ENGINE_KEY = "report-engine-key";
private static final String REPORT_ENGINE_JAR; private static final String REPORT_ENGINE_JAR;
private static final String PROP_PATH = "/com/fr/env/jarVersion.properties";
static { static {
Properties properties = new Properties(); Properties properties = new Properties();
try { try {
properties.load(LocalDesignerWorkspaceInfo.class.getResourceAsStream("")); properties.load(LocalDesignerWorkspaceInfo.class.getResourceAsStream(PROP_PATH));
} catch (Exception ignored) { } catch (Exception ignored) {
} }
REPORT_ENGINE_JAR = properties.getProperty(REPORT_ENGINE_KEY, "default.jar"); REPORT_ENGINE_JAR = properties.getProperty(REPORT_ENGINE_KEY, "default.jar");
@ -104,7 +105,7 @@ public class LocalDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
return false; return false;
} }
File engineLib = new File(StableUtils.pathJoin(ProjectConstants.LIB_NAME, REPORT_ENGINE_JAR)); File engineLib = new File(StableUtils.pathJoin(this.path, ProjectConstants.LIB_NAME, REPORT_ENGINE_JAR));
// 非安装版本允许自由切换 // 非安装版本允许自由切换
boolean notExistLib = !ComparatorUtils.equals(GeneralUtils.readFullBuildNO(), InterProviderFactory.getProvider().getLocText("Fine-Core_Basic_About_No_Build")) boolean notExistLib = !ComparatorUtils.equals(GeneralUtils.readFullBuildNO(), InterProviderFactory.getProvider().getLocText("Fine-Core_Basic_About_No_Build"))
&& !engineLib.exists(); && !engineLib.exists();

Loading…
Cancel
Save