Browse Source

Pull request #4005: REPORT-49034 引用JS静态资源文件路径出错

Merge in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0

* commit '89680425d26246edf51c165429d06fa8ea68ca0e':
  REPORT-49034 引用JS静态资源文件路径出错
bugfix/10.0
Hades 4 years ago
parent
commit
0768cfeb31
  1. 4
      designer-base/src/main/java/com/fr/file/FILEChooserPane.java
  2. 4
      designer-base/src/main/java/com/fr/file/FILEFactory.java
  3. 2
      designer-base/src/main/java/com/fr/file/FileNodeFILE.java

4
designer-base/src/main/java/com/fr/file/FILEChooserPane.java

@ -1158,7 +1158,7 @@ public class FILEChooserPane extends BasicPane {
};
}
if (FILEChooserPane.this.showWebReport) {
webReportFILE = new FileNodeFILE(FRContext.getCommonOperator().getWebRootPath());
webReportFILE = new FileNodeFILE(FileNodeFILE.webRootPath);
}
if (FILEChooserPane.this.showLoc) {
processSystemFile();
@ -1219,7 +1219,7 @@ public class FILEChooserPane extends BasicPane {
}
if (FILEChooserPane.this.showWebReport) {
webReportFILE = new FileNodeFILE(FRContext.getCommonOperator().getWebRootPath());
webReportFILE = new FileNodeFILE(FileNodeFILE.webRootPath);
}
if (FILEChooserPane.this.showLoc) {
processSystemFile();

4
designer-base/src/main/java/com/fr/file/FILEFactory.java

@ -32,7 +32,7 @@ public class FILEFactory {
return new FileNodeFILE(new FileNode(path.substring(envPath.length() + 1), false));
} else if (path.startsWith(WEBREPORT_PREFIX)) {
return new FileNodeFILE(new FileNode(path.substring(WEBREPORT_PREFIX.length()), false),
FRContext.getCommonOperator().getWebRootPath());
FileNodeFILE.webRootPath);
} else if (path.startsWith(FILE_PREFIX)) {
return new FileFILE(new java.io.File(path.substring(FILE_PREFIX.length())));
} else {
@ -50,7 +50,7 @@ public class FILEFactory {
fixFILENodeAuth(new FileNode(path.substring(ENV_PREFIX.length()), true));
} else if (path.startsWith(WEBREPORT_PREFIX)) {
return new FileNodeFILE(new FileNode(path.substring(WEBREPORT_PREFIX.length()), true),
FRContext.getCommonOperator().getWebRootPath());
FileNodeFILE.webRootPath);
} else if (path.startsWith(FILE_PREFIX)) {
return new FileFILE(new java.io.File(path.substring(FILE_PREFIX.length())));
} else {

2
designer-base/src/main/java/com/fr/file/FileNodeFILE.java

@ -32,7 +32,7 @@ import java.util.Arrays;
public class FileNodeFILE implements FILE {
private static String webRootPath = FRContext.getCommonOperator().getWebRootPath();
public static String webRootPath = FRContext.getCommonOperator().getWebRootPath();
private static String[] supportTypes = FRContext.getFileNodes().getSupportedTypes();
static {

Loading…
Cancel
Save