From 8d5f650a1cadf5810fab8dad81ed55b49f15fc95 Mon Sep 17 00:00:00 2001 From: Claire <1119518763@qq.com> Date: Fri, 15 Apr 2022 17:32:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?BI-99093=20fix:bubbleCombo=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0combo=E7=9A=84adjustW=E3=80=81H=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/combo/bubblecombo/combo.bubble.js | 8 ++++++++ typescript/base/combination/combo.ts | 2 ++ typescript/case/combo/bubblecombo/combo.bubble.ts | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/src/case/combo/bubblecombo/combo.bubble.js b/src/case/combo/bubblecombo/combo.bubble.js index e143efab0..2709295d9 100644 --- a/src/case/combo/bubblecombo/combo.bubble.js +++ b/src/case/combo/bubblecombo/combo.bubble.js @@ -99,6 +99,14 @@ BI.BubbleCombo = BI.inherit(BI.Widget, { isViewVisible: function () { return this.combo.isViewVisible(); + }, + + adjustWidth: function () { + this.combo.adjustWidth(); + }, + + adjustHeight: function () { + this.combo.adjustHeight(); } }); diff --git a/typescript/base/combination/combo.ts b/typescript/base/combination/combo.ts index 249e7e6f2..52e70e477 100644 --- a/typescript/base/combination/combo.ts +++ b/typescript/base/combination/combo.ts @@ -59,6 +59,8 @@ export declare class Combo extends Widget { getPopupPosition(): any; + adjustHeight(e?:MouseEvent): void; + adjustHeight(e?: MouseEvent): void; toggle(): void; diff --git a/typescript/case/combo/bubblecombo/combo.bubble.ts b/typescript/case/combo/bubblecombo/combo.bubble.ts index cd50d722b..982d48457 100644 --- a/typescript/case/combo/bubblecombo/combo.bubble.ts +++ b/typescript/case/combo/bubblecombo/combo.bubble.ts @@ -17,4 +17,8 @@ export declare class BubbleCombo extends Widget { showView(): void; isViewVisible(): boolean; + + adjustHeight(e?:MouseEvent): void; + + adjustHeight(e?: MouseEvent): void; } From 4225a58e8c673636eccdba9a6849437ddea8c466 Mon Sep 17 00:00:00 2001 From: Claire <1119518763@qq.com> Date: Fri, 15 Apr 2022 18:06:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?BI-104252=20fix:bubbleCombo=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0combo=E7=9A=84adjustW=E3=80=81H=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- typescript/base/combination/combo.ts | 2 +- typescript/case/combo/bubblecombo/combo.bubble.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/typescript/base/combination/combo.ts b/typescript/base/combination/combo.ts index 52e70e477..c7d511a2b 100644 --- a/typescript/base/combination/combo.ts +++ b/typescript/base/combination/combo.ts @@ -59,7 +59,7 @@ export declare class Combo extends Widget { getPopupPosition(): any; - adjustHeight(e?:MouseEvent): void; + adjustWidth(e?:MouseEvent): void; adjustHeight(e?: MouseEvent): void; diff --git a/typescript/case/combo/bubblecombo/combo.bubble.ts b/typescript/case/combo/bubblecombo/combo.bubble.ts index 982d48457..d5366233f 100644 --- a/typescript/case/combo/bubblecombo/combo.bubble.ts +++ b/typescript/case/combo/bubblecombo/combo.bubble.ts @@ -18,7 +18,7 @@ export declare class BubbleCombo extends Widget { isViewVisible(): boolean; - adjustHeight(e?:MouseEvent): void; + adjustWidth(e?:MouseEvent): void; adjustHeight(e?: MouseEvent): void; }