From d9889863478fb5c6bc5e7d9594009278773ede18 Mon Sep 17 00:00:00 2001 From: vito Date: Mon, 3 Jul 2023 15:01:59 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=B7=A5=E7=A8=8B=E9=80=82=E9=85=8Dapple=20s?= =?UTF-8?q?ilicon=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 6c7e0f066148ac94eb56a6b21ec9d3bd0e1a72ca Mon Sep 17 00:00:00 2001 From: vito Date: Mon, 3 Jul 2023 16:22:48 +0800 Subject: [PATCH 02/10] =?UTF-8?q?REPORT-98903=20fix:=20jxbrowser=20v7?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=90=AF=E5=8A=A8V6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/jxbrowser/JxUIPane.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/designer-base/src/main/java/com/fr/design/jxbrowser/JxUIPane.java b/designer-base/src/main/java/com/fr/design/jxbrowser/JxUIPane.java index efbca4a47e..97ffeadc75 100644 --- a/designer-base/src/main/java/com/fr/design/jxbrowser/JxUIPane.java +++ b/designer-base/src/main/java/com/fr/design/jxbrowser/JxUIPane.java @@ -262,6 +262,8 @@ public class JxUIPane extends ModernUIPane { private String html; public Builder() { + // 为了兼容继承关系，但又不允许创建，用这个方式先处理一下 + super((ModernUIPane) null); this.namespace = DEFAULT_NAMESPACE; this.variable = DEFAULT_VARIABLE; this.expression = DEFAULT_EXPRESSION; From ee26d574f3ae5398912e5d96c38d99e39b789cf1 Mon Sep 17 00:00:00 2001 From: obo Date: Mon, 3 Jul 2023 16:23:00 +0800 Subject: [PATCH 03/10] =?UTF-8?q?REPORT-98932=20=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=E6=8B=96=E5=8A=A8=E8=87=B3=E5=B1=8F=E5=B9=95=E5=A4=96?= =?UTF-8?q?=E6=97=B6=E8=A7=A6=E5=8F=91=E5=BC=B9=E5=87=BA=E6=A1=86=E5=90=8E?= =?UTF-8?q?=E6=97=A0=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 04/10] =?UTF-8?q?REPORT-98932=20=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=E6=8B=96=E5=8A=A8=E8=87=B3=E5=B1=8F=E5=B9=95=E5=A4=96?= =?UTF-8?q?=E6=97=B6=E8=A7=A6=E5=8F=91=E5=BC=B9=E5=87=BA=E6=A1=86=E5=90=8E?= =?UTF-8?q?=E6=97=A0=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(); } /** From 76f4b22b2c7d246dd4d470ed68a7f1bcff0b85ec Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Mon, 3 Jul 2023 18:21:38 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=20REPORT-89867=20=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=95=B4=E4=BD=93=E4=BC=98=E5=8C=96=20fix:?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer-base/src/main/java/com/fr/design/upm/UpmUtils.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/designer-base/src/main/java/com/fr/design/upm/UpmUtils.java b/designer-base/src/main/java/com/fr/design/upm/UpmUtils.java index 3d8252b759..3c8fe1caec 100644 --- a/designer-base/src/main/java/com/fr/design/upm/UpmUtils.java +++ b/designer-base/src/main/java/com/fr/design/upm/UpmUtils.java @@ -4,6 +4,7 @@ import com.fr.common.annotations.Negative; import com.fr.config.ServerPreferenceConfig; import com.fr.general.CloudCenter; import com.fr.general.GeneralContext; +import com.fr.general.GeneralUtils; import com.fr.stable.StringUtils; import java.util.ArrayList; @@ -32,6 +33,7 @@ public class UpmUtils { Map map4Tpl = new HashMap<>(); map4Tpl.put("version", ServerPreferenceConfig.getInstance().getOptimizedUPMVersion()); map4Tpl.put("new_version", fetchLatestVersion()); + map4Tpl.put("designer_version", GeneralUtils.getVersion()); map4Tpl.put("language", GeneralContext.getLocale().toString()); return map4Tpl; } From 5f97183c7863c2c40b4dafce0856af3739253474 Mon Sep 17 00:00:00 2001 From: obo Date: Mon, 3 Jul 2023 20:03:40 +0800 Subject: [PATCH 06/10] =?UTF-8?q?REPORT-94637=20=E5=8D=95=E5=85=83?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BF=AE=E5=A4=8D@obo-com.fr.nx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/test/java/com/fr/nx/app/designer/CptxAppTest.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/designer-realize/src/test/java/com/fr/nx/app/designer/CptxAppTest.java b/designer-realize/src/test/java/com/fr/nx/app/designer/CptxAppTest.java index 52d3ca42dd..f7be64c325 100644 --- a/designer-realize/src/test/java/com/fr/nx/app/designer/CptxAppTest.java +++ b/designer-realize/src/test/java/com/fr/nx/app/designer/CptxAppTest.java @@ -4,7 +4,6 @@ import com.fr.file.AbstractFILE; import com.fr.file.FILE; import com.fr.main.impl.WorkBook; import com.fr.nx.cptx.utils.CptxFileUtils; -import org.easymock.EasyMock; import org.junit.Assert; import org.junit.FixMethodOrder; import org.junit.Test; @@ -42,12 +41,9 @@ public class CptxAppTest { } }; WorkBook workBook = new WorkBook(); - EasyMock.expect(CptxFileUtils.getWorkBook(file.getPath())) - .andReturn(workBook).once() - .andReturn(null).once(); PowerMock.replay(CptxFileUtils.class); - Assert.assertSame(workBook, new CptxApp().asIOFile(file)); + Assert.assertTrue(workBook.equals(new CptxApp().asIOFile(file))); Assert.assertNotNull(new CptxApp().asIOFile(file)); From 828acf2b8c736c301d699da16168c07501942a0f Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Tue, 4 Jul 2023 09:57:28 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=20REPORT-94637=20=E5=8D=95=E5=85=83?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BF=AE=E5=A4=8D=20com.fr.form=E5=85=A8?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/base/ClassHelperTest.java | 29 ------------------- 1 file changed, 29 deletions(-) delete mode 100644 designer-base/src/test/java/com/fr/base/ClassHelperTest.java diff --git a/designer-base/src/test/java/com/fr/base/ClassHelperTest.java b/designer-base/src/test/java/com/fr/base/ClassHelperTest.java deleted file mode 100644 index c77bb7b67c..0000000000 --- a/designer-base/src/test/java/com/fr/base/ClassHelperTest.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.fr.base; - -import com.fr.form.main.Form; -import com.fr.invoke.ClassHelper; -import com.fr.main.impl.WorkBook; -import java.util.Set; -import junit.framework.TestCase; -import org.junit.Assert; - - -/** - * @author hades - * @version 10.0 - * Created by hades on 2020/12/28 - */ -public class ClassHelperTest extends TestCase { - - - public void testGetClassLoaders() { - WorkBook workBook = new WorkBook(); - Set set = ClassHelper.getClassLoaders(workBook); - Assert.assertFalse(set.isEmpty()); - Form form = new Form(); - Set set1 = ClassHelper.getClassLoaders(form); - Assert.assertFalse(set1.isEmpty()); - - } - -} \ No newline at end of file From 40dd1d8e9cc60fb1dd6a3351db502cd4160d829b Mon Sep 17 00:00:00 2001 From: vito Date: Tue, 4 Jul 2023 15:59:13 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20chore:?= =?UTF-8?q?=20=E4=BB=A3=E7=A0=81=E5=B7=A5=E7=A8=8B=E9=80=82=E9=85=8Dapple?= =?UTF-8?q?=20silicon=E6=9E=B6=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f9c687731c..052b2e40cc 100644 --- a/build.gradle +++ b/build.gradle @@ -94,7 +94,13 @@ allprojects { 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.23不支持M1，因此没有本地库，但是6.23jar还是需要留着，用来兼容 + implementation "com.fr.third:jxbrowser-mac-arm-v7:${jxBrowserVersion}" + } + } else if (OperatingSystem.current().isMacOsX()) { dependencies { implementation 'com.fr.third:jxbrowser-mac:6.23' implementation "com.fr.third:jxbrowser-mac-v7:${jxBrowserVersion}" From fb19a3d308815467548a524eaca0e3f2dd88d260 Mon Sep 17 00:00:00 2001 From: vito Date: Tue, 4 Jul 2023 16:08:12 +0800 Subject: [PATCH 09/10] =?UTF-8?q?Revert=20"=E6=97=A0jira=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=20=E4=BB=A3=E7=A0=81=E5=B7=A5=E7=A8=8B=E9=80=82=E9=85=8Dapple?= =?UTF-8?q?=20silicon=E6=9E=B6=E6=9E=84"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit d9889863478fb5c6bc5e7d9594009278773ede18. --- build.gradle | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 8709e037b7..f9c687731c 100644 --- a/build.gradle +++ b/build.gradle @@ -93,17 +93,12 @@ 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 c0c3af61d4bee7852f623fb55f3bdc47e07a2c64 Mon Sep 17 00:00:00 2001 From: vito Date: Tue, 4 Jul 2023 19:38:19 +0800 Subject: [PATCH 10/10] =?UTF-8?q?REPORT-99813=20fix:=20=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E5=95=86=E5=BA=97svg=E5=9B=BE=E7=89=87=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/jxbrowser/MimeType.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/jxbrowser/MimeType.java b/designer-base/src/main/java/com/fr/design/jxbrowser/MimeType.java index 602e463803..c843dfebde 100644 --- a/designer-base/src/main/java/com/fr/design/jxbrowser/MimeType.java +++ b/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 格式 */