From f35ca9a1aae7d8b4e218b1ff1b38ddab1eecbb01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dailer-=E5=88=98=E8=8D=A3=E6=AD=86?= Date: Wed, 11 Jan 2023 16:38:46 +0800 Subject: [PATCH 1/4] =?UTF-8?q?REPORT-88341=20fix:=20=E3=80=90=E4=B8=93?= =?UTF-8?q?=E9=A2=98=E3=80=91=E3=80=90=E6=99=BA=E8=83=BD=E8=BF=90=E7=BB=B4?= =?UTF-8?q?-=E5=B9=B3=E5=8F=B0=E6=97=A5=E5=BF=97=E3=80=91=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E8=A1=8C=E4=B8=BA-=E6=93=8D=E4=BD=9C=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=92=8C=E6=A8=A1=E6=9D=BF=E7=83=AD=E5=BA=A6-?= =?UTF-8?q?=E8=A2=AB=E8=AE=BF=E9=97=AE=E8=B5=84=E6=BA=90=EF=BC=8C=E5=9C=A8?= =?UTF-8?q?ie=E6=B5=8F=E8=A7=88=E5=99=A8=E4=B8=8B=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E7=82=B9=E5=87=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/platform/web/dom.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/core/platform/web/dom.js b/src/core/platform/web/dom.js index 6a2f3fb95..dba5e46a6 100644 --- a/src/core/platform/web/dom.js +++ b/src/core/platform/web/dom.js @@ -745,13 +745,14 @@ * 获取position:fixed相对定位的元素的clientRect */ getPositionRelativeContainingBlockRect: function (element) { - var positionRelativeElement = BI.DOM.getPositionRelativeContainingBlock(element); - var rect = positionRelativeElement.getBoundingClientRect(); + const positionRelativeElement = BI.DOM.getPositionRelativeContainingBlock(element); + const { top, right, bottom, left, width, height, x, y } = positionRelativeElement.getBoundingClientRect(); + return { - ...rect.toJSON(), - scaleX: rect.width / positionRelativeElement.offsetWidth, - scaleY: rect.height / positionRelativeElement.offsetHeight + top, right, bottom, left, width, height, x, y, + scaleX: width / positionRelativeElement.offsetWidth, + scaleY: height / positionRelativeElement.offsetHeight, }; }, }); From eabdc4aafa4a3292adcd5ae68831427ef16507dc Mon Sep 17 00:00:00 2001 From: Renzo Date: Thu, 12 Jan 2023 15:16:29 +0800 Subject: [PATCH 2/4] =?UTF-8?q?JSY-25995=20feat:=20TextValueCombo=20?= =?UTF-8?q?=E6=94=AF=E6=8C=81=20EVENT=5FBEFORE=5FPOPUPVIEW=20=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E7=9B=91=E5=90=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/combo/textvaluecombo/combo.textvalue.js | 2 ++ typescript/case/combo/combo.textvalue.ts | 1 + 2 files changed, 3 insertions(+) diff --git a/src/case/combo/textvaluecombo/combo.textvalue.js b/src/case/combo/textvaluecombo/combo.textvalue.js index 9dc088639..bc43fce64 100644 --- a/src/case/combo/textvaluecombo/combo.textvalue.js +++ b/src/case/combo/textvaluecombo/combo.textvalue.js @@ -130,6 +130,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, { eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW, action: () => { changeTag = false; + this.fireEvent(BI.TextValueCombo.EVENT_BEFORE_POPUPVIEW); } }, { eventName: BI.Combo.EVENT_AFTER_HIDEVIEW, @@ -209,5 +210,6 @@ BI.TextValueCombo = BI.inherit(BI.Widget, { this.combo.populate(items); } }); +BI.TextValueCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; BI.TextValueCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.shortcut("bi.text_value_combo", BI.TextValueCombo); diff --git a/typescript/case/combo/combo.textvalue.ts b/typescript/case/combo/combo.textvalue.ts index 128ec03b6..f2a080ba5 100644 --- a/typescript/case/combo/combo.textvalue.ts +++ b/typescript/case/combo/combo.textvalue.ts @@ -4,6 +4,7 @@ export declare class TextValueCombo extends Widget { static xtype: string; static EVENT_CHANGE: string; + static EVENT_BEFORE_POPUPVIEW: string; clear(): void; setText(text: string): void; From 4d3bafb78b1aba2ca7c556682968c2dfa84ba406 Mon Sep 17 00:00:00 2001 From: data Date: Thu, 12 Jan 2023 21:08:55 +0800 Subject: [PATCH 3/4] auto upgrade version to 2.0.20230112210841 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 241a140d7..f7069a394 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20230109200447", + "version": "2.0.20230112210841", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 4c47fa328d2292a9c8f1caeed70b6e0be0db540c Mon Sep 17 00:00:00 2001 From: data Date: Fri, 13 Jan 2023 12:17:05 +0800 Subject: [PATCH 4/4] auto upgrade version to 2.0.20230113121657 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f7069a394..dec8d418f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20230112210841", + "version": "2.0.20230113121657", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts",