Merge pull request #1535 in BA/design from ~MANGO/m_design:master to master

* commit '186f774f60ab64c13084af6f90a3eb91236eb293':
  CHART-1882   堆积和坐标轴界面bug
  CHART-1882   堆积和坐标轴界面bug
  CHART-1882   堆积和坐标轴界面bug

designer_chart/src/com/fr/plugin/chart/column/VanChartCustomStackAndAxisConditionPane.java

@@ -31,6 +31,8 @@ public class VanChartCustomStackAndAxisConditionPane extends BasicBeanPane<Condi
     protected UIButtonGroup<Integer> isStacked;
     protected UIButtonGroup<Integer> isPercentStacked;
 
+    private ConditionAttr conditionAttr;
+
     private LiteConditionPane liteConditionPane;
 
     public VanChartCustomStackAndAxisConditionPane() {
@@ -94,6 +96,7 @@ 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());
@@ -123,8 +126,7 @@ public class VanChartCustomStackAndAxisConditionPane extends BasicBeanPane<Condi
     }
 
     public ConditionAttr updateBean() {
-        ConditionAttr conditionAttr = new ConditionAttr();
+        AttrSeriesStackAndAxis seriesStackAndAxis = (AttrSeriesStackAndAxis)conditionAttr.getExisted(AttrSeriesStackAndAxis.class);
-        AttrSeriesStackAndAxis seriesStackAndAxis = new AttrSeriesStackAndAxis();
         seriesStackAndAxis.setXAxisIndex(XAxis.getSelectedIndex());
         seriesStackAndAxis.setYAxisIndex(YAxis.getSelectedIndex());