From 76b290c4ad63f304f76ea9511be043bdd0b4c0d9 Mon Sep 17 00:00:00 2001 From: Carlson Date: Wed, 30 Nov 2022 16:33:39 +0800 Subject: [PATCH 1/5] =?UTF-8?q?REPORT-85902=20fix:=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=90=8D=E6=95=B0=E6=8D=AE=E9=9D=A2=E6=9D=BF=E5=A4=9A=E4=BA=86?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/gui/data/table/SeriesNameUseFieldNamePane.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldNamePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldNamePane.java index 65031b1408..ec63cda9b9 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldNamePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldNamePane.java @@ -161,7 +161,9 @@ public class SeriesNameUseFieldNamePane extends FurtherBasicBeanPane Date: Thu, 1 Dec 2022 09:48:48 +0800 Subject: [PATCH 2/5] =?UTF-8?q?REPORT-85774=20sqlserver=E6=AD=BB=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/datapane/connect/ConnectionListPane.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java index c38c27811f..23c22144b5 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java @@ -209,7 +209,7 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh * @return */ private boolean needUpdate0(Connection origin, Connection connection) { - return !connection.equals(origin) || !isEmbedConnection(connection); + return !connection.equals(origin) || !isEmbedConnection(connection); } /** @@ -257,12 +257,21 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh } private boolean saveByOldWay(List removedConnNames, List addedOrUpdatedConnections) { + final int remaining = ConnectionConfig.getInstance().getRemainingCon(removedConnNames.size(), addedOrUpdatedConnections.size()); try { return Configurations.modify(new WorkerFacade(ConnectionConfig.class) { @Override public void run() { removedConnNames.forEach(n -> ConnectionConfig.getInstance().removeConnection(n)); - addedOrUpdatedConnections.forEach(cb -> ConnectionConfig.getInstance().addConnection(cb.getName(), cb.getConnection())); + int innerRemaining = remaining; + for (ConnectionBean cb : addedOrUpdatedConnections) { + if (innerRemaining > 0) { + ConnectionConfig.getInstance().addConnectionWithoutCheck(cb.getName(), cb.getConnection()); + innerRemaining--; + } else { + break; + } + } } }); } catch (Exception e) { From 33c86b3f23900f627bba73536ad8238593f15e0a Mon Sep 17 00:00:00 2001 From: Harrison Date: Thu, 1 Dec 2022 11:14:16 +0800 Subject: [PATCH 3/5] =?UTF-8?q?REPORT-85960=20=E8=B5=B7=E5=A7=8B=E9=A1=B5?= =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E6=9C=80=E8=BF=91=E6=89=93=E5=BC=80?= =?UTF-8?q?=E7=9A=84fvs=E6=A8=A1=E6=9D=BF=EF=BC=8C=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E6=89=93=E5=BC=80=E5=A4=B1=E8=B4=A5=20=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=8A=A9=E6=89=8B=E6=89=93=E5=BC=80=E6=A8=A1=E6=9D=BF=E6=97=B6?= =?UTF-8?q?=E4=BC=9A=E8=8E=B7=E5=8F=96=20path,=20=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E6=98=AF=E4=BD=BF=E7=94=A8=E7=A9=BA=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=89=93=E5=BC=80=EF=BC=8C=E5=88=99=E4=BC=9A=20npe,?= =?UTF-8?q?=20=E5=9C=A8=E4=B8=BBJAR=E5=85=BC=E5=AE=B9=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/mainframe/JNullTemplate.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JNullTemplate.java b/designer-base/src/main/java/com/fr/design/mainframe/JNullTemplate.java index d10df810a2..e4eb797404 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/JNullTemplate.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/JNullTemplate.java @@ -204,4 +204,9 @@ public class JNullTemplate extends JTemplate { public int getToolBarHeight() { return 0; } + + @Override + public String getPath() { + return null; + } } From 7d1591436a936a8579da856b79d6f586381a3837 Mon Sep 17 00:00:00 2001 From: "John.Ying" Date: Thu, 1 Dec 2022 14:24:52 +0800 Subject: [PATCH 4/5] =?UTF-8?q?REPORT-85960=20=E8=B5=B7=E5=A7=8B=E9=A1=B5?= =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E6=9C=80=E8=BF=91=E6=89=93=E5=BC=80?= =?UTF-8?q?=E7=9A=84fvs=E6=A8=A1=E6=9D=BF=EF=BC=8C=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E6=89=93=E5=BC=80=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/carton/EventDispatchThreadHangMonitor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/carton/EventDispatchThreadHangMonitor.java b/designer-base/src/main/java/com/fr/design/carton/EventDispatchThreadHangMonitor.java index 56ccaa2c48..118c0858ef 100644 --- a/designer-base/src/main/java/com/fr/design/carton/EventDispatchThreadHangMonitor.java +++ b/designer-base/src/main/java/com/fr/design/carton/EventDispatchThreadHangMonitor.java @@ -314,7 +314,7 @@ public final class EventDispatchThreadHangMonitor extends EventQueue { * 将swing中默认的EventQueue换成自己的 */ public static void initMonitoring() { - Toolkit.getDefaultToolkit().getSystemEventQueue().push(INSTANCE); + SwingUtilities.invokeLater(() -> Toolkit.getDefaultToolkit().getSystemEventQueue().push(INSTANCE)); } /** From a687873a777e4bf176f870b6670f7bc3aad1ffdd Mon Sep 17 00:00:00 2001 From: "John.Ying" Date: Thu, 1 Dec 2022 15:30:54 +0800 Subject: [PATCH 5/5] =?UTF-8?q?REPORT-85960=20=E8=B5=B7=E5=A7=8B=E9=A1=B5?= =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E6=9C=80=E8=BF=91=E6=89=93=E5=BC=80?= =?UTF-8?q?=E7=9A=84fvs=E6=A8=A1=E6=9D=BF=EF=BC=8C=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E6=89=93=E5=BC=80=E5=A4=B1=E8=B4=A5--=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E4=B8=80=E4=B8=8B=E5=B7=A5=E5=85=B7=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/carton/EventDispatchThreadHangMonitor.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/carton/EventDispatchThreadHangMonitor.java b/designer-base/src/main/java/com/fr/design/carton/EventDispatchThreadHangMonitor.java index 118c0858ef..a7bf03b407 100644 --- a/designer-base/src/main/java/com/fr/design/carton/EventDispatchThreadHangMonitor.java +++ b/designer-base/src/main/java/com/fr/design/carton/EventDispatchThreadHangMonitor.java @@ -1,6 +1,7 @@ package com.fr.design.carton; import com.fr.concurrent.FineExecutors; +import com.fr.design.ui.util.UIUtil; import com.fr.json.JSONObject; import com.fr.log.FineLoggerFactory; import com.fr.stable.ArrayUtils; @@ -314,7 +315,7 @@ public final class EventDispatchThreadHangMonitor extends EventQueue { * 将swing中默认的EventQueue换成自己的 */ public static void initMonitoring() { - SwingUtilities.invokeLater(() -> Toolkit.getDefaultToolkit().getSystemEventQueue().push(INSTANCE)); + UIUtil.invokeLaterIfNeeded(() -> Toolkit.getDefaultToolkit().getSystemEventQueue().push(INSTANCE)); } /**