diff --git a/src/chart/chord.js b/src/chart/chord.js index 64cc2fefed4d432fd74245d7700d5b6bc9e9c4fd..726395bd081e72a8668f72375ef67f23f4305988 100644 --- a/src/chart/chord.js +++ b/src/chart/chord.js @@ -1080,6 +1080,8 @@ define(function (require) { opt.itemStyle.normal.label.textStyle = this.getTextStyle( opt.itemStyle.normal.label.textStyle ); + this.z = opt.z; + this.zlevel = opt.zlevel; } }; diff --git a/src/chart/pie.js b/src/chart/pie.js index 1e30e15c9dcaf269a09e92ec89cb23b5395e8eff..b0ea5e8d5ad4e4829ccac136b080d2a5ad982be2 100644 --- a/src/chart/pie.js +++ b/src/chart/pie.js @@ -874,7 +874,8 @@ define(function (require) { opt.itemStyle.emphasis.label.textStyle = this.getTextStyle( opt.itemStyle.emphasis.label.textStyle ); - + this.z = opt.z; + this.zlevel = opt.zlevel; return opt; }, diff --git a/src/component/base.js b/src/component/base.js index f3cbfb9945df765d9abe95eac12032586ccd0b67..d9ebd96ef5de2411464b782776d4779196650154 100644 --- a/src/component/base.js +++ b/src/component/base.js @@ -55,6 +55,9 @@ define(function (require) { Base.prototype = { canvasSupported: require('zrender/tool/env').canvasSupported, _getZ : function(zWhat) { + if (this[zWhat] != null) { + return this[zWhat]; + } var opt = this.ecTheme[this.type]; if (opt && opt[zWhat] != null) { return opt[zWhat]; @@ -88,13 +91,16 @@ define(function (require) { */ reformOption: function (opt) { // 默认配置项动态多级合并,依赖加载的组件选项未被merge到ecTheme里,需要从config里取 - return zrUtil.merge( + opt = zrUtil.merge( zrUtil.merge( opt || {}, zrUtil.clone(this.ecTheme[this.type] || {}) ), zrUtil.clone(ecConfig[this.type] || {}) ); + this.z = opt.z; + this.zlevel = opt.zlevel; + return opt; }, /**