Browse Source

Merge pull request #630 in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0

* commit '09d865f0130f3627c01aed4fcbe2c45d4aab7692':
  CHART-3252 更换单元格数据布局方式和边框大小
  CHART-3413 优化改法
  CHART-3413 词云-系列 类型转换错误
final/10.0
Qinghui.Liu 6 years ago
parent
commit
adfca6c286
  1. 10
      designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java

10
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.JPanel;
import javax.swing.SwingConstants; import javax.swing.SwingConstants;
import java.awt.Component; import java.awt.Component;
import java.awt.FlowLayout; import java.awt.BorderLayout;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@ -54,11 +54,11 @@ public abstract class AbstractExtendedChartReportDataPane<T extends AbstractData
Arrays.fill(rowSize, p); Arrays.fill(rowSize, p);
JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 24, 6); 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.setLayout(new BorderLayout());
this.add(panel); this.add(panel, BorderLayout.CENTER);
this.add(addSouthPane()); this.add(addSouthPane(), BorderLayout.SOUTH);
} }
protected JPanel addSouthPane() { protected JPanel addSouthPane() {

Loading…
Cancel
Save