.

designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java

@@ -6,14 +6,13 @@ import com.fr.design.formula.TinyFormulaPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
 import java.awt.Component;
-import java.awt.BorderLayout;
+import java.awt.FlowLayout;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -50,17 +49,16 @@ public abstract class AbstractExtendedChartReportDataPane<T extends AbstractData
 
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
-        double[] columnSize = {ChartDataPane.LABEL_WIDTH, COMPONENT_WIDTH};
+        double[] columnSize = {f, COMPONENT_WIDTH};
         double[] rowSize = new double[len + (hasCustomFieldPane() ? 2 : 0)];
         Arrays.fill(rowSize, p);
 
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 0, 6);
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 24, 6);
+        panel.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 15));
 
-        this.setLayout(new BorderLayout(0,6));
-        this.add(panel, BorderLayout.NORTH);
-        this.add(addSouthPane(),  BorderLayout.CENTER);
-
-        this.setBorder(BorderFactory.createEmptyBorder(0, 15, 0, 8));
+        this.setLayout(new FlowLayout());
+        this.add(panel);
+        this.add(addSouthPane());
     }
 
     protected JPanel addSouthPane() {