From 6c78bf6846b6e81a956e5df5f459307f2e819009 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Fri, 15 May 2020 12:45:40 +0800 Subject: [PATCH] =?UTF-8?q?BI-65448=20fix:=20=E7=82=B9=E5=87=BB=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E5=B7=B2=E9=80=89=E4=B8=8D=E9=9C=80=E8=A6=81=E5=88=B7?= =?UTF-8?q?=E6=96=B0=E8=AE=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/multiselect/multiselect.combo.js | 8 ++++++-- src/widget/multiselect/multiselect.combo.nobar.js | 8 ++++++-- src/widget/multiselect/multiselect.insert.combo.js | 8 ++++++-- src/widget/multiselect/multiselect.insert.combo.nobar.js | 8 ++++++-- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/widget/multiselect/multiselect.combo.js b/src/widget/multiselect/multiselect.combo.js index 8e1f8b2ef..c591fcef4 100644 --- a/src/widget/multiselect/multiselect.combo.js +++ b/src/widget/multiselect/multiselect.combo.js @@ -189,7 +189,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.setValue(self.storeValue); BI.nextTick(function () { - self.populate(); + self._populate(); }); }); // 当退出的时候如果还在处理请求,则等请求结束后再对外发确定事件 @@ -421,6 +421,10 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { this.popup.setStartValue(value); }, + _populate: function () { + this.combo.populate.apply(this.combo, arguments); + }, + setValue: function (v) { this.storeValue = v || {}; this._assertValue(this.storeValue); @@ -433,7 +437,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { }, populate: function () { - this.combo.populate.apply(this.combo, arguments); + this._populate.apply(this, arguments); this.numberCounter.populateSwitcher.apply(this.numberCounter, arguments); } }); diff --git a/src/widget/multiselect/multiselect.combo.nobar.js b/src/widget/multiselect/multiselect.combo.nobar.js index fbc70a66a..41fb79faf 100644 --- a/src/widget/multiselect/multiselect.combo.nobar.js +++ b/src/widget/multiselect/multiselect.combo.nobar.js @@ -178,7 +178,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.setValue(self.storeValue); BI.nextTick(function () { - self.populate(); + self._populate(); }); }); // 当退出的时候如果还在处理请求,则等请求结束后再对外发确定事件 @@ -414,6 +414,10 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, { this.popup.setStartValue(value); }, + _populate: function () { + this.combo.populate.apply(this.combo, arguments); + }, + setValue: function (v) { this.storeValue = { type: BI.Selection.Multi, @@ -428,7 +432,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, { }, populate: function () { - this.combo.populate.apply(this.combo, arguments); + this._populate.apply(this, arguments); this.numberCounter.populateSwitcher.apply(this.numberCounter, arguments); } }); diff --git a/src/widget/multiselect/multiselect.insert.combo.js b/src/widget/multiselect/multiselect.insert.combo.js index a08f590ad..eb54fc2c8 100644 --- a/src/widget/multiselect/multiselect.insert.combo.js +++ b/src/widget/multiselect/multiselect.insert.combo.js @@ -185,7 +185,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.setValue(self.storeValue); BI.nextTick(function () { - self.populate(); + self._populate(); }); }); // 当退出的时候如果还在处理请求,则等请求结束后再对外发确定事件 @@ -439,6 +439,10 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, { this.popup.setStartValue(value); }, + _populate: function () { + this.combo.populate.apply(this.combo, arguments); + }, + setValue: function (v) { this.storeValue = v || {}; this._assertValue(this.storeValue); @@ -451,7 +455,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, { }, populate: function () { - this.combo.populate.apply(this.combo, arguments); + this._populate.apply(this, arguments); this.numberCounter.populateSwitcher.apply(this.numberCounter, arguments); } }); diff --git a/src/widget/multiselect/multiselect.insert.combo.nobar.js b/src/widget/multiselect/multiselect.insert.combo.nobar.js index 52fbbb4ff..ce1522820 100644 --- a/src/widget/multiselect/multiselect.insert.combo.nobar.js +++ b/src/widget/multiselect/multiselect.insert.combo.nobar.js @@ -180,7 +180,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.setValue(self.storeValue); BI.nextTick(function () { - self.populate(); + self._populate(); }); }); // 当退出的时候如果还在处理请求,则等请求结束后再对外发确定事件 @@ -434,6 +434,10 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, { this.popup.setStartValue(value); }, + _populate: function () { + this.combo.populate.apply(this.combo, arguments); + }, + setValue: function (v) { this.storeValue = { type: BI.Selection.Multi, @@ -448,7 +452,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, { }, populate: function () { - this.combo.populate.apply(this.combo, arguments); + this._populate.apply(this, arguments); this.numberCounter.populateSwitcher.apply(this.numberCounter, arguments); } });