Pull request #4: Release/11.0

Merge in ~IMP/dec-fineui from release/11.0 to final/11.0

* commit '9e201575228205157af9b6730c0fa18c673be29f':
  BI-119055 fix: needadaptive的下拉计算NaN
  auto upgrade version to 2.0.20221215171537
  BI-118849 fix: combo在屏幕边缘,左右位置不够之后的位置调整逻辑
  auto upgrade version to 2.0.20221215144622
  auto upgrade version to 2.0.20221215141039

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221214115751",
+  "version": "2.0.20221215171537",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

src/core/platform/web/dom.js

@@ -250,12 +250,12 @@
 
         _getLeftAlignPosition: function (combo, popup, extraWidth, container) {
             var comboRect = combo.element[0].getBoundingClientRect(),
-                popupRect = popup.element.bounds(),
+                popupRect = popup.element[0].getBoundingClientRect(),
                 viewportRect = document.documentElement.getBoundingClientRect(),
                 containerRect = container ? container.getBoundingClientRect() : { left: 0 };
             var left = comboRect.left - containerRect.left + extraWidth;
 
-            if (left + popupRect.width - containerRect.left > viewportRect.width) {
+            if (comboRect.left + popupRect.width > viewportRect.width) {
                 left = viewportRect.width - popupRect.width - containerRect.left;
             }
             return left;
@@ -265,12 +265,13 @@
             var left = this._getLeftAlignPosition(combo, popup, extraWidth, container);
             var dir = "";
             // 如果放不下，优先使用RightAlign, 如果RightAlign也放不下, 再使用left=0
-            if (left < 0) {
+            var containerRect = container ? container.getBoundingClientRect() : { left: 0 };
+            if (left + containerRect.left < 0) {
                 left = this._getRightAlignPosition(combo, popup, extraWidth);
                 dir = "left";
             }
-            if (left < 0) {
-                left = 0;
+            if (left + containerRect.left < 0) {
+                left = 0 - containerRect.left;
             }
             return {
                 left: left,
@@ -412,7 +413,7 @@
         },
 
         getBottomAdaptPosition: function (combo, popup, extraHeight, needAdaptHeight) {
-            var comboBounds = combo.element.bounds(), popupBounds = popup.element.bounds(),
+            var comboBounds = combo.element[0].getBoundingClientRect(), popupBounds = popup.element[0].getBoundingClientRect(),
                 windowBounds = BI.Widget._renderEngine.createElement("body").bounds();
             if (BI.DOM.isBottomSpaceEnough(combo, popup, extraHeight)) {
                 return BI.DOM.getBottomPosition(combo, popup, extraHeight);
@@ -678,8 +679,8 @@
         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);
+            var viewportBounds = document.documentElement.getBoundingClientRect();
+            var maxHeight = Math.min(popup.attr("maxHeight") || viewportBounds.height, viewportBounds.height);
             popup.resetHeight && popup.resetHeight(maxHeight);
             var position = BI.DOM.getComboPositionByDirections(combo, popup, extraWidth, extraHeight, needAdaptHeight, directions || ["bottom", "top", "right", "left"], positionRelativeElement);
             switch (offsetStyle) {
@@ -703,7 +704,7 @@
                     break;
             }
             if (needAdaptHeight === true) {
-                popup.resetHeight && popup.resetHeight(Math.min(bodyHeight - position.top + (positionRelativeElement ? positionRelativeElement.getBoundingClientRect().top : 0), maxHeight));
+                popup.resetHeight && popup.resetHeight(Math.min(viewportBounds.height - position.top + (positionRelativeElement ? positionRelativeElement.getBoundingClientRect().top : 0), maxHeight));
             }
             return position;
         },