diff --git a/src/component/marker/MarkerModel.js b/src/component/marker/MarkerModel.js index 5cb44a113dea86ead40479b3d3785a3fc4a22079..8c3a3140c456b96dbf23ce5af73d83d38942c05d 100644 --- a/src/component/marker/MarkerModel.js +++ b/src/component/marker/MarkerModel.js @@ -40,7 +40,7 @@ var MarkerModel = echarts.extendComponentModel({ /** * @overrite */ - init: function (option, parentModel, ecModel, extraOpt) { + init: function (option, parentModel, ecModel) { if (__DEV__) { if (this.type === 'marker') { @@ -48,7 +48,7 @@ var MarkerModel = echarts.extendComponentModel({ } } this.mergeDefaultAndTheme(option, ecModel); - this.mergeOption(option, ecModel, extraOpt.createdBySelf, true); + this._mergeOption(option, ecModel, false, true); }, /** @@ -63,7 +63,14 @@ var MarkerModel = echarts.extendComponentModel({ return this.getShallow('animation') && hostSeries && hostSeries.isAnimationEnabled(); }, - mergeOption: function (newOpt, ecModel, createdBySelf, isInit) { + /** + * @overrite + */ + mergeOption: function (newOpt, ecModel) { + this._mergeOption(newOpt, ecModel, false, false); + }, + + _mergeOption: function (newOpt, ecModel, createdBySelf, isInit) { var MarkerModel = this.constructor; var modelPropName = this.mainType + 'Model'; if (!createdBySelf) { @@ -107,7 +114,7 @@ var MarkerModel = echarts.extendComponentModel({ markerModel.__hostSeries = seriesModel; } else { - markerModel.mergeOption(markerOpt, ecModel, true); + markerModel._mergeOption(markerOpt, ecModel, true); } seriesModel[modelPropName] = markerModel; }, this);