Merge pull request #640 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0

* commit 'a6036613c407cc522cc134982bc3f5ef59e85b43':
  CHART-3223 && CHART-3246 && CHART-3248 交互
  CHART-3215 交互

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

@@ -6,6 +6,7 @@ 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;
@@ -49,16 +50,17 @@ public abstract class AbstractExtendedChartReportDataPane<T extends AbstractData
 
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
-        double[] columnSize = {f, COMPONENT_WIDTH};
+        double[] columnSize = {ChartDataPane.LABEL_WIDTH, COMPONENT_WIDTH};
         double[] rowSize = new double[len + (hasCustomFieldPane() ? 2 : 0)];
         Arrays.fill(rowSize, p);
 
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 24, 6);
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 0, 6);
-        panel.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 8));
 
-        this.setLayout(new BorderLayout());
+        this.setLayout(new BorderLayout(0,6));
-        this.add(panel, BorderLayout.CENTER);
+        this.add(panel, BorderLayout.NORTH);
-        this.add(addSouthPane(),  BorderLayout.SOUTH);
+        this.add(addSouthPane(),  BorderLayout.CENTER);
+
+        this.setBorder(BorderFactory.createEmptyBorder(0, 15, 0, 8));
     }
 
     protected JPanel addSouthPane() {

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

@@ -7,6 +7,7 @@ import com.fr.design.gui.icombobox.UIComboBox;
 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.CalculateComboBox;
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.general.GeneralUtils;
@@ -43,13 +44,13 @@ public abstract class AbstractExtendedChartTableDataPane<T extends AbstractDataC
         }
 
         double p = TableLayout.PREFERRED;
-        double[] columnSize = {TableLayout.FILL, 120};
+        double[] columnSize = {ChartDataPane.LABEL_WIDTH, 122};
         double[] rowSize = new double[len];
         Arrays.fill(rowSize, p);
 
-        JPanel panel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize,0,6);
 
-        this.setLayout(new BorderLayout(0, 6));
+        this.setLayout(new BorderLayout(0, 4));
         this.setBorder(BorderFactory.createEmptyBorder(2, 24, 0, 15));
         this.add(panel, BorderLayout.NORTH);
 

designer-chart/src/main/java/com/fr/van/chart/designer/TableLayout4VanChartHelper.java

@@ -37,7 +37,7 @@ public class TableLayout4VanChartHelper {
 
     public static JPanel createExpandablePaneWithTitle(String title, Component[][] components) {
         JPanel panel = createGapTableLayoutPane(components);
-        return createExpandablePaneWithTitle(title, panel);
+        return createExpandablePaneWithTitleTopGap(title, panel);
     }
 
     public static JPanel createExpandablePaneWithTitle(String title, JPanel panel) {