From e7c4b1302c81d9184ac5c7b761b5baf4aec50c45 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Wed, 19 Feb 2020 16:21:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?BI-60558=20fix:=20IE11=E4=B8=8Btitle?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=A4=E6=AC=A1=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/numberinterval/numberinterval.js | 23 +------------------ .../singleeditor/single.editor.js | 5 ---- 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/src/widget/numberinterval/numberinterval.js b/src/widget/numberinterval/numberinterval.js index d0cf78f4cc..30af17b4d2 100644 --- a/src/widget/numberinterval/numberinterval.js +++ b/src/widget/numberinterval/numberinterval.js @@ -80,8 +80,6 @@ BI.NumberInterval = BI.inherit(BI.Single, { watermark: o.watermark, allowBlank: o.allowBlank, value: o.max, - level: "warning", - tipType: "success", title: function () { return self.bigEditor && self.bigEditor.getValue(); }, @@ -113,22 +111,6 @@ BI.NumberInterval = BI.inherit(BI.Single, { right: 5 }] }); - - // this.smallCombo = BI.createWidget({ - // type: "bi.number_interval_combo", - // cls: "number-interval-small-combo", - // height: o.height, - // value: o.closemin ? 1 : 0, - // offsetStyle: "left" - // }); - // - // this.bigCombo = BI.createWidget({ - // type: "bi.number_interval_combo", - // cls: "number-interval-big-combo", - // height: o.height, - // value: o.closemax ? 1 : 0, - // offsetStyle: "left" - // }); this.smallCombo = BI.createWidget({ type: "bi.icon_combo", cls: "number-interval-small-combo bi-border-top bi-border-bottom bi-border-right", @@ -301,10 +283,7 @@ BI.NumberInterval = BI.inherit(BI.Single, { }, _setTitle: function (v) { - var self = this; - self.bigEditor.setTitle(v); - self.smallEditor.setTitle(v); - self.label.setTitle(v); + this.label.setTitle(v); }, _setFocusEvent: function (w) { diff --git a/src/widget/numberinterval/singleeditor/single.editor.js b/src/widget/numberinterval/singleeditor/single.editor.js index 167f72e262..281993c163 100644 --- a/src/widget/numberinterval/singleeditor/single.editor.js +++ b/src/widget/numberinterval/singleeditor/single.editor.js @@ -19,7 +19,6 @@ BI.NumberIntervalSingleEidtor = BI.inherit(BI.Single, { watermark: o.watermark, allowBlank: o.allowBlank, value: o.value, - level: o.level, quitChecker: o.quitChecker, validationChecker: o.validationChecker, listeners: [{ @@ -70,10 +69,6 @@ BI.NumberIntervalSingleEidtor = BI.inherit(BI.Single, { return this.editor.getValue(); }, - setTitle: function (v) { - return this.editor.setTitle(v); - }, - setValue: function (v) { return this.editor.setValue(v); } From 5e9f3fbf98998d42e132ca1468e1eb674db4a0cd Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Wed, 19 Feb 2020 18:08:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?BI-60554=20fix:=20populate=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E5=80=99=E5=8F=AA=E9=9C=80=E8=A6=81=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E5=8F=B3=E4=B8=8A=E8=A7=92=E7=9A=84=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 | 2 +- src/widget/multiselect/multiselect.combo.nobar.js | 2 +- src/widget/multiselect/multiselect.insert.combo.js | 2 +- src/widget/multiselect/multiselect.insert.combo.nobar.js | 2 +- src/widget/multiselect/trigger/switcher.checkselected.js | 4 ++++ 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/widget/multiselect/multiselect.combo.js b/src/widget/multiselect/multiselect.combo.js index 07294aae5b..f9f94a9e4f 100644 --- a/src/widget/multiselect/multiselect.combo.js +++ b/src/widget/multiselect/multiselect.combo.js @@ -424,7 +424,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { populate: function () { this.combo.populate.apply(this.combo, arguments); - this.numberCounter.populate.apply(this.numberCounter, 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 35435a6250..79b6a1474f 100644 --- a/src/widget/multiselect/multiselect.combo.nobar.js +++ b/src/widget/multiselect/multiselect.combo.nobar.js @@ -420,7 +420,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, { populate: function () { this.combo.populate.apply(this.combo, arguments); - this.numberCounter.populate.apply(this.numberCounter, 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 a953ba0188..457c4fadf4 100644 --- a/src/widget/multiselect/multiselect.insert.combo.js +++ b/src/widget/multiselect/multiselect.insert.combo.js @@ -441,7 +441,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, { populate: function () { this.combo.populate.apply(this.combo, arguments); - this.numberCounter.populate.apply(this.numberCounter, 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 6f78f79d9d..0e39286b18 100644 --- a/src/widget/multiselect/multiselect.insert.combo.nobar.js +++ b/src/widget/multiselect/multiselect.insert.combo.nobar.js @@ -438,7 +438,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, { populate: function () { this.combo.populate.apply(this.combo, arguments); - this.numberCounter.populate.apply(this.numberCounter, arguments); + this.numberCounter.populateSwitcher.apply(this.numberCounter, arguments); } }); diff --git a/src/widget/multiselect/trigger/switcher.checkselected.js b/src/widget/multiselect/trigger/switcher.checkselected.js index 755619d1c8..4ca37a0f8c 100644 --- a/src/widget/multiselect/trigger/switcher.checkselected.js +++ b/src/widget/multiselect/trigger/switcher.checkselected.js @@ -96,6 +96,10 @@ BI.MultiSelectCheckSelectedSwitcher = BI.inherit(BI.Widget, { populate: function (items) { this.switcher.populate.apply(this.switcher, arguments); + }, + + populateSwitcher: function () { + this.button.populate.apply(this.switcher, arguments); } });