From 1fdc70478561bbd2f901d9f5f04c9b4bf1f2486e Mon Sep 17 00:00:00 2001 From: lang Date: Tue, 29 Dec 2015 13:03:09 +0800 Subject: [PATCH] tweak --- src/chart/funnel/funnelLayout.js | 2 +- src/chart/graph/createView.js | 2 +- src/chart/sankey/sankeyLayout.js | 2 +- src/chart/treemap/Breadcrumb.js | 8 ++++---- src/chart/treemap/TreemapSeries.js | 6 ++++-- src/chart/treemap/treemapLayout.js | 2 +- src/component/helper/listComponent.js | 2 +- src/component/timeline/SliderTimelineView.js | 2 +- src/component/title.js | 2 +- src/component/visualMap/VisualMapView.js | 2 +- src/coord/cartesian/Grid.js | 2 +- src/coord/geo/geoCreator.js | 2 +- src/coord/parallel/Parallel.js | 2 +- src/model/mixin/boxLayout.js | 2 +- src/preprocessor/backwardCompat.js | 2 +- 15 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/chart/funnel/funnelLayout.js b/src/chart/funnel/funnelLayout.js index f9d384eda..b4ba8b0c1 100644 --- a/src/chart/funnel/funnelLayout.js +++ b/src/chart/funnel/funnelLayout.js @@ -7,7 +7,7 @@ define(function (require) { function getViewRect(seriesModel, api) { return layout.getLayoutRect( - seriesModel.getBoxLayoutOption(), { + seriesModel.getBoxLayoutParams(), { width: api.getWidth(), height: api.getHeight() } diff --git a/src/chart/graph/createView.js b/src/chart/graph/createView.js index 043ddbb45..04e579446 100644 --- a/src/chart/graph/createView.js +++ b/src/chart/graph/createView.js @@ -5,7 +5,7 @@ define(function (require) { var bbox = require('zrender/core/bbox'); function getViewRect(seriesModel, api, aspect) { - var option = seriesModel.getBoxLayoutOption(); + var option = seriesModel.getBoxLayoutParams(); option.aspect = aspect; return layout.getLayoutRect(option, { width: api.getWidth(), diff --git a/src/chart/sankey/sankeyLayout.js b/src/chart/sankey/sankeyLayout.js index 8bdce3b6b..8ef79db4f 100644 --- a/src/chart/sankey/sankeyLayout.js +++ b/src/chart/sankey/sankeyLayout.js @@ -41,7 +41,7 @@ define(function (require) { */ function getViewRect(seriesModel, api) { return layout.getLayoutRect( - seriesModel.getBoxLayoutOption(), { + seriesModel.getBoxLayoutParams(), { width: api.getWidth(), height: api.getHeight() } diff --git a/src/chart/treemap/Breadcrumb.js b/src/chart/treemap/Breadcrumb.js index 8af9e5ea1..b9d8d6bde 100644 --- a/src/chart/treemap/Breadcrumb.js +++ b/src/chart/treemap/Breadcrumb.js @@ -44,10 +44,10 @@ var layoutParam = { pos: { - x: model.get('x'), - x2: model.get('x2'), - y: model.get('y'), - y2: model.get('y2') + left: model.get('left'), + right: model.get('right'), + top: model.get('top'), + bottom: model.get('bottom') }, box: { width: api.getWidth(), diff --git a/src/chart/treemap/TreemapSeries.js b/src/chart/treemap/TreemapSeries.js index f141f655a..fe5b423ac 100644 --- a/src/chart/treemap/TreemapSeries.js +++ b/src/chart/treemap/TreemapSeries.js @@ -40,8 +40,10 @@ define(function(require) { breadcrumb: { show: true, height: 22, - x: 'center', - y: 'bottom', + left: 'center', + top: 'bottom', + // right + // bottom emptyItemWidth: 25, // 空节点宽度 itemStyle: { normal: { diff --git a/src/chart/treemap/treemapLayout.js b/src/chart/treemap/treemapLayout.js index 7db1bca3a..6b5983d58 100644 --- a/src/chart/treemap/treemapLayout.js +++ b/src/chart/treemap/treemapLayout.js @@ -33,7 +33,7 @@ define(function (require) { ); var layoutInfo = layout.getLayoutRect( - seriesModel.getBoxLayoutOption(), + seriesModel.getBoxLayoutParams(), { width: api.getWidth(), height: api.getHeight() diff --git a/src/component/helper/listComponent.js b/src/component/helper/listComponent.js index ec69d6878..92276116b 100644 --- a/src/component/helper/listComponent.js +++ b/src/component/helper/listComponent.js @@ -6,7 +6,7 @@ define(function (require) { function positionGroup(group, model, api) { layout.positionGroup( - group, model.getBoxLayoutOption(), + group, model.getBoxLayoutParams(), { width: api.getWidth(), height: api.getHeight() diff --git a/src/component/timeline/SliderTimelineView.js b/src/component/timeline/SliderTimelineView.js index 207c52e5a..4f2004201 100644 --- a/src/component/timeline/SliderTimelineView.js +++ b/src/component/timeline/SliderTimelineView.js @@ -624,7 +624,7 @@ define(function (require) { function getViewRect(model, api) { return layout.getLayoutRect( - model.getBoxLayoutOption(), + model.getBoxLayoutParams(), { width: api.getWidth(), height: api.getHeight() diff --git a/src/component/title.js b/src/component/title.js index d00a29bd0..5889f9617 100644 --- a/src/component/title.js +++ b/src/component/title.js @@ -132,7 +132,7 @@ define(function(require) { // If no subText, but add subTextEl, there will be an empty line. var groupRect = group.getBoundingRect(); - var layoutOption = titleModel.getBoxLayoutOption(); + var layoutOption = titleModel.getBoxLayoutParams(); layoutOption.width = groupRect.width; layoutOption.height = groupRect.height; var layoutRect = layout.getLayoutRect( diff --git a/src/component/visualMap/VisualMapView.js b/src/component/visualMap/VisualMapView.js index 4a16265f0..103087763 100644 --- a/src/component/visualMap/VisualMapView.js +++ b/src/component/visualMap/VisualMapView.js @@ -171,7 +171,7 @@ define(function (require) { layout.positionGroup( group, - model.getBoxLayoutOption(), + model.getBoxLayoutParams(), {width: api.getWidth(), height: api.getHeight()} ); }, diff --git a/src/coord/cartesian/Grid.js b/src/coord/cartesian/Grid.js index 057d4d69f..5b1733876 100644 --- a/src/coord/cartesian/Grid.js +++ b/src/coord/cartesian/Grid.js @@ -87,7 +87,7 @@ define(function(require, factory) { gridProto.resize = function (gridModel, api) { var gridRect = layout.getLayoutRect( - gridModel.getBoxLayoutOption(), { + gridModel.getBoxLayoutParams(), { width: api.getWidth(), height: api.getHeight() }); diff --git a/src/coord/geo/geoCreator.js b/src/coord/geo/geoCreator.js index ee209fdf7..1c11ff3c2 100644 --- a/src/coord/geo/geoCreator.js +++ b/src/coord/geo/geoCreator.js @@ -17,7 +17,7 @@ define(function (require) { function resizeGeo (geoModel, api) { var rect = this.getBoundingRect(); - var boxLayoutOption = geoModel.getBoxLayoutOption(); + var boxLayoutOption = geoModel.getBoxLayoutParams(); // 0.75 rate boxLayoutOption.aspect = rect.width / rect.height * 0.75; diff --git a/src/coord/parallel/Parallel.js b/src/coord/parallel/Parallel.js index 37d4aaac5..55963e9dd 100644 --- a/src/coord/parallel/Parallel.js +++ b/src/coord/parallel/Parallel.js @@ -117,7 +117,7 @@ define(function(require) { */ resize: function (parallelModel, api) { this._rect = layout.getLayoutRect( - parallelModel.getBoxLayoutOption(), + parallelModel.getBoxLayoutParams(), { width: api.getWidth(), height: api.getHeight() diff --git a/src/model/mixin/boxLayout.js b/src/model/mixin/boxLayout.js index 46bf169b9..9fa5a5880 100644 --- a/src/model/mixin/boxLayout.js +++ b/src/model/mixin/boxLayout.js @@ -1,7 +1,7 @@ define(function (require) { return { - getBoxLayoutOption: function () { + getBoxLayoutParams: function () { return { left: this.get('left'), top: this.get('top'), diff --git a/src/preprocessor/backwardCompat.js b/src/preprocessor/backwardCompat.js index 4479bb688..0d5055b31 100644 --- a/src/preprocessor/backwardCompat.js +++ b/src/preprocessor/backwardCompat.js @@ -45,7 +45,7 @@ define(function (require) { ]; var COMPATITABLE_COMPONENTS = [ - 'grid', 'geo', 'parallel', 'legend', 'toolbox', 'title', 'visualMap', 'dataZoom' + 'grid', 'geo', 'parallel', 'legend', 'toolbox', 'title', 'visualMap', 'dataZoom', 'timeline' ]; var COMPATITABLE_SERIES = [ -- GitLab