From dbab202a202390c9a1c43b4324ae08c2c312afc4 Mon Sep 17 00:00:00 2001 From: guy Date: Sat, 22 Jan 2022 19:43:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feature:=20=E5=B0=8F=E4=B8=89=E8=A7=92?= =?UTF-8?q?=E6=8D=A2=E4=B8=80=E7=A7=8D=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/combo/bubblecombo/popup.bubble.js | 4 ++-- src/widget/multiselect/multiselect.popup.view.js | 6 +++++- src/widget/multiselect/multiselect.popup.view.nobar.js | 6 +++++- src/widget/multitree/multi.tree.popup.js | 4 ++++ .../multitextvalue.popup.view.search.js | 6 +++++- src/widget/singleselect/singleselect.popup.view.js | 8 ++++++-- 6 files changed, 27 insertions(+), 7 deletions(-) diff --git a/src/case/combo/bubblecombo/popup.bubble.js b/src/case/combo/bubblecombo/popup.bubble.js index d7f546f7d..92311b725 100644 --- a/src/case/combo/bubblecombo/popup.bubble.js +++ b/src/case/combo/bubblecombo/popup.bubble.js @@ -158,8 +158,8 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, { }; }, - setDirection: function (direction, size) { - this.popup.setDirection(direction, size); + setDirection: function (direction, position) { + this.popup.setDirection(direction, position); }, populate: function (v) { this.text.setText(v || this.options.text); diff --git a/src/widget/multiselect/multiselect.popup.view.js b/src/widget/multiselect/multiselect.popup.view.js index 53e6209c4..cefe9f0b2 100644 --- a/src/widget/multiselect/multiselect.popup.view.js +++ b/src/widget/multiselect/multiselect.popup.view.js @@ -84,7 +84,11 @@ BI.MultiSelectPopupView = BI.inherit(BI.Widget, { resetWidth: function (w) { this.popupView.resetWidth(w); - } + }, + + setDirection: function (direction, position) { + this.popupView.setDirection(direction, position); + }, }); BI.MultiSelectPopupView.EVENT_CHANGE = "EVENT_CHANGE"; diff --git a/src/widget/multiselect/multiselect.popup.view.nobar.js b/src/widget/multiselect/multiselect.popup.view.nobar.js index 26325a94e..9132ae5ee 100644 --- a/src/widget/multiselect/multiselect.popup.view.nobar.js +++ b/src/widget/multiselect/multiselect.popup.view.nobar.js @@ -80,7 +80,11 @@ BI.MultiSelectNoBarPopupView = BI.inherit(BI.Widget, { resetWidth: function (w) { this.popupView.resetWidth(w); - } + }, + + setDirection: function (direction, position) { + this.popupView.setDirection(direction, position); + }, }); BI.MultiSelectNoBarPopupView.EVENT_CHANGE = "EVENT_CHANGE"; diff --git a/src/widget/multitree/multi.tree.popup.js b/src/widget/multitree/multi.tree.popup.js index 3032e34cf..970c76cc6 100644 --- a/src/widget/multitree/multi.tree.popup.js +++ b/src/widget/multitree/multi.tree.popup.js @@ -84,6 +84,10 @@ BI.MultiTreePopup = BI.inherit(BI.Pane, { return this.tree.hasChecked(); }, + setDirection: function (direction, position) { + this.popupView.setDirection(direction, position); + }, + resetHeight: function (h) { this.popupView.resetHeight(h); }, diff --git a/src/widget/searchmultitextvaluecombo/multitextvalue.popup.view.search.js b/src/widget/searchmultitextvaluecombo/multitextvalue.popup.view.search.js index f1e6d7231..cb8027f0c 100644 --- a/src/widget/searchmultitextvaluecombo/multitextvalue.popup.view.search.js +++ b/src/widget/searchmultitextvaluecombo/multitextvalue.popup.view.search.js @@ -77,7 +77,11 @@ BI.SearchMultiSelectPopupView = BI.inherit(BI.Widget, { resetWidth: function (w) { this.popupView.resetWidth(w); - } + }, + + setDirection: function (direction, position) { + this.popupView.setDirection(direction, position); + }, }); BI.SearchMultiSelectPopupView.EVENT_CHANGE = "EVENT_CHANGE"; diff --git a/src/widget/singleselect/singleselect.popup.view.js b/src/widget/singleselect/singleselect.popup.view.js index 8c22afbd3..4e33c004f 100644 --- a/src/widget/singleselect/singleselect.popup.view.js +++ b/src/widget/singleselect/singleselect.popup.view.js @@ -69,10 +69,14 @@ BI.SingleSelectPopupView = BI.inherit(BI.Widget, { resetWidth: function (w) { this.popupView.resetWidth(w); - } + }, + + setDirection: function (direction, position) { + this.popupView.setDirection(direction, position); + }, }); BI.SingleSelectPopupView.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.single_select_popup_view", BI.SingleSelectPopupView); \ No newline at end of file +BI.shortcut("bi.single_select_popup_view", BI.SingleSelectPopupView); From 6a510524e63a1eaecc67fac25873ff6e87f9dd36 Mon Sep 17 00:00:00 2001 From: guy Date: Sat, 22 Jan 2022 19:44:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feature:=20=E5=B0=8F=E4=B8=89=E8=A7=92?= =?UTF-8?q?=E6=8D=A2=E4=B8=80=E7=A7=8D=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/combination/combo.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/base/combination/combo.js b/src/base/combination/combo.js index c7c74ce44..ed66ac0f7 100644 --- a/src/base/combination/combo.js +++ b/src/base/combination/combo.js @@ -282,7 +282,7 @@ } var width = this.combo.element.outerWidth(); var height = this.combo.element.outerHeight(); - this.popupView.setDirection(p.dir, { + this.popupView.setDirection && this.popupView.setDirection(p.dir, { width: width, height: height, offsetStyle: o.offsetStyle,