From b3c33f3babf60a4260caacfd55d81214eb0335d5 Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Wed, 10 May 2017 11:52:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bi/base.js                    | 4 ++--
 bi/core.js                    | 4 +++-
 docs/base.js                  | 4 ++--
 docs/core.js                  | 4 +++-
 src/base/combination/combo.js | 4 ++--
 src/core/func/dom.js          | 4 +++-
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/bi/base.js b/bi/base.js
index 2aedadb45..cc33c66a5 100644
--- a/bi/base.js
+++ b/bi/base.js
@@ -2935,7 +2935,7 @@ BI.Combo = BI.inherit(BI.Widget, {
                             }
                         }
                     }, BI.EVENT_RESPONSE_TIME, true);
-                    self.element.off(ev + "." + self.getName()).on(ev + "." + self.getName(), function(e){
+                    self.element.off(ev + "." + self.getName()).on(ev + "." + self.getName(), function (e) {
                         debounce(e);
                         st(e);
                     });
@@ -3051,7 +3051,7 @@ BI.Combo = BI.inherit(BI.Widget, {
                 break;
             case "top":
             case "top,right":
-                p = $.getComboPosition(this.combo, this.popupView, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ['top', 'bottom', 'right', 'left'], o.offsetStyle);
+                p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ['top', 'bottom', 'right', 'left'], o.offsetStyle);
                 break;
             case "left":
             case "left,bottom":
diff --git a/bi/core.js b/bi/core.js
index 46433d2bd..32390d7e0 100644
--- a/bi/core.js
+++ b/bi/core.js
@@ -17057,7 +17057,9 @@ BI.extend(jQuery, {
                 }
                 break;
         }
-        popup.resetHeight && popup.resetHeight(Math.min(bodyHeight - position.top, maxHeight));
+        if(needAdaptHeight === true) {
+            popup.resetHeight && popup.resetHeight(Math.min(bodyHeight - position.top, maxHeight));
+        }
         return position;
     }
 });/**
diff --git a/docs/base.js b/docs/base.js
index 2aedadb45..cc33c66a5 100644
--- a/docs/base.js
+++ b/docs/base.js
@@ -2935,7 +2935,7 @@ BI.Combo = BI.inherit(BI.Widget, {
                             }
                         }
                     }, BI.EVENT_RESPONSE_TIME, true);
-                    self.element.off(ev + "." + self.getName()).on(ev + "." + self.getName(), function(e){
+                    self.element.off(ev + "." + self.getName()).on(ev + "." + self.getName(), function (e) {
                         debounce(e);
                         st(e);
                     });
@@ -3051,7 +3051,7 @@ BI.Combo = BI.inherit(BI.Widget, {
                 break;
             case "top":
             case "top,right":
-                p = $.getComboPosition(this.combo, this.popupView, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ['top', 'bottom', 'right', 'left'], o.offsetStyle);
+                p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ['top', 'bottom', 'right', 'left'], o.offsetStyle);
                 break;
             case "left":
             case "left,bottom":
diff --git a/docs/core.js b/docs/core.js
index 1ad16266e..4631967d7 100644
--- a/docs/core.js
+++ b/docs/core.js
@@ -22569,7 +22569,9 @@ BI.extend(jQuery, {
                 }
                 break;
         }
-        popup.resetHeight && popup.resetHeight(Math.min(bodyHeight - position.top, maxHeight));
+        if(needAdaptHeight === true) {
+            popup.resetHeight && popup.resetHeight(Math.min(bodyHeight - position.top, maxHeight));
+        }
         return position;
     }
 });/**
diff --git a/src/base/combination/combo.js b/src/base/combination/combo.js
index 105339c08..fae9df972 100644
--- a/src/base/combination/combo.js
+++ b/src/base/combination/combo.js
@@ -132,7 +132,7 @@ BI.Combo = BI.inherit(BI.Widget, {
                             }
                         }
                     }, BI.EVENT_RESPONSE_TIME, true);
-                    self.element.off(ev + "." + self.getName()).on(ev + "." + self.getName(), function(e){
+                    self.element.off(ev + "." + self.getName()).on(ev + "." + self.getName(), function (e) {
                         debounce(e);
                         st(e);
                     });
@@ -248,7 +248,7 @@ BI.Combo = BI.inherit(BI.Widget, {
                 break;
             case "top":
             case "top,right":
-                p = $.getComboPosition(this.combo, this.popupView, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ['top', 'bottom', 'right', 'left'], o.offsetStyle);
+                p = $.getComboPosition(this.combo, this.popupView, o.adjustXOffset, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight, ['top', 'bottom', 'right', 'left'], o.offsetStyle);
                 break;
             case "left":
             case "left,bottom":
diff --git a/src/core/func/dom.js b/src/core/func/dom.js
index 95213e37c..b8c9d6505 100644
--- a/src/core/func/dom.js
+++ b/src/core/func/dom.js
@@ -577,7 +577,9 @@ BI.extend(jQuery, {
                 }
                 break;
         }
-        popup.resetHeight && popup.resetHeight(Math.min(bodyHeight - position.top, maxHeight));
+        if(needAdaptHeight === true) {
+            popup.resetHeight && popup.resetHeight(Math.min(bodyHeight - position.top, maxHeight));
+        }
         return position;
     }
 });
\ No newline at end of file