提交 515d2a81 编写于 作者: S sushuang

release 3.8.0

上级 b6bf2095
......@@ -20921,7 +20921,7 @@ function ECharts(dom, theme, opts) {
var defaultRenderer = 'canvas';
if (__DEV__) {
defaultRenderer = (
typeof window === void 0 ? global : window
typeof window === 'undefined' ? global : window
).__ECHARTS__DEFAULT__RENDERER__ || defaultRenderer;
}
......@@ -21010,7 +21010,7 @@ function ECharts(dom, theme, opts) {
var defaultRenderer = 'canvas';
if (__DEV__) {
defaultRenderer = (
typeof window === void 0 ? global : window
typeof window === 'undefined' ? global : window
).__ECHARTS__DEFAULT__RENDERER__ || defaultRenderer;
}
......@@ -35849,8 +35849,8 @@ var MapSeries = SeriesModel.extend({
init: function (option) {
option = this._fillOption(option, this.getMapType());
this.option = option;
this._fillOption(option, this.getMapType());
// this.option = option;
MapSeries.superApply(this, 'init', arguments);
......@@ -35868,11 +35868,9 @@ var MapSeries = SeriesModel.extend({
},
mergeOption: function (newOption) {
if (newOption.data) {
newOption = this._fillOption(newOption, this.getMapType());
}
this._fillOption(newOption, this.getMapType());
MapSeries.superCall(this, 'mergeOption', newOption);
MapSeries.superApply(this, 'mergeOption', arguments);
this.updateSelectedMap(this.option.data);
},
......@@ -35894,11 +35892,11 @@ var MapSeries = SeriesModel.extend({
_fillOption: function (option, mapName) {
// Shallow clone
option = extend({}, option);
// option = zrUtil.extend({}, option);
option.data = geoCreator.getFilledRegions(option.data, mapName, option.nameMap);
return option;
// return option;
},
getRawValue: function (dataIndex) {
此差异已折叠。
此差异已折叠。
......@@ -20380,7 +20380,7 @@ function ECharts(dom, theme, opts) {
var defaultRenderer = 'canvas';
if (__DEV__) {
defaultRenderer = (
typeof window === void 0 ? global : window
typeof window === 'undefined' ? global : window
).__ECHARTS__DEFAULT__RENDERER__ || defaultRenderer;
}
......
......@@ -20921,7 +20921,7 @@ function ECharts(dom, theme, opts) {
var defaultRenderer = 'canvas';
if (__DEV__) {
defaultRenderer = (
typeof window === void 0 ? global : window
typeof window === 'undefined' ? global : window
).__ECHARTS__DEFAULT__RENDERER__ || defaultRenderer;
}
此差异已折叠。
此差异已折叠。
此差异已折叠。
......@@ -20380,7 +20380,7 @@ function ECharts(dom, theme, opts) {
var defaultRenderer = 'canvas';
if (__DEV__) {
defaultRenderer = (
typeof window === void 0 ? global : window
typeof window === 'undefined' ? global : window
).__ECHARTS__DEFAULT__RENDERER__ || defaultRenderer;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册