From 567a6f69fa1f173a2ad5d20f82ceb66f532d2652 Mon Sep 17 00:00:00 2001
From: qinghuiliu <Liu_upc@163.com>
Date: Wed, 21 Nov 2018 11:20:31 +0800
Subject: [PATCH 1/3] =?UTF-8?q?CHART-3413=20=E8=AF=8D=E4=BA=91-=E7=B3=BB?=
 =?UTF-8?q?=E5=88=97=20=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wordcloud/designer/style/VanChartWordCloudSeriesPane.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudSeriesPane.java
index d5ab61b95..c57161ea7 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudSeriesPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudSeriesPane.java
@@ -222,7 +222,7 @@ public class VanChartWordCloudSeriesPane extends VanChartAbstractPlotSeriesPane
 
             wordCloudPlot.setShapeType((CloudShapeType) cloudShape.getSelectedItem());
             if(wordCloudPlot.getShapeType() != CloudShapeType.DEFAULT) {
-                wordCloudPlot.setShapeImage((ImageBackground) imageBackgroundQuickPane.updateBean());
+                wordCloudPlot.setShapeImage((ImageFileBackground) imageBackgroundQuickPane.updateBean());
             } else {
                 wordCloudPlot.setShapeImage(null);
             }

From f218ecb7d3c7e1cf28cbbbb45f497cce8a50c716 Mon Sep 17 00:00:00 2001
From: qinghuiliu <Liu_upc@163.com>
Date: Wed, 21 Nov 2018 11:44:57 +0800
Subject: [PATCH 2/3] =?UTF-8?q?CHART-3413=20=E4=BC=98=E5=8C=96=E6=94=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wordcloud/designer/style/VanChartWordCloudSeriesPane.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudSeriesPane.java
index c57161ea7..d5ab61b95 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudSeriesPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudSeriesPane.java
@@ -222,7 +222,7 @@ public class VanChartWordCloudSeriesPane extends VanChartAbstractPlotSeriesPane
 
             wordCloudPlot.setShapeType((CloudShapeType) cloudShape.getSelectedItem());
             if(wordCloudPlot.getShapeType() != CloudShapeType.DEFAULT) {
-                wordCloudPlot.setShapeImage((ImageFileBackground) imageBackgroundQuickPane.updateBean());
+                wordCloudPlot.setShapeImage((ImageBackground) imageBackgroundQuickPane.updateBean());
             } else {
                 wordCloudPlot.setShapeImage(null);
             }

From 09d865f0130f3627c01aed4fcbe2c45d4aab7692 Mon Sep 17 00:00:00 2001
From: qinghuiliu <Liu_upc@163.com>
Date: Tue, 27 Nov 2018 12:20:52 +0800
Subject: [PATCH 3/3] =?UTF-8?q?CHART-3252=20=E6=9B=B4=E6=8D=A2=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=A0=BC=E6=95=B0=E6=8D=AE=E5=B8=83=E5=B1=80=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E5=92=8C=E8=BE=B9=E6=A1=86=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/AbstractExtendedChartReportDataPane.java     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java b/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java
index aa6bbf1a0..950d71e8c 100644
--- a/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java
+++ b/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java
@@ -12,7 +12,7 @@ import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
 import java.awt.Component;
-import java.awt.FlowLayout;
+import java.awt.BorderLayout;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -54,11 +54,11 @@ public abstract class AbstractExtendedChartReportDataPane<T extends AbstractData
         Arrays.fill(rowSize, p);
 
         JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 24, 6);
-        panel.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 15));
+        panel.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 8));
 
-        this.setLayout(new FlowLayout());
-        this.add(panel);
-        this.add(addSouthPane());
+        this.setLayout(new BorderLayout());
+        this.add(panel, BorderLayout.CENTER);
+        this.add(addSouthPane(),  BorderLayout.SOUTH);
     }
 
     protected JPanel addSouthPane() {