Browse Source

CHART-10227 地图配置界面 npe

research/11.0
shine 5 years ago
parent
commit
3bb77f05b1
  1. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java
  2. 8
      designer-chart/src/main/java/com/fr/van/chart/designer/other/zoom/ZoomPane.java

2
designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java

@ -95,7 +95,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
double f = TableLayout.FILL;
double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
double[] columnSize = {f, e};
double[] rowSize = {p, p, p, p, p, p};
double[] rowSize = {p, p, p, p, p, p, p};
Component[][] components = new Component[][]{

8
designer-chart/src/main/java/com/fr/van/chart/designer/other/zoom/ZoomPane.java

@ -193,7 +193,9 @@ public class ZoomPane extends BasicBeanPane<ZoomAttribute> {
rightFormulaPane.populateBean(ob.getRight().getContent());
}
selectionZoomGroup.setSelectedItem(ob.isSelectionZoom());
if (selectionZoomGroup != null) {
selectionZoomGroup.setSelectedItem(ob.isSelectionZoom());
}
checkInitialDisplayCardPane();
checkCustomModePane();
@ -212,7 +214,9 @@ public class ZoomPane extends BasicBeanPane<ZoomAttribute> {
zoomAttribute.setLeft(new StringFormula(leftFormulaPane.updateBean()));
zoomAttribute.setRight(new StringFormula(rightFormulaPane.updateBean()));
zoomAttribute.setSelectionZoom(selectionZoomGroup.getSelectedItem());
if (selectionZoomGroup != null) {
zoomAttribute.setSelectionZoom(selectionZoomGroup.getSelectedItem());
}
return zoomAttribute;
}

Loading…
Cancel
Save