From c27ba8498f985d63c1cf43d001b90b105d076360 Mon Sep 17 00:00:00 2001
From: qinghuiliu <Liu_upc@163.com>
Date: Sun, 28 Oct 2018 19:36:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?CHART-2665=20&=20CHART-2886=20=E5=A0=86?=
 =?UTF-8?q?=E7=A7=AF=E5=92=8C=E5=9D=90=E6=A0=87=E8=BD=B4update=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E4=B8=80=E4=B8=AA=E6=96=B0=E5=88=9B=E5=BB=BA=E7=9A=84?=
 =?UTF-8?q?conditionattr=20CHART-1882=E7=9B=B4=E6=8E=A5=E6=94=B9=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E5=8D=B3=E5=8F=AF=20=E4=B8=8D=E7=94=A8=E8=AE=B0?=
 =?UTF-8?q?=E4=BD=8Fconditionattr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...nChartCustomStackAndAxisConditionPane.java | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/van/chart/column/VanChartCustomStackAndAxisConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/column/VanChartCustomStackAndAxisConditionPane.java
index efa071305d..712d5bdd2d 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/column/VanChartCustomStackAndAxisConditionPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/column/VanChartCustomStackAndAxisConditionPane.java
@@ -99,10 +99,12 @@ public class VanChartCustomStackAndAxisConditionPane extends BasicBeanPane<Condi
     }
 
     public void populateBean(ConditionAttr conditionAttr) {
-        this.conditionAttr = conditionAttr;
-        AttrSeriesStackAndAxis seriesStackAndAxis = (AttrSeriesStackAndAxis) conditionAttr.getExisted(AttrSeriesStackAndAxis.class);
-        XAxis = new UIButtonGroup<Integer>(seriesStackAndAxis.getXAxisNamesArray());
-        YAxis = new UIButtonGroup<Integer>(seriesStackAndAxis.getYAxisNameArray());
+        AttrSeriesStackAndAxis seriesStackAndAxis = conditionAttr.getExisted(AttrSeriesStackAndAxis.class);
+
+        if (XAxis == null || YAxis == null) {
+            XAxis = new UIButtonGroup<Integer>(seriesStackAndAxis.getXAxisNamesArray());
+            YAxis = new UIButtonGroup<Integer>(seriesStackAndAxis.getYAxisNameArray());
+        }
 
         doLayoutPane();
         XAxis.setSelectedIndex(seriesStackAndAxis.getXAxisIndex());
@@ -129,11 +131,16 @@ public class VanChartCustomStackAndAxisConditionPane extends BasicBeanPane<Condi
     }
 
     public ConditionAttr updateBean() {
-        AttrSeriesStackAndAxis seriesStackAndAxis = (AttrSeriesStackAndAxis)conditionAttr.getExisted(AttrSeriesStackAndAxis.class);        seriesStackAndAxis.setXAxisIndex(XAxis.getSelectedIndex());
+        ConditionAttr conditionAttr = new ConditionAttr();
+        AttrSeriesStackAndAxis seriesStackAndAxis = conditionAttr.getExisted(AttrSeriesStackAndAxis.class);
+        if (seriesStackAndAxis == null) {
+            seriesStackAndAxis = new AttrSeriesStackAndAxis();
+            conditionAttr.addDataSeriesCondition(seriesStackAndAxis);
+        }
+        seriesStackAndAxis.setXAxisIndex(XAxis.getSelectedIndex());
         seriesStackAndAxis.setYAxisIndex(YAxis.getSelectedIndex());
 
         updateStackAndPercent(seriesStackAndAxis);
-        conditionAttr.addDataSeriesCondition(seriesStackAndAxis);
 
         AbstractCondition con = (AbstractCondition) this.liteConditionPane.updateBean();
         conditionAttr.setCondition(con);

From ddfa52b5246606ce132ffc28599d6fecd8a1a7fc Mon Sep 17 00:00:00 2001
From: qinghuiliu <Liu_upc@163.com>
Date: Sun, 28 Oct 2018 19:48:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?CHART-2665=20&=20CHART-2886=20=E5=A0=86?=
 =?UTF-8?q?=E7=A7=AF=E5=92=8C=E5=9D=90=E6=A0=87=E8=BD=B4update=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E4=B8=80=E4=B8=AA=E6=96=B0=E5=88=9B=E5=BB=BA=E7=9A=84?=
 =?UTF-8?q?conditionattr=20CHART-1882=E7=9B=B4=E6=8E=A5=E6=94=B9=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E5=8D=B3=E5=8F=AF=20=E4=B8=8D=E7=94=A8=E8=AE=B0?=
 =?UTF-8?q?=E4=BD=8Fconditionattr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/column/VanChartCustomStackAndAxisConditionPane.java   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/van/chart/column/VanChartCustomStackAndAxisConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/column/VanChartCustomStackAndAxisConditionPane.java
index 712d5bdd2d..ceb9bf4807 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/column/VanChartCustomStackAndAxisConditionPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/column/VanChartCustomStackAndAxisConditionPane.java
@@ -34,8 +34,6 @@ public class VanChartCustomStackAndAxisConditionPane extends BasicBeanPane<Condi
     protected UIButtonGroup<Integer> isStacked;
     protected UIButtonGroup<Integer> isPercentStacked;
 
-    private ConditionAttr conditionAttr;
-
     private LiteConditionPane liteConditionPane;
 
     public VanChartCustomStackAndAxisConditionPane() {