diff --git a/src/chart/bar/BarSeries.js b/src/chart/bar/BarSeries.js index 2b398f4412f6750ee0e688300ed9c145aad64673..f653347e995fbb0aea8776f5dfe5a439efa63cb7 100644 --- a/src/chart/bar/BarSeries.js +++ b/src/chart/bar/BarSeries.js @@ -28,6 +28,8 @@ define(function(require) { // 最小高度改为0 barMinHeight: 0, + + // barMaxWidth: null, // 默认自适应 // barWidth: null, // 柱间距离,默认为柱形宽度的30%,可设固定值 @@ -52,8 +54,6 @@ define(function(require) { // color: '各异', // 柱条边线 barBorderColor: '#fff', - // 柱条边线圆角,单位px,默认为0 - barBorderRadius: 0, // 柱条边线线宽,单位px,默认为1 barBorderWidth: 0 }, @@ -61,8 +61,6 @@ define(function(require) { // color: '各异', // 柱条边线 barBorderColor: '#fff', - // 柱条边线圆角,单位px,默认为0 - barBorderRadius: 0, // 柱条边线线宽,单位px,默认为1 barBorderWidth: 0 } diff --git a/src/chart/radar/backwardCompat.js b/src/chart/radar/backwardCompat.js index cd65f4d73f812b36d6b89069d7c5a3b16e52b704..f0014bb404264d5011fc4471f2ca84f59822026e 100644 --- a/src/chart/radar/backwardCompat.js +++ b/src/chart/radar/backwardCompat.js @@ -149,7 +149,7 @@ define(function (require) { seriesOpt.name = dataOpt.name; for (var i = 1; i < dataList.length; i++) { var dataOpt = dataList[i]; - var newSeriesOpt = zrUtil.clone(seriesOpt, true); + var newSeriesOpt = zrUtil.clone(seriesOpt); option.series.push(zrUtil.extend(newSeriesOpt, { name: dataOpt.name, data: dataOpt.value, diff --git a/src/component/helper/SelectController.js b/src/component/helper/SelectController.js index 74417ee97f0c4272dd1fa867b099bd2b6e22a4af..a6db78639ee3fd9756ccb69a95bb4e3e7e53f136 100644 --- a/src/component/helper/SelectController.js +++ b/src/component/helper/SelectController.js @@ -50,7 +50,7 @@ define(function (require) { * @type {Object} * @readOnly */ - this.opt = zrUtil.clone(opt, true); + this.opt = zrUtil.clone(opt); /** * @type {module:zrender/container/Group} @@ -131,7 +131,7 @@ define(function (require) { // TODO // Only support one interval yet. if (ranges) { - renderCover.call(this, zrUtil.clone(ranges, true)); + renderCover.call(this, zrUtil.clone(ranges)); } }, @@ -218,7 +218,7 @@ define(function (require) { renderCover.call(this, ranges); - this.trigger('selected', zrUtil.clone(ranges, true)); + this.trigger('selected', zrUtil.clone(ranges)); } } diff --git a/src/component/timeline/SliderTimelineView.js b/src/component/timeline/SliderTimelineView.js index c76095191aec227ead92e6dbadaa21319b1f0902..8ecaed2c9c4d3dc3de42aceb47469a9ed898b0d7 100644 --- a/src/component/timeline/SliderTimelineView.js +++ b/src/component/timeline/SliderTimelineView.js @@ -635,7 +635,7 @@ define(function (require) { function makeIcon(timelineModel, objPath, rect, opts) { var icon = graphic.makePath( timelineModel.get(objPath).replace(/^path:\/\//, ''), - zrUtil.clone(opts || {}, true), + zrUtil.clone(opts || {}), new BoundingRect(rect[0], rect[1], rect[2], rect[3]), 'center' ); diff --git a/src/component/timeline/TimelineModel.js b/src/component/timeline/TimelineModel.js index b160033773bc0956ab787ff5952736785b8978b1..9cc8ab167c855eff1d6bfd63863866fda0002e80 100644 --- a/src/component/timeline/TimelineModel.js +++ b/src/component/timeline/TimelineModel.js @@ -151,7 +151,7 @@ define(function(require) { var newItem; if (zrUtil.isObject(item)) { - newItem = zrUtil.clone(item, true); + newItem = zrUtil.clone(item); newItem.value = index; } else { diff --git a/src/component/tooltip/TooltipView.js b/src/component/tooltip/TooltipView.js index 05a72980ee4cb37995f9e2347da12637a52f5dfd..483c4eedef7c7ec4e313a85d561a4071ab0a1772 100644 --- a/src/component/tooltip/TooltipView.js +++ b/src/component/tooltip/TooltipView.js @@ -790,14 +790,14 @@ define(function (require) { if (lastHover.payloadBatch && !contentNotChange) { this._api.dispatchAction({ type: 'downplay', - batch: zrUtil.clone(lastHover.payloadBatch, true) + batch: zrUtil.clone(lastHover.payloadBatch) }); } // Dispatch highlight action if (!contentNotChange) { this._api.dispatchAction({ type: 'highlight', - batch: zrUtil.clone(payloadBatch, true) + batch: zrUtil.clone(payloadBatch) }); lastHover.payloadBatch = payloadBatch; } diff --git a/src/component/visualMap/PiecewiseModel.js b/src/component/visualMap/PiecewiseModel.js index c8d13c96b84089b7b78b2dc1696a37cb46740cf6..5e265039f2731284003da23fe1937a8ae0fee6bd 100644 --- a/src/component/visualMap/PiecewiseModel.js +++ b/src/component/visualMap/PiecewiseModel.js @@ -56,7 +56,7 @@ define(function(require) { this.resetVisual(function (mappingOption, state) { mappingOption.mappingMethod = mappingMethod; - mappingOption.categories = categories && zrUtil.clone(categories, true); + mappingOption.categories = categories && zrUtil.clone(categories); var intervals = mappingOption.intervals = []; var specifiedVisuals = mappingOption.specifiedVisuals = []; diff --git a/src/component/visualMap/PiecewiseView.js b/src/component/visualMap/PiecewiseView.js index 97ce62b6f3bde5adba0b5e32913a23dcee4efa30..235d46cbac9274a9cbc864167b612530aed2ed7e 100644 --- a/src/component/visualMap/PiecewiseView.js +++ b/src/component/visualMap/PiecewiseView.js @@ -150,7 +150,7 @@ define(function(require) { */ _onItemClick: function (index) { var visualMapModel = this.visualMapModel; - var selected = zrUtil.clone(visualMapModel.get('selected'), true); + var selected = zrUtil.clone(visualMapModel.get('selected')); if (visualMapModel.get('selectedMode') === 'single') { zrUtil.each(selected, function (item, index) { diff --git a/src/component/visualMap/VisualMapModel.js b/src/component/visualMap/VisualMapModel.js index c97e3b9461406a4668b7b6dd9d6419fcc69bc54f..606ab13d096b7740c240c5ff14399d59a9a637d2 100644 --- a/src/component/visualMap/VisualMapModel.js +++ b/src/component/visualMap/VisualMapModel.js @@ -389,12 +389,12 @@ define(function(require) { // Consistent symbol and symbolSize if not specified. if (!visuals.symbol) { visuals.symbol = symbolExists - && zrUtil.clone(symbolExists, true) + && zrUtil.clone(symbolExists) || (isCategory ? 'roundRect' : ['roundRect']); } if (!visuals.symbolSize) { visuals.symbolSize = symbolSizeExists - && zrUtil.clone(symbolSizeExists, true) + && zrUtil.clone(symbolSizeExists) || (isCategory ? itemSize[0] : [itemSize[0], itemSize[0]]); } diff --git a/src/coord/parallel/AxisModel.js b/src/coord/parallel/AxisModel.js index 694c1eadf5f7c874fb4e172fe82b63d2298fa293..fe76c4e57df476949a695074b1293b511fb6a53e 100644 --- a/src/coord/parallel/AxisModel.js +++ b/src/coord/parallel/AxisModel.js @@ -47,7 +47,7 @@ define(function(require) { * @public */ setActiveIntervals: function (intervals) { - var activeIntervals = this.activeIntervals = zrUtil.clone(intervals, true); + var activeIntervals = this.activeIntervals = zrUtil.clone(intervals); // Normalize if (activeIntervals) { diff --git a/src/coord/parallel/Parallel.js b/src/coord/parallel/Parallel.js index 55963e9ddd2582a04b9f5c9ad69c1166baf8f108..3bb6356a199738777302867d103e91a37e334e23 100644 --- a/src/coord/parallel/Parallel.js +++ b/src/coord/parallel/Parallel.js @@ -280,7 +280,7 @@ define(function(require) { * Get axis layout. */ getAxisLayout: function (dim) { - return zrUtil.clone(this._axesLayout[dim], true); + return zrUtil.clone(this._axesLayout[dim]); } }; diff --git a/src/echarts.js b/src/echarts.js index 2d14efb57f18bd6227c80aa9210ebcbe3cf03df9..62e0781c45c401d8e6a41bd85872a5645158e61d 100644 --- a/src/echarts.js +++ b/src/echarts.js @@ -83,7 +83,7 @@ define(function (require) { * @type {Object} * @private */ - this._theme = zrUtil.clone(theme, true); + this._theme = zrUtil.clone(theme); /** * @type {Array.} diff --git a/src/model/Global.js b/src/model/Global.js index c638c579d4c4a1a8ab24e7347f756aab183f4b1b..89c67a08e7036e5ee0edad6000baa1328b0f0d13 100644 --- a/src/model/Global.js +++ b/src/model/Global.js @@ -110,7 +110,7 @@ define(function (require) { if (!ComponentModel.hasClass(mainType)) { option[mainType] = option[mainType] == null - ? zrUtil.clone(componentOption, true) + ? zrUtil.clone(componentOption) : zrUtil.merge(option[mainType], componentOption, true); } else { diff --git a/src/model/Model.js b/src/model/Model.js index d1618b511bcaa494815f21d7f7a386a16c34a794..80a09562a67ac2fad990833cbc7877e9a813f0f8 100644 --- a/src/model/Model.js +++ b/src/model/Model.js @@ -123,7 +123,7 @@ define(function (require) { // Pending clone: function () { var Ctor = this.constructor; - return new Ctor(zrUtil.clone(this.option, true)); + return new Ctor(zrUtil.clone(this.option)); }, setReadOnly: function (properties) { diff --git a/src/visual/VisualMapping.js b/src/visual/VisualMapping.js index 80ac839c10479f6ba4119eefeb1efebe69b2c624..612ad0fb30f5f57aba09d39405356de253cdfb07 100644 --- a/src/visual/VisualMapping.js +++ b/src/visual/VisualMapping.js @@ -56,7 +56,7 @@ define(function (require) { * @readOnly * @type {Object} */ - var thisOption = this.option = zrUtil.clone(option, true); + var thisOption = this.option = zrUtil.clone(option); /** * @private diff --git a/src/visual/visualDefault.js b/src/visual/visualDefault.js index ba07314c84061d3ff15d0051cdb470026b1e94f7..1ccef6ce9c1d8a3d655709f450c5aaebe072ffdb 100644 --- a/src/visual/visualDefault.js +++ b/src/visual/visualDefault.js @@ -12,8 +12,7 @@ define(function (require) { */ get: function (visualType, key, isCategory) { var value = zrUtil.clone( - (defaultOption[visualType] || {})[key], - true + (defaultOption[visualType] || {})[key] ); return isCategory