From 1d24086df0aede9fa85cd84a4f66b8bcef5cbea2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com>
Date: Wed, 1 Sep 2021 11:11:23 +0800
Subject: [PATCH] =?UTF-8?q?CHART-20515=20=20=E6=B8=90=E5=8F=98=E9=A3=8E?=
 =?UTF-8?q?=E6=A0=BC=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mainframe/theme/preview/FormThemePreviewPane.java | 11 ++++++-----
 .../theme/preview/ReportThemePreviewPane.java         |  8 ++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/preview/FormThemePreviewPane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/preview/FormThemePreviewPane.java
index 1445dab357..8b96eba4b9 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/theme/preview/FormThemePreviewPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/preview/FormThemePreviewPane.java
@@ -3,7 +3,6 @@ package com.fr.design.mainframe.theme.preview;
 import com.fr.base.BaseFormula;
 import com.fr.base.background.ColorBackground;
 import com.fr.base.theme.FormTheme;
-import com.fr.chart.base.ChartConstants;
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.chartattr.Title;
 import com.fr.chart.chartdata.NormalChartData;
@@ -19,17 +18,19 @@ import com.fr.plugin.chart.attr.axis.VanChartAxis;
 import com.fr.plugin.chart.base.AttrLabel;
 import com.fr.plugin.chart.base.VanChartTools;
 import com.fr.plugin.chart.column.VanChartColumnPlot;
+import com.fr.plugin.chart.type.GradientType;
 import com.fr.plugin.chart.type.RadiusType;
 import com.fr.plugin.chart.vanchart.VanChart;
 import com.fr.stable.Constants;
 import com.fr.stable.StringUtils;
+
 import javax.swing.JPanel;
 import java.awt.AlphaComposite;
-import java.awt.Composite;
-import java.awt.Graphics2D;
 import java.awt.BorderLayout;
 import java.awt.Color;
+import java.awt.Composite;
 import java.awt.Dimension;
+import java.awt.Graphics2D;
 import java.awt.geom.Rectangle2D;
 
 /**
@@ -124,7 +125,7 @@ public class FormThemePreviewPane extends TemplateThemePreviewPane<FormTheme> {
             plot.getConditionCollection().getDefaultAttr().addDataSeriesCondition(defaultAttrLabel);
 
             plot.getLegend().setPosition(Constants.TOP);
-            plot.setPlotStyle(ChartConstants.STYLE_NONE);
+            plot.getGradientStyle().setGradientType(GradientType.NONE);
             plot.setSeriesOverlapPercent(30);
             plot.setCategoryIntervalPercent(30);
 
@@ -178,7 +179,7 @@ public class FormThemePreviewPane extends TemplateThemePreviewPane<FormTheme> {
 
             PiePlot4VanChart plot = chart.getPlot();
             plot.getLegend().setPosition(Constants.BOTTOM);
-            plot.setPlotStyle(ChartConstants.STYLE_NONE);
+            plot.getGradientStyle().setGradientType(GradientType.NONE);
             plot.setInnerRadiusPercent(75);
             plot.getRadius().setRadiusType(RadiusType.FIXED);
             plot.getRadius().setRadius(80);
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/preview/ReportThemePreviewPane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/preview/ReportThemePreviewPane.java
index 02d3aa96cf..ce4f4f49be 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/theme/preview/ReportThemePreviewPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/preview/ReportThemePreviewPane.java
@@ -3,7 +3,6 @@ package com.fr.design.mainframe.theme.preview;
 import com.fr.base.BaseFormula;
 import com.fr.base.background.ColorBackground;
 import com.fr.base.theme.ReportTheme;
-import com.fr.chart.base.ChartConstants;
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.chartattr.Title;
 import com.fr.chart.chartdata.NormalChartData;
@@ -18,11 +17,12 @@ import com.fr.plugin.chart.attr.axis.VanChartAxis;
 import com.fr.plugin.chart.base.AttrLabel;
 import com.fr.plugin.chart.base.VanChartTools;
 import com.fr.plugin.chart.column.VanChartColumnPlot;
+import com.fr.plugin.chart.type.GradientType;
 import com.fr.plugin.chart.vanchart.VanChart;
 
-import java.awt.Graphics2D;
 import java.awt.BorderLayout;
 import java.awt.Color;
+import java.awt.Graphics2D;
 import java.awt.geom.Rectangle2D;
 
 /**
@@ -37,7 +37,7 @@ public class ReportThemePreviewPane extends TemplateThemePreviewPane<ReportTheme
 
     private final ChartPreviewPane chartPreviewPane;
 
-    public ReportThemePreviewPane(){
+    public ReportThemePreviewPane() {
         setLayout(FRGUIPaneFactory.createBorderLayout());
         chartPreviewPane = new ChartPreviewPane();
         chartPreviewPane.populate(initColumnChart());
@@ -80,7 +80,7 @@ public class ReportThemePreviewPane extends TemplateThemePreviewPane<ReportTheme
             defaultAttrLabel.getAttrLabelDetail().getBackground().setBackground(null);
             plot.getConditionCollection().getDefaultAttr().addDataSeriesCondition(defaultAttrLabel);
 
-            plot.setPlotStyle(ChartConstants.STYLE_NONE);
+            plot.getGradientStyle().setGradientType(GradientType.NONE);
             plot.setSeriesOverlapPercent(30);
             plot.setCategoryIntervalPercent(30);