From da9e2fb47b4e6a81734024385eb7768ea73b7df6 Mon Sep 17 00:00:00 2001 From: hades Date: Mon, 9 Nov 2020 14:27:13 +0800 Subject: [PATCH 1/6] =?UTF-8?q?REPORT-42972=20=E8=BF=9C=E7=A8=8B=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5=E5=B9=B3=E5=8F=B0=E5=AF=86=E7=A0=81-=E5=AF=86?= =?UTF-8?q?=E7=A0=81=E8=B6=85=E6=9C=9F=EF=BC=8C=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E6=97=B6=E8=BF=9E=E6=8E=A5=E8=BF=9C=E7=A8=8B?= =?UTF-8?q?=E5=AF=86=E7=A0=81=EF=BC=8C=E6=8A=A5=E9=94=99=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/start/module/DesignerWorkspaceProvider.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java b/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java index 43ae6ddcd..ad9aeb660 100644 --- a/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java +++ b/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java @@ -6,6 +6,8 @@ import com.fr.design.constants.DesignerLaunchStatus; import com.fr.design.env.DesignerWorkspaceGenerator; import com.fr.design.env.DesignerWorkspaceInfo; import com.fr.design.env.LocalDesignerWorkspaceInfo; +import com.fr.design.i18n.Toolkit; +import com.fr.env.TestConnectionResult; import com.fr.event.Event; import com.fr.event.EventDispatcher; import com.fr.event.Listener; @@ -74,9 +76,11 @@ public class DesignerWorkspaceProvider extends Activator { } } catch (Throwable e) { FineLoggerFactory.getLogger().error(e.getMessage(), e); - if (e.getCause() instanceof WorkspaceCheckException && workspaceInfo != null) { + if (e.getCause() instanceof WorkspaceCheckException) { WorkspaceCheckException exception = (WorkspaceCheckException) e.getCause(); - EnvChangeEntrance.getInstance().handleWorkspaceCheckException(exception, EnvChangeEntrance.PopTipStrategy.LATER, workspaceInfo.getConnection()); + // 输出标准详情 + TestConnectionResult result = TestConnectionResult.parseByException(exception); + FineLoggerFactory.getLogger().error(result.getText().replaceAll(TestConnectionResult.WRAP, StringUtils.EMPTY) + Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Modify_PassWord")); } EnvChangeEntrance.getInstance().dealEvnExceptionWhenStartDesigner(); } From f9f2ffaf134101decbdadff73227f3d11addc5f4 Mon Sep 17 00:00:00 2001 From: hades Date: Mon, 9 Nov 2020 14:28:14 +0800 Subject: [PATCH 2/6] =?UTF-8?q?REPORT-42973=20=E7=9B=B4=E6=8E=A5=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E8=BF=9C=E7=A8=8B=20=E6=97=A5=E5=BF=97=E9=87=8C?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=AF=B9=E5=BA=94=E7=9A=84=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/EnvChangeEntrance.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java b/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java index 15fc6f1d3..6f0e4485d 100644 --- a/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java +++ b/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java @@ -184,14 +184,15 @@ public class EnvChangeEntrance { public void handleWorkspaceCheckException(WorkspaceCheckException e, PopTipStrategy strategy, WorkspaceConnectionInfo info) { TestConnectionResult result = TestConnectionResult.parseByException(e); - FineLoggerFactory.getLogger().error(e.getMessage(), e); if (ComparatorUtils.equals(result, TestConnectionResult.AUTH_FAILED)) { + FineLoggerFactory.getLogger().error(e.getMessage(), e); strategy.showTip(() -> FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"), Toolkit.i18nText("Fine-Design_Basic_Error"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"))); } else { + FineLoggerFactory.getLogger().error(result.getText().replaceAll(TestConnectionResult.WRAP, StringUtils.EMPTY) + Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Modify_PassWord")); strategy.showTip(() -> FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), result.isVerifyResult() ? new MessageWithLink(result.getText(), Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Modify_PassWord"), info.getUrl() + RemoteWorkspaceURL.SYSTEM_LOGIN_PATH) From 8a11dd7f32f4481c79a3c89781044ce1a975b977 Mon Sep 17 00:00:00 2001 From: hades Date: Mon, 9 Nov 2020 14:36:05 +0800 Subject: [PATCH 3/6] =?UTF-8?q?REPORT-42973=20=E7=9B=B4=E6=8E=A5=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E8=BF=9C=E7=A8=8B=20=E6=97=A5=E5=BF=97=E9=87=8C?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=AF=B9=E5=BA=94=E7=9A=84=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/EnvChangeEntrance.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java b/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java index 6f0e4485d..0ddb74926 100644 --- a/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java +++ b/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java @@ -184,15 +184,17 @@ public class EnvChangeEntrance { public void handleWorkspaceCheckException(WorkspaceCheckException e, PopTipStrategy strategy, WorkspaceConnectionInfo info) { TestConnectionResult result = TestConnectionResult.parseByException(e); + FineLoggerFactory.getLogger().error(e.getMessage(), e); if (ComparatorUtils.equals(result, TestConnectionResult.AUTH_FAILED)) { - FineLoggerFactory.getLogger().error(e.getMessage(), e); strategy.showTip(() -> FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"), Toolkit.i18nText("Fine-Design_Basic_Error"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"))); } else { - FineLoggerFactory.getLogger().error(result.getText().replaceAll(TestConnectionResult.WRAP, StringUtils.EMPTY) + Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Modify_PassWord")); + if (result.isVerifyResult()) { + FineLoggerFactory.getLogger().error(result.getText().replaceAll(TestConnectionResult.WRAP, StringUtils.EMPTY) + Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Modify_PassWord")); + } strategy.showTip(() -> FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), result.isVerifyResult() ? new MessageWithLink(result.getText(), Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Modify_PassWord"), info.getUrl() + RemoteWorkspaceURL.SYSTEM_LOGIN_PATH) From 24d71eb1f1491390eb9c58eab63be95526384557 Mon Sep 17 00:00:00 2001 From: hades Date: Mon, 9 Nov 2020 14:42:43 +0800 Subject: [PATCH 4/6] =?UTF-8?q?REPORT-42972=20=E5=8A=A0=E4=B8=AA=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/start/module/DesignerWorkspaceProvider.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java b/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java index ad9aeb660..420f0f2b6 100644 --- a/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java +++ b/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java @@ -80,7 +80,9 @@ public class DesignerWorkspaceProvider extends Activator { WorkspaceCheckException exception = (WorkspaceCheckException) e.getCause(); // 输出标准详情 TestConnectionResult result = TestConnectionResult.parseByException(exception); - FineLoggerFactory.getLogger().error(result.getText().replaceAll(TestConnectionResult.WRAP, StringUtils.EMPTY) + Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Modify_PassWord")); + if (result.isVerifyResult()) { + FineLoggerFactory.getLogger().error(result.getText().replaceAll(TestConnectionResult.WRAP, StringUtils.EMPTY) + Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Modify_PassWord")); + } } EnvChangeEntrance.getInstance().dealEvnExceptionWhenStartDesigner(); } From b25508678a21d589624f72869238bda3e9ec87f5 Mon Sep 17 00:00:00 2001 From: "Qinghui.Liu" Date: Mon, 9 Nov 2020 15:16:42 +0800 Subject: [PATCH 5/6] =?UTF-8?q?CHART-16682=20=E5=9B=9E=E9=80=80=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E9=98=B2=E6=AD=A2=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E5=B4=A9=E6=BA=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/chart/ChartDesignerActivator.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/chart/ChartDesignerActivator.java b/designer-chart/src/main/java/com/fr/design/chart/ChartDesignerActivator.java index 9b6f2e02e..0cd81f783 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/ChartDesignerActivator.java +++ b/designer-chart/src/main/java/com/fr/design/chart/ChartDesignerActivator.java @@ -18,7 +18,6 @@ import com.fr.plugin.chart.vanchart.export.ImagePainter; import com.fr.stable.bridge.StableFactory; import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider; import com.fr.van.chart.DownloadOnlineSourcesHelper; -import com.fr.van.chart.designer.component.VanChartRichEditorPane; /** * Created by juhaoyu on 2018/6/27. @@ -48,8 +47,6 @@ public class ChartDesignerActivator extends Activator implements Prepare { ImagePainter.registerDownloadSourcesEvent(new DownloadOnlineSourcesHelper()); ImagePainter.registerDefaultCallbackEvent(HistoryTemplateListCache.getInstance()); - VanChartRichEditorPane.initRichEditorPane(); - ChartTypeInterfaceManager.addPluginChangedListener(); } From 7792e29c813f515d3c4ece6e6d423ebac0d6502a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com> Date: Mon, 9 Nov 2020 16:35:27 +0800 Subject: [PATCH 6/6] =?UTF-8?q?CHART-16680=20=E4=BB=AA=E8=A1=A8=E7=9B=98?= =?UTF-8?q?=E5=88=87=E6=8D=A2=EF=BC=8C=E9=83=A8=E5=88=86=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=8D=E6=98=AF=E8=87=AA=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/van/chart/gauge/VanChartGaugePlotPane.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugePlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugePlotPane.java index 3d979119c..d1a7650f5 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugePlotPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugePlotPane.java @@ -120,6 +120,8 @@ public class VanChartGaugePlotPane extends AbstractVanChartTypePane { cloneDetail.setInnerPaneBackgroundColor(newDetail.getInnerPaneBackgroundColor()); cloneDetail.setThermometerWidth(newDetail.getThermometerWidth()); cloneDetail.setChutePercent(newDetail.getChutePercent()); + cloneDetail.setPaneBackgroundColorAuto(newDetail.isPaneBackgroundColorAuto()); + cloneDetail.setSlotBackgroundColorAuto(newDetail.isSlotBackgroundColorAuto()); } protected void cloneOldConditionCollection(Plot oldPlot, Plot newPlot) throws CloneNotSupportedException {