提交 1fdc7047 编写于 作者: L lang

tweak

上级 37f198e7
......@@ -7,7 +7,7 @@ define(function (require) {
function getViewRect(seriesModel, api) {
return layout.getLayoutRect(
seriesModel.getBoxLayoutOption(), {
seriesModel.getBoxLayoutParams(), {
width: api.getWidth(),
height: api.getHeight()
}
......
......@@ -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(),
......
......@@ -41,7 +41,7 @@ define(function (require) {
*/
function getViewRect(seriesModel, api) {
return layout.getLayoutRect(
seriesModel.getBoxLayoutOption(), {
seriesModel.getBoxLayoutParams(), {
width: api.getWidth(),
height: api.getHeight()
}
......
......@@ -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(),
......
......@@ -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: {
......
......@@ -33,7 +33,7 @@ define(function (require) {
);
var layoutInfo = layout.getLayoutRect(
seriesModel.getBoxLayoutOption(),
seriesModel.getBoxLayoutParams(),
{
width: api.getWidth(),
height: api.getHeight()
......
......@@ -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()
......
......@@ -624,7 +624,7 @@ define(function (require) {
function getViewRect(model, api) {
return layout.getLayoutRect(
model.getBoxLayoutOption(),
model.getBoxLayoutParams(),
{
width: api.getWidth(),
height: api.getHeight()
......
......@@ -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(
......
......@@ -171,7 +171,7 @@ define(function (require) {
layout.positionGroup(
group,
model.getBoxLayoutOption(),
model.getBoxLayoutParams(),
{width: api.getWidth(), height: api.getHeight()}
);
},
......
......@@ -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()
});
......
......@@ -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;
......
......@@ -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()
......
define(function (require) {
return {
getBoxLayoutOption: function () {
getBoxLayoutParams: function () {
return {
left: this.get('left'),
top: this.get('top'),
......
......@@ -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 = [
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册