Merge pull request #496 in BA/design from ~XIAOHU/design:release to release

* commit '32db813bb46177e989ef60c0578768ab4d0bec8b':
  update
  update
  plot 传入条件属性

designer_chart/src/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java

@@ -27,13 +27,22 @@ import java.util.Iterator;
  * Time   : 上午9:16
  */
 public class DataSeriesConditionPane extends ConditionAttributesPane<ConditionAttr> {
+    protected Plot plot;
 
-	
+    public DataSeriesConditionPane(Plot plot) {
-    public DataSeriesConditionPane() {
+        this.plot = plot;
         initAvailableActionList();
         initComponents();
     }
 
+    public void setPlot(Plot plot) {
+        this.plot = plot;
+    }
+
+    public DataSeriesConditionPane() {
+        this(null);
+    }
+
     private void initAvailableActionList() {
         addBasicAction();
         addAxisPositionAction();