From 71adf0adcdf2f3f21047c050526ec301be8cd5ed Mon Sep 17 00:00:00 2001 From: Tangjinxia <1119518763@qq.com> Date: Mon, 14 Sep 2020 18:09:23 +0800 Subject: [PATCH 1/4] =?UTF-8?q?BI-59128=20style:=E5=8D=95=E5=80=BC?= =?UTF-8?q?=E6=BB=91=E5=9D=97=E9=94=99=E8=AF=AF=E8=AF=AD=E5=8F=A5=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E6=96=87=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/singleslider/singleslider.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/widget/singleslider/singleslider.js b/src/widget/singleslider/singleslider.js index eb0a700c7..df1c958d6 100644 --- a/src/widget/singleslider/singleslider.js +++ b/src/widget/singleslider/singleslider.js @@ -16,7 +16,8 @@ BI.SingleSlider = BI.inherit(BI.Single, { props: { baseCls: "bi-single-slider bi-slider-track", digit: false, - unit: "" + unit: "", + errorText: "" }, render: function () { @@ -315,14 +316,18 @@ BI.SingleSlider = BI.inherit(BI.Single, { this.min = 0; this.max = 0; this._setBlueTrack(0); - }, populate: function () { + var o = this.options; if (!isNaN(this.min) && !isNaN(this.max)) { this._setVisible(true); this.enable = true; - this.label.setErrorText(BI.i18nText("BI-Basic_Please_Enter_Number_Between", this.min, this.max)); + if (BI.isNotEmptyString(o.errorText)) { + this.label.setErrorText(o.errorText); + } else { + this.label.setErrorText(BI.i18nText("BI-Basic_Please_Enter_Number_Between", this.min, this.max)); + } if (BI.isNumeric(this.value) || BI.isNotEmptyString(this.value)) { this.label.setValue(this.value); this._setAllPosition(this._getPercentByValue(this.value)); From 6e37d1533b8e143ef320ffa62b949dfaa1b6c824 Mon Sep 17 00:00:00 2001 From: Tangjinxia <1119518763@qq.com> Date: Mon, 14 Sep 2020 18:10:40 +0800 Subject: [PATCH 2/4] =?UTF-8?q?BI-72808=20fix:IE11=EF=BC=8C=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E7=BB=84=E4=BB=B6=E4=B8=8B=E6=8B=89=E9=80=89=E9=A1=B9?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E8=A2=AB=E5=88=86=E7=BB=84=E8=A1=A8=E9=81=AE?= =?UTF-8?q?=E6=8C=A1=EF=BC=8C=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=B8=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/less/widget/downlist/combo.downlist.less | 6 +++++- src/widget/downlist/combo.downlist.js | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/less/widget/downlist/combo.downlist.less b/src/less/widget/downlist/combo.downlist.less index c8b5e3112..59878495b 100644 --- a/src/less/widget/downlist/combo.downlist.less +++ b/src/less/widget/downlist/combo.downlist.less @@ -1,5 +1,9 @@ @import "../../index"; .bi-down-list-combo { - + &.hack { + .bi-popup-view { + position: -ms-page !important; + } + } } \ No newline at end of file diff --git a/src/widget/downlist/combo.downlist.js b/src/widget/downlist/combo.downlist.js index 24c87c336..a998064c7 100644 --- a/src/widget/downlist/combo.downlist.js +++ b/src/widget/downlist/combo.downlist.js @@ -4,7 +4,7 @@ BI.DownListCombo = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.DownListCombo.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-down-list-combo", + baseCls: "bi-down-list-combo" + (BI.isIE() ? " hack" : ""), height: 24, items: [], adjustLength: 0, From 0d13fee9a13b6710e8161e72cf31d31b9979153f Mon Sep 17 00:00:00 2001 From: Tangjinxia <1119518763@qq.com> Date: Tue, 15 Sep 2020 10:54:27 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=20BI-72808=20fix:IE11=E4=B8=8Bpopup?= =?UTF-8?q?=E7=94=B1=E4=BA=8Efixed=E8=A2=AB=E9=81=AE=E6=8C=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/less/base/view/popupview.less | 6 ++++++ src/less/widget/downlist/combo.downlist.less | 6 +----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/less/base/view/popupview.less b/src/less/base/view/popupview.less index 7d55fab96..810293c4b 100644 --- a/src/less/base/view/popupview.less +++ b/src/less/base/view/popupview.less @@ -43,3 +43,9 @@ .box-shadow(0 1px 5px 0, fade(@background-color-normal-theme-dark, 80)); } } + +.hack { + .bi-popup-view { + position: -ms-page !important; + } +} \ No newline at end of file diff --git a/src/less/widget/downlist/combo.downlist.less b/src/less/widget/downlist/combo.downlist.less index 59878495b..c8b5e3112 100644 --- a/src/less/widget/downlist/combo.downlist.less +++ b/src/less/widget/downlist/combo.downlist.less @@ -1,9 +1,5 @@ @import "../../index"; .bi-down-list-combo { - &.hack { - .bi-popup-view { - position: -ms-page !important; - } - } + } \ No newline at end of file From ca740ca88af864b32db1f7481b4562a0e1a7eff2 Mon Sep 17 00:00:00 2001 From: Tangjinxia <1119518763@qq.com> Date: Tue, 15 Sep 2020 15:33:35 +0800 Subject: [PATCH 4/4] =?UTF-8?q?BI-59128=20style:=E4=B8=8D=E5=85=81?= =?UTF-8?q?=E8=AE=B8=E5=B0=8F=E6=95=B0=E6=97=B6=E4=BF=AE=E6=94=B9=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E6=8F=90=E7=A4=BA=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/singleslider/singleslider.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/widget/singleslider/singleslider.js b/src/widget/singleslider/singleslider.js index df1c958d6..12aba0196 100644 --- a/src/widget/singleslider/singleslider.js +++ b/src/widget/singleslider/singleslider.js @@ -16,8 +16,7 @@ BI.SingleSlider = BI.inherit(BI.Single, { props: { baseCls: "bi-single-slider bi-slider-track", digit: false, - unit: "", - errorText: "" + unit: "" }, render: function () { @@ -323,11 +322,12 @@ BI.SingleSlider = BI.inherit(BI.Single, { if (!isNaN(this.min) && !isNaN(this.max)) { this._setVisible(true); this.enable = true; - if (BI.isNotEmptyString(o.errorText)) { - this.label.setErrorText(o.errorText); - } else { + if (o.digit) { this.label.setErrorText(BI.i18nText("BI-Basic_Please_Enter_Number_Between", this.min, this.max)); + } else { + this.label.setErrorText(BI.i18nText("BI-Basic_Please_Enter_Integer_Number_Between", this.min, this.max)); } + if (BI.isNumeric(this.value) || BI.isNotEmptyString(this.value)) { this.label.setValue(this.value); this._setAllPosition(this._getPercentByValue(this.value));