From 4c4b1de0e86ac0a2efe82d65a084a2237c8b9e6d Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Mon, 8 May 2023 15:08:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?BI-126065=20fix:=20=E3=80=906.0.10=E3=80=91?=
 =?UTF-8?q?=E4=BD=8E=E7=89=88=E6=9C=AC=E7=81=AB=E7=8B=90=E6=B5=8F=E8=A7=88?=
 =?UTF-8?q?=E5=99=A8=E6=89=93=E5=BC=80=E5=B7=A5=E7=A8=8B=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E7=A9=BA=E7=99=BD=EF=BC=8C=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=9C=89?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/fineui/webpack/webpack.prod.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/fineui/webpack/webpack.prod.js b/packages/fineui/webpack/webpack.prod.js
index 712a39d10..2fc6ceb37 100644
--- a/packages/fineui/webpack/webpack.prod.js
+++ b/packages/fineui/webpack/webpack.prod.js
@@ -5,6 +5,7 @@ const attachments = require("./attachments");
 
 module.exports = merge(common, {
     mode: "production",
+    target: ["web", "es5"],
 
     entry: {
         "fineui.min": attachments.fineui,
@@ -14,8 +15,8 @@ module.exports = merge(common, {
 
     output: {
         path: dirs.DEST,
-        filename: "[name].js",
+        filename: "[name].js"
     },
 
-    devtool: "hidden-source-map",
+    devtool: "hidden-source-map"
 });

From 6b711bc1e37ee7b5288b5c3e6567c8bc07d0657f Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Mon, 8 May 2023 15:28:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?BI-125791=20fix:=20=E3=80=906.0.10=E5=8F=91?=
 =?UTF-8?q?=E6=95=A3=E3=80=91=E7=BB=84=E4=BB=B6=E7=BC=96=E8=BE=91=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E7=82=B9=E5=87=BB=E8=A7=A6=E5=8F=91=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=A7=A3=E9=87=8A=E7=9A=84=E7=83=AD=E5=8C=BA=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E7=9A=84=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BC=9A=E5=8F=98=E6=9D=A5=E5=8F=98=E5=8E=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/fineui/src/base/combination/combo.js | 50 +++++++++++--------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/packages/fineui/src/base/combination/combo.js b/packages/fineui/src/base/combination/combo.js
index 0721ba9e0..e3c5f5db8 100644
--- a/packages/fineui/src/base/combination/combo.js
+++ b/packages/fineui/src/base/combination/combo.js
@@ -267,34 +267,34 @@ export class Combo extends Bubble {
             belowMouse && isNotNull(e)
                 ? {
                     element: {
-                        0: e.target,
-                        offset: () => {
+                        0: extend({}, e.target, {
+                            getBoundingClientRect: function () {
+                                return {
+                                    left: e.pageX,
+                                    top: e.pageY,
+                                    width: 0,
+                                    height: 0,
+                                };
+                            }
+                        }),
+                        offset: function () {
                             return {
                                 left: e.pageX,
                                 top: e.pageY,
                             };
                         },
-                        bounds: () => {
-                            // offset为其相对于父定位元素的偏移
-                            return {
-                                x: e.offsetX,
-                                y: e.offsetY,
-                                width: 0,
-                                height: 24,
-                            };
-                        },
-                        outerWidth: () => 0,
-                        outerHeight: () => 24,
                     },
                 }
                 : this.combo;
-        const positionRelativeElement = supportCSSTransform
-            ? DOM.getPositionRelativeContainingBlock(
-                isNull(container)
-                    ? this.element[0]
-                    : Widget._renderEngine.createElement(isFunction(container) ? container() : container)[0]
-            )
-            : null;
+
+        const positionRelativeElement = DOM.getPositionRelativeContainingBlock(
+            isNull(container)
+                ? this.element[0]
+                : BI.isWidget(container)
+                    ? container.element[0]
+                    : BI.Widget._renderEngine.createElement(isFunction(container) ? container() : container)[0]
+        );
+
         const TRIANGLE_LENGTH = 12;
         switch (direction) {
             case "bottom":
@@ -513,8 +513,14 @@ export class Combo extends Bubble {
             const scaleX = positonedRect.width / positionRelativeElement.offsetWidth;
             const scaleY = positonedRect.height / positionRelativeElement.offsetHeight;
 
-            p.top && (p.top = p.top / scaleY);
-            p.left && (p.left = p.left / scaleX);
+            p.top && (p.top = Math.round(p.top / scaleY + positionRelativeElement.scrollTop));
+            p.left && (p.left = Math.round(p.left / scaleX + positionRelativeElement.scrollLeft));
+
+            p.adaptHeight && (p.adaptHeight = Math.round(p.adaptHeight / scaleY));
+        }
+
+        if ("adaptHeight" in p) {
+            this.resetListHeight(p.adaptHeight);
         }
 
         if ("left" in p) {