From 7530a01ebcb7afefcf0ca2d222da5359900f2498 Mon Sep 17 00:00:00 2001 From: "Oliver.Ke" Date: Thu, 19 May 2022 19:28:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?BI-105744=20fix:=20DownListCombo=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0Combo=E7=9A=84adjustWidth=E5=92=8CadjustHeight?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/downlist/combo.downlist.js | 8 +++++++- typescript/widget/downlist/combo.downlist.ts | 6 +++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/widget/downlist/combo.downlist.js b/src/widget/downlist/combo.downlist.js index 80b414f73..29c4398f9 100644 --- a/src/widget/downlist/combo.downlist.js +++ b/src/widget/downlist/combo.downlist.js @@ -85,10 +85,16 @@ BI.DownListCombo = BI.inherit(BI.Widget, { }, getValue: function () { return this.popupview.getValue(); + }, + adjustWidth: function () { + this.downlistcombo.adjustWidth(); + }, + adjustHeight: function () { + this.downlistcombo.adjustHeight(); } }); BI.DownListCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.DownListCombo.EVENT_SON_VALUE_CHANGE = "EVENT_SON_VALUE_CHANGE"; BI.DownListCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; -BI.shortcut("bi.down_list_combo", BI.DownListCombo); \ No newline at end of file +BI.shortcut("bi.down_list_combo", BI.DownListCombo); diff --git a/typescript/widget/downlist/combo.downlist.ts b/typescript/widget/downlist/combo.downlist.ts index e587df6d8..6cc88db52 100644 --- a/typescript/widget/downlist/combo.downlist.ts +++ b/typescript/widget/downlist/combo.downlist.ts @@ -5,10 +5,14 @@ export declare class DownListCombo extends Widget { static EVENT_CHANGE: string; static EVENT_SON_VALUE_CHANGE: string; static EVENT_BEFORE_POPUPVIEW: string; - + hideView: () => void; showView: (e?: any) => void; populate: (items?: any) => void; + + adjustWidth: (e?: MouseEvent) => void; + + adjustHeight: (e?: MouseEvent) => void; } From 67cbd9cb48e01011f8294ce55934b14f1dc29372 Mon Sep 17 00:00:00 2001 From: "Oliver.Ke" Date: Thu, 19 May 2022 19:49:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?BI-105744=20fix:=20=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/downlist/combo.downlist.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/widget/downlist/combo.downlist.js b/src/widget/downlist/combo.downlist.js index 29c4398f9..b32fab79f 100644 --- a/src/widget/downlist/combo.downlist.js +++ b/src/widget/downlist/combo.downlist.js @@ -83,12 +83,15 @@ BI.DownListCombo = BI.inherit(BI.Widget, { setValue: function (v) { this.popupview.setValue(v); }, + getValue: function () { return this.popupview.getValue(); }, + adjustWidth: function () { this.downlistcombo.adjustWidth(); }, + adjustHeight: function () { this.downlistcombo.adjustHeight(); }