Merge pull request #211668 in DEC/fineui from master to feature/x

* commit '4ccadb2c0350374eaed05f66db9769c9e303a4ce':
  KERNEL-11877 feat: 修复bug

src/base/combination/combo.js

@@ -220,7 +220,7 @@
                     },
                 },
             } : this.combo;
-            var positionRelativeElement = o.supportCSSTransform ? BI.DOM.getPositionRelativeContainingBlock(BI.isNull(o.container) ? this.element[0] : BI.Widget._renderEngine.createElement(BI.isFunction(o.container) ? o.container() : o.container)[0]) : null;
+            var positionRelativeElement = BI.DOM.getPositionRelativeContainingBlock(BI.isNull(o.container) ? this.element[0] : BI.Widget._renderEngine.createElement(BI.isFunction(o.container) ? o.container() : o.container)[0]);
             switch (o.direction) {
                 case "bottom":
                 case "bottom,right":
@@ -290,10 +290,6 @@
                     break;
             }
 
-            if ("adaptHeight" in p) {
-                this.resetListHeight(p.adaptHeight);
-            }
-
             var width = this.combo.element.outerWidth();
             var height = this.combo.element.outerHeight();
             this.popupView.setDirection && this.popupView.setDirection(p.dir, {
@@ -314,6 +310,12 @@
 
                 p.top && (p.top = p.top / scaleY);
                 p.left && (p.left = p.left / scaleX);
+
+                p.adaptHeight && (p.adaptHeight = p.adaptHeight / scaleY);
+            }
+
+            if ("adaptHeight" in p) {
+                this.resetListHeight(p.adaptHeight);
             }
 
             if ("left" in p) {

src/core/platform/web/dom.js

@@ -327,7 +327,7 @@
                 top = comboOffset.top - containerBounds.top + extraHeight;
             } else if (needAdaptHeight) {
                 top = comboBounds.top - containerBounds.top + extraHeight;
-                adaptHeight = viewportBounds.height - top;
+                adaptHeight = viewportBounds.height - comboBounds.top;
             } else if (BI.DOM.isTopSpaceEnough(combo, popup, -1 * comboBounds.height + extraHeight)) {
                 // 下方空间不足且不允许调整高度的情况下，优先使用上对齐
                 top = comboBounds.top + comboBounds.height - popupBounds.height - containerBounds.top - extraHeight;
@@ -671,13 +671,13 @@
         },
 
 
-        getComboPosition: function (combo, popup, extraWidth, extraHeight, needAdaptHeight, directions, offsetStyle, container) {
+        getComboPosition: function (combo, popup, extraWidth, extraHeight, needAdaptHeight, directions, offsetStyle, positionRelativeElement) {
             extraWidth || (extraWidth = 0);
             extraHeight || (extraHeight = 0);
             var bodyHeight = BI.Widget._renderEngine.createElement("body").bounds().height - extraHeight;
             var maxHeight = Math.min(popup.attr("maxHeight") || bodyHeight, bodyHeight);
             popup.resetHeight && popup.resetHeight(maxHeight);
-            var position = BI.DOM.getComboPositionByDirections(combo, popup, extraWidth, extraHeight, needAdaptHeight, directions || ["bottom", "top", "right", "left"], container);
+            var position = BI.DOM.getComboPositionByDirections(combo, popup, extraWidth, extraHeight, needAdaptHeight, directions || ["bottom", "top", "right", "left"], positionRelativeElement);
             switch (offsetStyle) {
                 case "center":
                     if (position.change) {
@@ -699,7 +699,7 @@
                     break;
             }
             if (needAdaptHeight === true) {
-                popup.resetHeight && popup.resetHeight(Math.min(bodyHeight - position.top, maxHeight));
+                popup.resetHeight && popup.resetHeight(Math.min(bodyHeight - position.top + (positionRelativeElement ? positionRelativeElement.getBoundingClientRect().top : 0), maxHeight));
             }
             return position;
         },