Merge remote-tracking branch 'origin/release/11.0' into release/11.0

build.gradle

@@ -93,12 +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()) {
         dependencies {
             implementation 'com.fr.third:jxbrowser-mac:6.23'
             implementation "com.fr.third:jxbrowser-mac-v7:${jxBrowserVersion}"
         }
+    } else 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-arm-v7:${jxBrowserVersion}"
+        }
     } else if (OperatingSystem.current().isWindows()) {
         dependencies {
             implementation 'com.fr.third:jxbrowser-win64:6.23'

designer-base/src/main/java/com/fr/design/style/color/ColorSelectDialog.java

@@ -79,6 +79,7 @@ public class ColorSelectDialog extends MiddleChartDialog{
     	this.seletePane = seletePane;
     	initComponent();
     	this.pane.populate(initialColor);
+		this.setLocationRelativeTo(null);
     }
 	
     private void initComponent() {
@@ -87,7 +88,8 @@ public class ColorSelectDialog extends MiddleChartDialog{
     	this.setBasicDialogSize(545,500);
 
 		this.setResizable(false);
-    	
+		this.applyClosingAction();
+		this.applyEscapeAction();
     	JPanel buttonPane = new JPanel();
     	buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));