From 731aa17e74fd9ba216150857f3149afbe62b15b3 Mon Sep 17 00:00:00 2001 From: shine Date: Mon, 9 Oct 2023 16:08:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20fvs=E6=94=AF=E6=8C=81=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=E5=AF=BC=E5=87=BA=20#REPORT-106468?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/designer/other/VanChartInteractivePane.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java index 01854225dc..edf45b4ccc 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java @@ -472,11 +472,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane { } protected Component[][] createToolBarComponents() { - return ChartEditContext.duchampMode() ? new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content")), isSort}, - new Component[]{null, fullScreenDisplay}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout")), collapse}, - } : new Component[][]{ + return new Component[][]{ new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content")), isSort}, new Component[]{null, exportImages}, new Component[]{null, fullScreenDisplay}, @@ -485,10 +481,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane { } protected Component[][] createToolBarComponentsWithOutSort() { - return ChartEditContext.duchampMode() ? new Component[][]{ - new Component[]{null, fullScreenDisplay}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout")), collapse} - } : new Component[][]{ + return new Component[][]{ new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content")), exportImages}, new Component[]{null, fullScreenDisplay}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout")), collapse} From 6d564cb5e9cc47cf41009ceca2d70139dc994189 Mon Sep 17 00:00:00 2001 From: shine Date: Wed, 11 Oct 2023 11:37:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20fvs.ec.chart=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E8=B6=85=E9=93=BE=E6=B2=A1=E6=9C=89=E5=8B=BE=E9=80=89=E6=AD=A3?= =?UTF-8?q?=E6=96=87=E9=80=89=E9=A1=B9=20=E9=BB=98=E8=AE=A4=E8=B5=B0?= =?UTF-8?q?=E7=9A=84emailpane=20fvs.ec.chart=E9=9C=80=E8=A6=81=E8=B5=B0ref?= =?UTF-8?q?resh=E9=80=BB=E8=BE=91=E5=88=B7=E6=96=B0=E6=88=90chartemailpane?= =?UTF-8?q?=20#REPORT-98438?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/van/chart/custom/component/VanChartHyperLinkPane.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartHyperLinkPane.java b/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartHyperLinkPane.java index 5b17494da9..8dfb3ac484 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartHyperLinkPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartHyperLinkPane.java @@ -6,7 +6,6 @@ import com.fr.chart.web.ChartHyperPoplink; import com.fr.chart.web.ChartHyperRelateCellLink; import com.fr.chart.web.ChartHyperRelateFloatLink; import com.fr.design.ExtraDesignClassManager; -import com.fr.design.base.mode.DesignModeContext; import com.fr.design.beans.BasicBeanPane; import com.fr.design.chart.javascript.ChartEmailPane; import com.fr.design.chart.series.SeriesCondition.impl.ChartHyperPoplinkPane; @@ -25,6 +24,7 @@ import com.fr.design.javascript.JavaScriptImplPane; import com.fr.design.javascript.ParameterJavaScriptPane; import com.fr.design.mainframe.BaseJForm; import com.fr.design.mainframe.JTemplate; +import com.fr.design.mainframe.chart.mode.ChartEditContext; import com.fr.design.module.DesignModuleFactory; import com.fr.general.ComparatorUtils; import com.fr.general.NameObject; @@ -149,7 +149,7 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane { } private void refreshNameableCreator() { - if (DesignModeContext.isDuchampMode()) { + if (ChartEditContext.duchampMode()) { return; } HashMap paneMap = getHyperlinkMap();