Merge pull request #12376 in DESIGN/design from bugfix/11.0 to feature/x

* commit 'b136d4856511210407be3252e94461b3d2dd0152':
  REPORT-99813 fix: 插件商店svg图片加载
  Revert "无jira任务 代码工程适配apple silicon架构"
  无jira任务 chore: 代码工程适配apple silicon架构

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.23不支持M1，因此没有本地库，但是6.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 {

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 格式
      */