From 761eb15e902415e04f52051cedf08cfb848f9caa Mon Sep 17 00:00:00 2001
From: lang <bm2736892@gmail.com>
Date: Tue, 7 Jun 2016 11:57:40 +0800
Subject: [PATCH] Tweak

---
 src/chart/graph/categoryVisual.js | 7 +++----
 src/echarts.js                    | 2 +-
 src/model/globalDefault.js        | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/chart/graph/categoryVisual.js b/src/chart/graph/categoryVisual.js
index 7cb9cccde..fd6546f27 100644
--- a/src/chart/graph/categoryVisual.js
+++ b/src/chart/graph/categoryVisual.js
@@ -2,19 +2,18 @@ define(function (require) {
 
     return function (ecModel) {
         ecModel.eachSeriesByType('graph', function (seriesModel) {
-            var colorList = seriesModel.get('color');
             var categoriesData = seriesModel.getCategoriesData();
             var data = seriesModel.getData();
 
             var categoryNameIdxMap = {};
 
             categoriesData.each(function (idx) {
-                categoryNameIdxMap[categoriesData.getName(idx)] = idx;
+                var name = categoriesData.getName(idx);
+                categoryNameIdxMap[name] = idx;
 
                 var itemModel = categoriesData.getItemModel(idx);
-                var rawIdx = categoriesData.getRawIndex(idx);
                 var color = itemModel.get('itemStyle.normal.color')
-                    || colorList[rawIdx % colorList.length];
+                    || seriesModel.getColorFromPalette(name);
                 categoriesData.setItemVisual(idx, 'color', color);
             });
 
diff --git a/src/echarts.js b/src/echarts.js
index 414b07c8d..4ffb210f1 100644
--- a/src/echarts.js
+++ b/src/echarts.js
@@ -826,7 +826,7 @@ define(function (require) {
             // Progressive configuration
             var elCount = 0;
             chartView.group.traverse(function (el) {
-                if (el.type !== 'group') {
+                if (el.type !== 'group' && !el.ignore) {
                     elCount++;
                 }
             });
diff --git a/src/model/globalDefault.js b/src/model/globalDefault.js
index 34514042e..b1b8ca89a 100644
--- a/src/model/globalDefault.js
+++ b/src/model/globalDefault.js
@@ -37,7 +37,7 @@ define(function () {
 
         animationThreshold: 2000,
         // Progressive configuration
-        progressiveThreshold: 2000,
+        progressiveThreshold: 3000,
         progressive: 400,
 
         // Threshold of if use single hover layer to optimize.
-- 
GitLab