From 3bb77f05b1a18cbdc23c00af7c4f41f9e86f0bc8 Mon Sep 17 00:00:00 2001 From: shine Date: Mon, 14 Oct 2019 19:17:39 +0800 Subject: [PATCH] =?UTF-8?q?CHART-10227=20=E5=9C=B0=E5=9B=BE=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E7=95=8C=E9=9D=A2=20npe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../van/chart/designer/other/VanChartInteractivePane.java | 2 +- .../com/fr/van/chart/designer/other/zoom/ZoomPane.java | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java index 04b91b439..ba4d944d4 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java @@ -95,7 +95,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane { 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[][]{ diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/zoom/ZoomPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/zoom/ZoomPane.java index 23fe491bd..1a8f85df5 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/zoom/ZoomPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/zoom/ZoomPane.java @@ -193,7 +193,9 @@ public class ZoomPane extends BasicBeanPane { 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.setLeft(new StringFormula(leftFormulaPane.updateBean())); zoomAttribute.setRight(new StringFormula(rightFormulaPane.updateBean())); - zoomAttribute.setSelectionZoom(selectionZoomGroup.getSelectedItem()); + if (selectionZoomGroup != null) { + zoomAttribute.setSelectionZoom(selectionZoomGroup.getSelectedItem()); + } return zoomAttribute; }