From 885bc8a7166f625a98935666b07f865fd55c9df8 Mon Sep 17 00:00:00 2001 From: guy Date: Fri, 26 May 2017 16:18:13 +0800 Subject: [PATCH] add --- bi/case.js | 2 +- bi/widget.js | 2 +- docs/case.js | 2 +- docs/widget.js | 2 +- src/case/combo/bubblecombo/combo.bubble.js | 2 +- src/widget/arrangement/arrangement.js | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bi/case.js b/bi/case.js index 5287d3f57..255c3bf16 100644 --- a/bi/case.js +++ b/bi/case.js @@ -4935,7 +4935,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, { _hideTriangle: function () { this.triangle && this.triangle.destroy(); - this.combo.getView().hideLine(); + this.combo.getView() && this.combo.getView().hideLine(); }, hideView: function () { diff --git a/bi/widget.js b/bi/widget.js index 37afe2e44..ae412aba1 100644 --- a/bi/widget.js +++ b/bi/widget.js @@ -3742,7 +3742,7 @@ BI.Arrangement = BI.inherit(BI.Widget, { case BI.Arrangement.LAYOUT_TYPE.ADAPTIVE: if (this._isArrangeFine()) { var width = this.getClientWidth(), height = this.getClientHeight(); - var isHeightAdjust = height > occupied.top + occupied.height; + var isHeightAdjust = height > occupied.height; var regions = this._cloneRegion(); BI.each(regions, function (i, region) { region.width = region.width / occupied.width * width; diff --git a/docs/case.js b/docs/case.js index 5287d3f57..255c3bf16 100644 --- a/docs/case.js +++ b/docs/case.js @@ -4935,7 +4935,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, { _hideTriangle: function () { this.triangle && this.triangle.destroy(); - this.combo.getView().hideLine(); + this.combo.getView() && this.combo.getView().hideLine(); }, hideView: function () { diff --git a/docs/widget.js b/docs/widget.js index 37afe2e44..ae412aba1 100644 --- a/docs/widget.js +++ b/docs/widget.js @@ -3742,7 +3742,7 @@ BI.Arrangement = BI.inherit(BI.Widget, { case BI.Arrangement.LAYOUT_TYPE.ADAPTIVE: if (this._isArrangeFine()) { var width = this.getClientWidth(), height = this.getClientHeight(); - var isHeightAdjust = height > occupied.top + occupied.height; + var isHeightAdjust = height > occupied.height; var regions = this._cloneRegion(); BI.each(regions, function (i, region) { region.width = region.width / occupied.width * width; diff --git a/src/case/combo/bubblecombo/combo.bubble.js b/src/case/combo/bubblecombo/combo.bubble.js index 0ff96ae37..55fcd60d3 100644 --- a/src/case/combo/bubblecombo/combo.bubble.js +++ b/src/case/combo/bubblecombo/combo.bubble.js @@ -189,7 +189,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, { _hideTriangle: function () { this.triangle && this.triangle.destroy(); - this.combo.getView().hideLine(); + this.combo.getView() && this.combo.getView().hideLine(); }, hideView: function () { diff --git a/src/widget/arrangement/arrangement.js b/src/widget/arrangement/arrangement.js index a4fbcba47..8bedd4259 100644 --- a/src/widget/arrangement/arrangement.js +++ b/src/widget/arrangement/arrangement.js @@ -2752,7 +2752,7 @@ BI.Arrangement = BI.inherit(BI.Widget, { case BI.Arrangement.LAYOUT_TYPE.ADAPTIVE: if (this._isArrangeFine()) { var width = this.getClientWidth(), height = this.getClientHeight(); - var isHeightAdjust = height > occupied.top + occupied.height; + var isHeightAdjust = height > occupied.height; var regions = this._cloneRegion(); BI.each(regions, function (i, region) { region.width = region.width / occupied.width * width;