From 3e9f23966161d6e06f8846bc5960f45806d45124 Mon Sep 17 00:00:00 2001
From: pah100 <sushuang0322@gmail.com>
Date: Tue, 17 May 2016 17:21:33 +0800
Subject: [PATCH] Fix error throw when use two category axis and series.data
 has only two dim like [[2,4], [5,8], ...]

---
 src/chart/helper/Symbol.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/chart/helper/Symbol.js b/src/chart/helper/Symbol.js
index 0c28166bd..c4fde57fd 100644
--- a/src/chart/helper/Symbol.js
+++ b/src/chart/helper/Symbol.js
@@ -184,16 +184,15 @@ define(function (require) {
 
         // Get last value dim
         var dimensions = data.dimensions.slice();
-        var valueDim = dimensions.pop();
+        var valueDim;
         var dataType;
-        while (
-            ((dataType = data.getDimensionInfo(valueDim).type) === 'ordinal')
-            || (dataType === 'time')
-        ) {
-            valueDim = dimensions.pop();
-        }
+        while (dimensions.length && (
+            valueDim = dimensions.pop(),
+            dataType = data.getDimensionInfo(valueDim).type,
+            dataType === 'ordinal' || dataType === 'time'
+        )) {} // jshint ignore:line
 
-        if (labelModel.get('show')) {
+        if (valueDim != null && labelModel.get('show')) {
             graphic.setText(elStyle, labelModel, color);
             elStyle.text = zrUtil.retrieve(
                 seriesModel.getFormattedLabel(idx, 'normal'),
@@ -204,7 +203,7 @@ define(function (require) {
             elStyle.text = '';
         }
 
-        if (hoverLabelModel.getShallow('show')) {
+        if (valueDim != null && hoverLabelModel.getShallow('show')) {
             graphic.setText(hoverStyle, hoverLabelModel, color);
             hoverStyle.text = zrUtil.retrieve(
                 seriesModel.getFormattedLabel(idx, 'emphasis'),
-- 
GitLab