From d9889863478fb5c6bc5e7d9594009278773ede18 Mon Sep 17 00:00:00 2001 From: vito Date: Mon, 3 Jul 2023 15:01:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=B7=A5=E7=A8=8B=E9=80=82=E9=85=8Dapple=20silicon?= =?UTF-8?q?=E6=9E=B6=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f9c687731c..8709e037b7 100644 --- a/build.gradle +++ b/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' From ee26d574f3ae5398912e5d96c38d99e39b789cf1 Mon Sep 17 00:00:00 2001 From: obo Date: Mon, 3 Jul 2023 16:23:00 +0800 Subject: [PATCH 2/3] =?UTF-8?q?REPORT-98932=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E6=8B=96=E5=8A=A8=E8=87=B3=E5=B1=8F=E5=B9=95=E5=A4=96=E6=97=B6?= =?UTF-8?q?=E8=A7=A6=E5=8F=91=E5=BC=B9=E5=87=BA=E6=A1=86=E5=90=8E=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E8=BF=9B=E8=A1=8C=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/style/color/ColorSelectDialog.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDialog.java b/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDialog.java index 23dcf8cc36..cc7275aa1c 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDialog.java +++ b/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDialog.java @@ -7,6 +7,11 @@ import com.fr.design.gui.ibutton.UIButton; import com.fr.design.utils.gui.GUICoreUtils; import javax.swing.JPanel; +import javax.swing.SwingUtilities; +import java.awt.Point; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; import java.io.Serializable; import java.awt.BorderLayout; import java.awt.Color; @@ -79,6 +84,7 @@ public class ColorSelectDialog extends MiddleChartDialog{ this.seletePane = seletePane; initComponent(); this.pane.populate(initialColor); + this.setLocationRelativeTo(null); } private void initComponent() { @@ -87,7 +93,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)); @@ -148,7 +155,7 @@ public class ColorSelectDialog extends MiddleChartDialog{ ColorSelectDialog dialog = new ColorSelectDialog(owner,pane,initialColor,okListener,selectePane); dialog.setAlwaysOnTop(alwaysOnTop); dialog.setModal(true); - dialog.show(); + dialog.setVisible(true); } /** From 38bd784adeddacd5db5821a82456e91b2c6bc3f3 Mon Sep 17 00:00:00 2001 From: obo Date: Mon, 3 Jul 2023 16:34:09 +0800 Subject: [PATCH 3/3] =?UTF-8?q?REPORT-98932=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E6=8B=96=E5=8A=A8=E8=87=B3=E5=B1=8F=E5=B9=95=E5=A4=96=E6=97=B6?= =?UTF-8?q?=E8=A7=A6=E5=8F=91=E5=BC=B9=E5=87=BA=E6=A1=86=E5=90=8E=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E8=BF=9B=E8=A1=8C=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/style/color/ColorSelectDialog.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDialog.java b/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDialog.java index cc7275aa1c..149ce1a17e 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDialog.java +++ b/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDialog.java @@ -7,11 +7,6 @@ import com.fr.design.gui.ibutton.UIButton; import com.fr.design.utils.gui.GUICoreUtils; import javax.swing.JPanel; -import javax.swing.SwingUtilities; -import java.awt.Point; -import java.awt.event.KeyAdapter; -import java.awt.event.KeyEvent; -import java.awt.event.KeyListener; import java.io.Serializable; import java.awt.BorderLayout; import java.awt.Color; @@ -155,7 +150,7 @@ public class ColorSelectDialog extends MiddleChartDialog{ ColorSelectDialog dialog = new ColorSelectDialog(owner,pane,initialColor,okListener,selectePane); dialog.setAlwaysOnTop(alwaysOnTop); dialog.setModal(true); - dialog.setVisible(true); + dialog.show(); } /**