Browse Source

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

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

8
build.gradle

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

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

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

Loading…
Cancel
Save