From 793946d62277265fc6c247ef7720551173d68e9b Mon Sep 17 00:00:00 2001
From: sushuang <sushuang0322@gmail.com>
Date: Thu, 11 Jan 2018 11:56:36 +0800
Subject: [PATCH] Fix themeRiver about dimensions.

---
 src/chart/themeRiver/ThemeRiverSeries.js | 11 +++++++----
 src/chart/themeRiver/themeRiverLayout.js |  2 +-
 src/data/helper/createDimensions.js      |  6 ++++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/chart/themeRiver/ThemeRiverSeries.js b/src/chart/themeRiver/ThemeRiverSeries.js
index da6471681..a06b591e1 100644
--- a/src/chart/themeRiver/ThemeRiverSeries.js
+++ b/src/chart/themeRiver/ThemeRiverSeries.js
@@ -139,9 +139,10 @@ var ThemeRiverSeries = SeriesModel.extend({
         }
 
         var dimensionsInfo = createDimensions(data, {
-            sysDimensions: [
+            sysDimensions: ['single'],
+            dimensionsDefine: [
                 {
-                    name: 'single',
+                    name: 'time',
                     type: getDimensionTypeByAxis(axisType)
                 },
                 {
@@ -156,7 +157,7 @@ var ThemeRiverSeries = SeriesModel.extend({
             encodeDefine: {
                 single: 0,
                 value: 1,
-                name: 2
+                itemName: 2
             }
         });
 
@@ -194,12 +195,14 @@ var ThemeRiverSeries = SeriesModel.extend({
             };
         });
 
+        var timeDim = data.mapDimension('single');
+
         for (var j = 0; j < layerSeries.length; ++j) {
             layerSeries[j].indices.sort(comparer);
         }
 
         function comparer(index1, index2) {
-            return data.get('time', index1) - data.get('time', index2);
+            return data.get(timeDim, index1) - data.get(timeDim, index2);
         }
 
         return layerSeries;
diff --git a/src/chart/themeRiver/themeRiverLayout.js b/src/chart/themeRiver/themeRiverLayout.js
index 99cfe5515..39abbc2ae 100644
--- a/src/chart/themeRiver/themeRiverLayout.js
+++ b/src/chart/themeRiver/themeRiverLayout.js
@@ -60,7 +60,7 @@ function themeRiverLayout(data, seriesModel, height) {
     var layerSeries = seriesModel.getLayerSeries();
 
     // the points in each layer.
-    var timeDim = data.mapDimension('time');
+    var timeDim = data.mapDimension('single');
     var valueDim = data.mapDimension('value');
     var layerPoints = zrUtil.map(layerSeries, function (singleLayer) {
         return zrUtil.map(singleLayer.indices, function (idx) {
diff --git a/src/data/helper/createDimensions.js b/src/data/helper/createDimensions.js
index ac27285ea..0a8cd54e2 100644
--- a/src/data/helper/createDimensions.js
+++ b/src/data/helper/createDimensions.js
@@ -11,13 +11,15 @@ import completeDimensions from './completeDimensions';
  * @param {number} [opt.dimensionsCount]
  * @param {string} [opt.extraPrefix]
  * @param {boolean} [opt.extraFromZero]
+ * @param {Array.<string|Object>} [opt.dimensionsDefine=source.dimensionsDefine] Overwrite source define.
+ * @param {Object|HashMap} [opt.encodeDefine=source.encodeDefine] Overwrite source define.
  * @return {Array.<Object>} dimensionsInfo
  */
 export default function (source, opt) {
     opt = opt || {};
     return completeDimensions(opt.sysDimensions || [], source, {
-        dimsDef: source.dimensionsDefine,
-        encodeDef: source.encodeDefine,
+        dimsDef: opt.dimensionsDefine || source.dimensionsDefine,
+        encodeDef: opt.encodeDefine || source.encodeDefine,
         dimCount: opt.dimensionsCount,
         extraPrefix: opt.extraPrefix,
         extraFromZero: opt.extraFromZero
-- 
GitLab