From f7878aabea9a3cd943788da0e2d7fedc6e217a02 Mon Sep 17 00:00:00 2001 From: shine Date: Thu, 11 Nov 2021 17:03:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?CHART-21844=20fix:=E6=8A=98=E7=BA=BF?= =?UTF-8?q?=E9=9B=B7=E8=BE=BE=E5=9B=BE=E5=88=87=E6=8D=A2=E5=88=B0=E5=A0=86?= =?UTF-8?q?=E7=A7=AF=E9=9B=B7=E8=BE=BE=E5=9B=BE&=E7=BB=84=E5=90=88?= =?UTF-8?q?=E5=9B=BE=E6=96=B0=E5=A2=9E=E5=9B=BE=E8=A1=A8=20=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E4=B9=9F=E8=A6=81=E5=85=A8=E9=83=A8=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=88=90=E8=87=AA=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../VanChartCustomPlotSelectPane.java | 18 +++++++++++++++++- .../type/AbstractVanChartTypePane.java | 6 ++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartCustomPlotSelectPane.java b/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartCustomPlotSelectPane.java index 8f7b9557d0..2df3cc5af0 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartCustomPlotSelectPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartCustomPlotSelectPane.java @@ -1,12 +1,13 @@ package com.fr.van.chart.custom.component; +import com.fr.chart.base.ChartThemeStyleProvider; import com.fr.chart.chartattr.Chart; import com.fr.design.beans.BasicBeanPane; import com.fr.design.dialog.FineJOptionPane; import com.fr.design.layout.FRGUIPaneFactory; +import com.fr.design.mainframe.chart.mode.ChartEditContext; import com.fr.general.ComparatorUtils; import com.fr.log.FineLoggerFactory; - import com.fr.plugin.chart.attr.plot.VanChartPlot; import com.fr.plugin.chart.attr.plot.VanChartRectanglePlot; import com.fr.plugin.chart.custom.CustomPlotFactory; @@ -264,6 +265,13 @@ public class VanChartCustomPlotSelectPane extends BasicBeanPane { //设置公共属性 setCommonAttr(vanChartPlot, customPlot); + if (!ChartEditContext.supportTheme()) { + //主题中有的属性 界面上屏蔽不跟随主题 属性全部设置成自定义 + setThemeCustom(vanChartPlot); +// //主题中没有的 根据主题深浅色自动 的属性 默认自动 +// ((VanChart) chart4Update).setAutoThemeCustom(); + } + newCustomPlotList.add(vanChartPlot); } } @@ -271,6 +279,14 @@ public class VanChartCustomPlotSelectPane extends BasicBeanPane { customPlot.setCustomPlotList(newCustomPlotList); } + private void setThemeCustom(VanChartPlot customPlot) { + List chartThemeStyleProviders = new ArrayList<>(); + customPlot.getChartPreStyleProvider(chartThemeStyleProviders); + for (ChartThemeStyleProvider chartThemeStyleProvider : chartThemeStyleProviders) { + chartThemeStyleProvider.setThemeCustom(); + } + } + private void setCommonAttr(VanChartPlot vanChartPlot, VanChartCustomPlot customPlot) { //坐标轴公共属性 dealAxisAttr(vanChartPlot, customPlot); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java index 2d7d738fe1..0d50ad084d 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java @@ -145,6 +145,12 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane Date: Thu, 11 Nov 2021 17:30:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?CHART-21844=20fix:=E6=82=AC=E6=B5=AE?= =?UTF-8?q?=E7=AA=97=E5=9B=BE=E8=A1=A8=20=E5=B1=9E=E6=80=A7=E4=B9=9F?= =?UTF-8?q?=E8=A6=81=E5=85=A8=E9=83=A8=E8=AE=BE=E7=BD=AE=E6=88=90=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SeriesCondition/impl/ChartHyperPoplinkPane.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java index 3372880dda..855f4cbbc8 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java @@ -12,8 +12,10 @@ import com.fr.design.gui.itextfield.UITextField; import com.fr.design.hyperlink.AbstractHyperLinkPane; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.chart.ChartHyperEditPane; +import com.fr.design.mainframe.chart.mode.ChartEditContext; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.log.FineLoggerFactory; +import com.fr.plugin.chart.vanchart.VanChart; import java.util.HashMap; import java.awt.BorderLayout; @@ -70,7 +72,14 @@ public class ChartHyperPoplinkPane extends AbstractHyperLinkPane