From 3910005fe8381e8d8c586b217a4b5b3f8de1f798 Mon Sep 17 00:00:00 2001 From: Harrison Date: Fri, 10 Jun 2022 16:41:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0=20JIRA=20=E4=BB=BB=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/components/notification/NotificationDialog.java | 4 +++- .../java/com/fr/env/detect/impl/JarInconsistentDetector.java | 1 + designer-realize/src/main/java/com/fr/start/FineDesigner.java | 1 + .../main/java/com/fr/start/LifecycleFatalErrorHandler.java | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/components/notification/NotificationDialog.java b/designer-base/src/main/java/com/fr/design/components/notification/NotificationDialog.java index 05a3149b80..14fb6d007d 100644 --- a/designer-base/src/main/java/com/fr/design/components/notification/NotificationDialog.java +++ b/designer-base/src/main/java/com/fr/design/components/notification/NotificationDialog.java @@ -154,7 +154,9 @@ public class NotificationDialog extends JDialog { }) .collect(Collectors.toList()); - Function calStandardWidth = e -> e > 4 ? 280 : 300; + // 当高度 / 15（每个字的大小） 大于 4 时，就会出现滚动条。 + // 当出现滚动条时，需要将内部的宽度限制为 280， 否则会展示不出来 + Function calStandardWidth = heightFactor -> heightFactor > 4 ? 280 : 300; int widthUnit = messageComponents.stream() .map((component) -> { diff --git a/designer-base/src/main/java/com/fr/env/detect/impl/JarInconsistentDetector.java b/designer-base/src/main/java/com/fr/env/detect/impl/JarInconsistentDetector.java index e10f18052c..8cfc988a95 100644 --- a/designer-base/src/main/java/com/fr/env/detect/impl/JarInconsistentDetector.java +++ b/designer-base/src/main/java/com/fr/env/detect/impl/JarInconsistentDetector.java @@ -145,6 +145,7 @@ public class JarInconsistentDetector extends AbstractExceptionDetector { for (BuildInfo localInfo : localInfos) { String jar = localInfo.getJar(); String groupContent = localInfo.getGroupBuild(); + // 不一致的 JAR 检测，忽视缺少的情况 if (StringUtils.isNotEmpty(groupContent)) { localMap.put(jar, groupContent); } diff --git a/designer-realize/src/main/java/com/fr/start/FineDesigner.java b/designer-realize/src/main/java/com/fr/start/FineDesigner.java index a1bd3591c7..e70575708b 100644 --- a/designer-realize/src/main/java/com/fr/start/FineDesigner.java +++ b/designer-realize/src/main/java/com/fr/start/FineDesigner.java @@ -25,6 +25,7 @@ public class FineDesigner extends FineProcessEntry { try { super.run(args); } catch (Throwable throwable) { + // 守护进程启动时，需要捕获异常。并且退出。 DesignerExiter.getInstance().exit(throwable); } } diff --git a/designer-realize/src/main/java/com/fr/start/LifecycleFatalErrorHandler.java b/designer-realize/src/main/java/com/fr/start/LifecycleFatalErrorHandler.java index fbe8f1962b..92b8ac6c6f 100644 --- a/designer-realize/src/main/java/com/fr/start/LifecycleFatalErrorHandler.java +++ b/designer-realize/src/main/java/com/fr/start/LifecycleFatalErrorHandler.java @@ -94,7 +94,7 @@ public class LifecycleFatalErrorHandler { .collect(Collectors.toList()); String showText = generateShowText(results); - // 如果还是异常，则抛出预期外的错误 + // 如果还是异常，说明并不是 DB 的异常，抛出预期外的错误 if (StringUtils.isEmpty(showText)) { DesignerFrame designerFrame = DesignerContext.getDesignerFrame(); DetectorErrorDialog errorDialog = new DetectorErrorDialog(designerFrame, results);