Fix apache#6491 (theme backward compat)

100pah · 100pah · commit c76fb43d1265 · 2017-08-23T15:54:40.000+08:00
diff --git a/src/echarts.js b/src/echarts.js
@@ -33,6 +33,7 @@ define(function (require) {
     var ExtensionAPI = require('./ExtensionAPI');
     var CoordinateSystemManager = require('./CoordinateSystem');
     var OptionManager = require('./model/OptionManager');
+    var backwardCompat = require('./preprocessor/backwardCompat');
 
     var ComponentModel = require('./model/Component');
     var SeriesModel = require('./model/Series');
@@ -140,7 +141,7 @@ define(function (require) {
          * @type {Object}
          * @private
          */
-        this._theme = zrUtil.clone(theme);
+        backwardCompat(this._theme = zrUtil.clone(theme), true);
 
         /**
          * @type {Array.<module:echarts/view/Chart>}
@@ -1940,7 +1941,7 @@ define(function (require) {
     };
 
     echarts.registerVisual(PRIORITY_VISUAL_GLOBAL, require('./visual/seriesColor'));
-    echarts.registerPreprocessor(require('./preprocessor/backwardCompat'));
+    echarts.registerPreprocessor(backwardCompat);
     echarts.registerLoading('default', require('./loading/default'));
 
     // Default action
diff --git a/src/model/Series.js b/src/model/Series.js
@@ -92,6 +92,14 @@ define(function(require) {
             var inputPositionParams = layoutMode
                 ? layout.getLayoutParams(option) : {};
 
+            // Backward compat: using subType on theme.
+            // But if name duplicate between series subType
+            // (for example: parallel) add component mainType,
+            // add suffix 'Series'.
+            var themeSubType = this.subType;
+            if (ComponentModel.hasClass(themeSubType)) {
+                themeSubType += 'Series';
+            }
             zrUtil.merge(
                 option,
                 ecModel.getTheme().get(this.subType)
diff --git a/src/preprocessor/backwardCompat.js b/src/preprocessor/backwardCompat.js
@@ -56,8 +56,8 @@ define(function (require) {
 
     var each = zrUtil.each;
 
-    return function (option) {
-        compatStyle(option);
+    return function (option, isTheme) {
+        compatStyle(option, isTheme);
 
         var series = option.series;
         each(zrUtil.isArray(series) ? series : [series], function (seriesOpt) {
diff --git a/src/preprocessor/helper/compatStyle.js b/src/preprocessor/helper/compatStyle.js
@@ -134,13 +134,16 @@ define(function (require) {
         return (zrUtil.isArray(o) ? o[0] : o) || {};
     }
 
-    return function (option) {
+    return function (option, isTheme) {
         each(toArr(option.series), function (seriesOpt) {
             isObject(seriesOpt) && processSeries(seriesOpt);
         });
 
+        var axes = ['xAxis', 'yAxis', 'radiusAxis', 'angleAxis', 'singleAxis', 'parallelAxis', 'radar'];
+        isTheme && axes.push('valueAxis', 'categoryAxis', 'logAxis', 'timeAxis');
+
         each(
-            ['xAxis', 'yAxis', 'radiusAxis', 'angleAxis', 'singleAxis', 'parallelAxis', 'radar'],
+            axes,
             function (axisName) {
                 each(toArr(option[axisName]), function (axisOpt) {
                     if (axisOpt) {
diff --git a/test/line.html b/test/line.html
@@ -19,6 +19,7 @@
 
             require([
                 'echarts',
+                'theme/infographic',
                 'echarts/chart/line',
                 'echarts/component/title',
                 'echarts/component/legend',
@@ -28,7 +29,7 @@
                 'zrender/svg/svg'
             ], function (echarts) {
 
-                var chart = echarts.init(document.getElementById('main'), null, {
+                var chart = echarts.init(document.getElementById('main'), 'infographic', {
                     renderer: 'canvas'
                     // renderer: 'svg'
                 });
