From a3ba721f2ffdd9aa8226913c2fb0a970cb50ccbd Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Fri, 23 Jul 2021 17:38:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E8=B0=83?= =?UTF-8?q?=E6=95=B4CLICK=5FITEM=E4=BA=8B=E4=BB=B6=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/multiselect/multiselect.combo.js | 5 +++-- src/widget/multiselect/multiselect.insert.combo.js | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/widget/multiselect/multiselect.combo.js b/src/widget/multiselect/multiselect.combo.js index c61770dcc..c0f63827b 100644 --- a/src/widget/multiselect/multiselect.combo.js +++ b/src/widget/multiselect/multiselect.combo.js @@ -100,14 +100,15 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { if (obj instanceof BI.MultiSelectBar) { self._joinAll(this.getValue(), function () { assertShowValue(); + self.fireEvent(BI.MultiSelectCombo.EVENT_CLICK_ITEM); }); } else { self._join(this.getValue(), function () { assertShowValue(); + self.fireEvent(BI.MultiSelectCombo.EVENT_CLICK_ITEM); }); } self._dataChange = true; - self.fireEvent(BI.MultiSelectCombo.EVENT_CLICK_ITEM); }); this.trigger.on(BI.MultiSelectTrigger.EVENT_BEFORE_COUNTER_POPUPVIEW, function () { // counter的值随点击项的改变而改变, 点击counter的时候不需要setValue(counter会请求刷新计数) @@ -412,7 +413,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { }); change && (this.storeValue.value = BI.values(map)); self._adjust(callback); - + return; } this._joinAll(res, callback); diff --git a/src/widget/multiselect/multiselect.insert.combo.js b/src/widget/multiselect/multiselect.insert.combo.js index 4a84e5123..6728ca81d 100644 --- a/src/widget/multiselect/multiselect.insert.combo.js +++ b/src/widget/multiselect/multiselect.insert.combo.js @@ -101,14 +101,15 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, { if (obj instanceof BI.MultiSelectBar) { self._joinAll(this.getValue(), function () { assertShowValue(); + self.fireEvent(BI.MultiSelectInsertCombo.EVENT_CLICK_ITEM); }); } else { self._join(this.getValue(), function () { assertShowValue(); + self.fireEvent(BI.MultiSelectInsertCombo.EVENT_CLICK_ITEM); }); } self._dataChange = true; - self.fireEvent(BI.MultiSelectInsertCombo.EVENT_CLICK_ITEM); }); this.trigger.on(BI.MultiSelectInsertTrigger.EVENT_BEFORE_COUNTER_POPUPVIEW, function () { // counter的值随点击项的改变而改变, 点击counter的时候不需要setValue(counter会请求刷新计数) From 583c0670b74c114cfb0a328a5006e72bd7bb30b2 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Fri, 23 Jul 2021 17:39:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/multiselect/multiselect.combo.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/widget/multiselect/multiselect.combo.js b/src/widget/multiselect/multiselect.combo.js index c0f63827b..2d023f2f2 100644 --- a/src/widget/multiselect/multiselect.combo.js +++ b/src/widget/multiselect/multiselect.combo.js @@ -414,7 +414,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { change && (this.storeValue.value = BI.values(map)); self._adjust(callback); -return; + return; } this._joinAll(res, callback); },