Merge branch 'dev-3.0.0' of https://github.com/ecomfe/echarts into dev-3.0.0

src/component/legend/LegendView.js

@@ -50,7 +50,7 @@ define(function (require) {
             group.removeAll();
 
             if (itemAlign === 'auto') {
-                itemAlign = (legendModel.get('x') === 'right'
+                itemAlign = (legendModel.get('left') === 'right'
                     && legendModel.get('orient') === 'vertical')
                     ? 'right' : 'left';
             }
@@ -158,13 +158,19 @@ define(function (require) {
 
             var textStyleModel = itemModel.getModel('textStyle');
 
-            legendSymbolType = legendSymbolType;
+            var itemIcon = itemModel.get('icon');
+            // Use user given icon first
+            legendSymbolType = itemIcon || legendSymbolType;
             itemGroup.add(symbolCreator.createSymbol(
                 legendSymbolType, 0, 0, itemWidth, itemHeight, color
             ));
 
             // Compose symbols
-            if (symbolType && symbolType !== legendSymbolType && symbolType != 'none') {
+            // PENDING
+            if (!itemIcon && symbolType
+                && symbolType !== legendSymbolType
+                && symbolType != 'none'
+            ) {
                 var size = itemHeight * 0.8;
                 // Put symbol in the center
                 itemGroup.add(symbolCreator.createSymbol(

src/component/legend/legendFilter.js

 define(function () {
    return function (ecModel) {
-        var legendModel = ecModel.getComponent('legend');
-        if (legendModel) {
+        var legendModels = ecModel.findComponents({
+            mainType: 'legend'
+        });
+        if (legendModels.length) {
             ecModel.filterSeries(function (series) {
-                return legendModel.isSelected(series.name);
+                // If in any legend component the status is not selected.
+                // Because in legend series
+                for (var i = 0; i < legendModels.length; i++) {
+                    if (!legendModels[i].isSelected(series.name)) {
+                        return false;
+                    }
+                }
+                return true;
             });
         }
     };

src/processor/dataFilter.js

 define(function () {
     return function (seriesType, ecModel) {
-        var legendModel = ecModel.getComponent('legend');
-        if (!legendModel) {
+        var legendModels = ecModel.findComponents({
+            mainType: 'legend'
+        });
+        if (!legendModels.length) {
             return;
         }
         ecModel.eachSeriesByType(seriesType, function (series) {
             var data = series.getData();
             data.filterSelf(function (idx) {
-                return legendModel.isSelected(data.getName(idx));
+                var name = data.getname(idx);
+                // If in any legend component the status is not selected.
+                for (var i = 0; i < legendModels.length; i++) {
+                    if (legendModels[i].isSelected(name)) {
+                        return false;
+                    }
+                }
+                return true;
             }, this);
         }, this);
     };