Browse Source

Merge pull request #12375 in DESIGN/design from release/11.0 to bugfix/11.0

* commit '1684dea0f5914fdabbc57dea7a66edfdff2b0e36':
  REPORT-99813 fix: 插件商店svg图片加载
  Revert "无jira任务 代码工程适配apple silicon架构"
  无jira任务 chore: 代码工程适配apple silicon架构
bugfix/11.0
superman 1 year ago
parent
commit
b136d48565
  1. 11
      build.gradle
  2. 4
      designer-base/src/main/java/com/fr/design/jxbrowser/MimeType.java

11
build.gradle

@ -93,16 +93,17 @@ allprojects {
testImplementation 'org.powermock:powermock-api-mockito2:1.7.4'
testImplementation 'junit:junit:4.12'
}
// mac_x64, mac_aarch64, windows_x64
if (OperatingSystem.current().isMacOsX()) {
if (OperatingSystem.current().isMacOsX() && "aarch64".equals(System.getProperty("os.arch"))) {
dependencies {
implementation 'com.fr.third:jxbrowser-mac:6.23'
implementation "com.fr.third:jxbrowser-mac-v7:${jxBrowserVersion}"
// jxbrowser 6.23M16.23jar还是需要留着
implementation "com.fr.third:jxbrowser-mac-arm-v7:${jxBrowserVersion}"
}
} else if (OperatingSystem.current().isMacOsX() && "aarch64".equals(System.getProperty("os.arch"))) {
} else if (OperatingSystem.current().isMacOsX()) {
dependencies {
implementation 'com.fr.third:jxbrowser-mac:6.23'
implementation "com.fr.third:jxbrowser-mac-arm-v7:${jxBrowserVersion}"
implementation "com.fr.third:jxbrowser-mac-v7:${jxBrowserVersion}"
}
} else if (OperatingSystem.current().isWindows()) {
dependencies {

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

@ -28,11 +28,11 @@ public enum MimeType {
/**
* js 格式
*/
JS(".js", "text/css"),
JS(".js", "text/javascript"),
/**
* svg 格式
*/
SVG(".svg", "text/javascript"),
SVG(".svg", "image/svg+xml"),
/**
* png 格式
*/

Loading…
Cancel
Save