From 5eefa7b242020106842efc3cec3747dcc24260c5 Mon Sep 17 00:00:00 2001
From: pissang <bm2736892@gmail.com>
Date: Fri, 29 Nov 2019 13:38:09 +0800
Subject: [PATCH] fix(toolbox): more robust stack switch code.

---
 src/component/toolbox/ToolboxView.js       |  4 ++--
 src/component/toolbox/feature/MagicType.js | 20 +++++++++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/component/toolbox/ToolboxView.js b/src/component/toolbox/ToolboxView.js
index 4830b5b46..25b079ebd 100644
--- a/src/component/toolbox/ToolboxView.js
+++ b/src/component/toolbox/ToolboxView.js
@@ -64,8 +64,8 @@ export default echarts.extendComponentView({
             var feature;
 
             // FIX#11236, merge feature title from MagicType newOption. TODO: consider seriesIndex ?
-            if (payload && payload.newOption !== undefined && payload.newOption.series.length > 0) {
-                featureOpt.title = payload.newOption.series[0].title;
+            if (payload && payload.newTitle != null) {
+                featureOpt.title = payload.newTitle;
             }
 
             if (featureName && !oldName) { // Create
diff --git a/src/component/toolbox/feature/MagicType.js b/src/component/toolbox/feature/MagicType.js
index 2d7b81d33..beeb0067a 100644
--- a/src/component/toolbox/feature/MagicType.js
+++ b/src/component/toolbox/feature/MagicType.js
@@ -23,6 +23,7 @@ import lang from '../../../lang';
 import * as featureManager from '../featureManager';
 
 var magicTypeLang = lang.toolbox.magicType;
+var INNER_STACK_KEYWORD = '__ec_magicType_stack__';
 
 function MagicType(model) {
     this.model = model;
@@ -87,14 +88,12 @@ var seriesOptGenreator = {
         }
     },
     'stack': function (seriesType, seriesId, seriesModel, model) {
-        var isStack = seriesModel.get('stack') === '__ec_magicType_stack__';
+        var isStack = seriesModel.get('stack') === INNER_STACK_KEYWORD;
         if (seriesType === 'line' || seriesType === 'bar') {
             model.setIconStatus('stack', isStack ? 'normal' : 'emphasis');
             return zrUtil.merge({
                 id: seriesId,
-                stack: isStack ? '' : '__ec_magicType_stack__',
-                // FIXME: also need to change tooltip for stack/unstack state.
-                title: isStack ? zrUtil.clone(magicTypeLang.title) : zrUtil.merge({ stack: magicTypeLang.title.tiled }, magicTypeLang.title)
+                stack: isStack ? '' : INNER_STACK_KEYWORD
             }, model.get('option.stack') || {}, true);
         }
     }
@@ -167,10 +166,21 @@ proto.onclick = function (ecModel, api, type) {
             }
         }, generateNewSeriesTypes
     );
+
+    var newTitle;
+    // Change title of stack
+    if (type === 'stack') {
+        var isStack = newOption.series && newOption.series[0] && newOption.series[0].stack === INNER_STACK_KEYWORD;
+        newTitle = isStack
+            ? zrUtil.merge({ stack: magicTypeLang.title.tiled }, magicTypeLang.title)
+            : zrUtil.clone(magicTypeLang.title);
+    }
+
     api.dispatchAction({
         type: 'changeMagicType',
         currentType: type,
-        newOption: newOption
+        newOption: newOption,
+        newTitle: newTitle
     });
 };
 
-- 
GitLab