Browse Source

Pull request #4513: KERNEL-7634 依赖问题

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

* commit '0afe612090338c0feed70fc5e8acce2924afc564':
  KERNEL-7634 依赖问题
feature/10.0
Hades 3 years ago
parent
commit
80f2959213
  1. 6
      designer-base/src/main/java/com/fr/design/ui/ModernUIConstants.java
  2. 2
      designer-base/src/main/java/com/fr/design/ui/compatible/NxInterceptRequestCallback.java

6
designer-base/src/main/java/com/fr/design/ui/ModernUIConstants.java

@ -7,9 +7,9 @@ import com.fr.general.IOUtils;
* @version 10.0
* Created by richie on 2019-03-05
*/
class ModernUIConstants {
public class ModernUIConstants {
static final String SCRIPT_INIT_NAME_SPACE = IOUtils.readResourceAsString("/com/fr/design/ui/InitNameSpace.js");
public static final String SCRIPT_INIT_NAME_SPACE = IOUtils.readResourceAsString("/com/fr/design/ui/InitNameSpace.js");
static final String HTML_TPL = IOUtils.readResourceAsString("/com/fr/design/ui/tpl.html");
public static final String HTML_TPL = IOUtils.readResourceAsString("/com/fr/design/ui/tpl.html");
}

2
designer-base/src/main/java/com/fr/design/ui/compatible/NxInterceptRequestCallback.java

@ -124,7 +124,7 @@ public class NxInterceptRequestCallback implements InterceptRequestCallback {
if (path.endsWith(".gif")) {
return "image/gif";
}
Path file = new File("D:\\Fanruan\\FR10.0\\final_05_27\\FineReport_10.0\\webapps\\webroot\\upm\\lib\\locale\\plugin_zh_CN.js").toPath();
Path file = new File(path).toPath();
try {
return Files.probeContentType(file);
} catch (IOException e) {

Loading…
Cancel
Save