Browse Source

Pull request #13959: REPORT-119567 fix:设计器地图图表默认显示与其他不一致

Merge in DESIGN/design from ~OBO/design-obo:release/11.0 to release/11.0

* commit '43d136a53fc37188b5f293f05a12a40ef73dffb2':
  REPORT-119567 fix:设计器地图图表默认显示与其他不一致
release/11.0
Obo-王学仁 6 months ago
parent
commit
667e5c750e
  1. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AbstractChartTypePane.java
  2. 4
      designer-chart/src/main/java/com/fr/van/chart/map/designer/type/MapStatusPane.java
  3. 2
      designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapSourceChoosePane.java

2
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AbstractChartTypePane.java

@ -100,7 +100,7 @@ public abstract class AbstractChartTypePane<T extends ChartProvider> extends Fur
}
}
double[] columnSize = {p, vs, f};
double[] columnSize = {f};
double[] rowSize = {p, p, p, p, p, p, p};
if (styleList != null && !styleList.isEmpty()) {

4
designer-chart/src/main/java/com/fr/van/chart/map/designer/type/MapStatusPane.java

@ -81,8 +81,8 @@ public class MapStatusPane extends JPanel {
double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
double s = TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH;
double[] rowSize = {p, p, p};
double[] columnSize = {d, e};
double[] column = {d, s};
double[] columnSize = {p, e};
double[] column = {p, s};
Component[][] comps = new Component[][]{
new Component[]{null, null},

2
designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapSourceChoosePane.java

@ -36,7 +36,7 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver {
this.setBorder(BorderFactory.createEmptyBorder(10, 5, 0, 0));
double p = TableLayout.PREFERRED;
double[] columnSize = {230};
double[] columnSize = {TableLayout.FILL};
double[] rowSize = {p, p, p, p, p, p, p, p};
JPanel panel = new JPanel(new BorderLayout());

Loading…
Cancel
Save