From 128c819e8392bca5cd3c6f9eb0795a24395eac8f Mon Sep 17 00:00:00 2001 From: zsmj Date: Wed, 26 Oct 2022 15:49:50 +0800 Subject: [PATCH] =?UTF-8?q?BI-116019=20fix:=20=E3=80=906.0.4=E5=86=92?= =?UTF-8?q?=E7=83=9F=E3=80=91=E5=8C=BA=E9=97=B4=E6=BB=91=E5=9D=97=E4=B8=8D?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=AD=97=E6=AE=B5=EF=BC=8C=E9=BC=A0=E6=A0=87?= =?UTF-8?q?=E6=82=AC=E6=B5=AE=E7=BB=84=E4=BB=B6=E5=BA=94=E8=AF=A5=E4=BC=9A?= =?UTF-8?q?=E6=9C=89=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/js/config/widget.js | 4 ++-- src/widget/intervalslider/intervalslider.js | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/demo/js/config/widget.js b/demo/js/config/widget.js index d2e1b1d5b..e48282492 100644 --- a/demo/js/config/widget.js +++ b/demo/js/config/widget.js @@ -192,7 +192,7 @@ Demo.WIDGET_CONFIG = [{ value: "demo.number_interval" }, { id: 420, - text: "滚动sliders", + text: "数值滑块sliders", value: "demo.slider" }, { pId: 4, @@ -202,4 +202,4 @@ Demo.WIDGET_CONFIG = [{ pId: 414, text: "bi.collapse", value: "demo.collapse" -}]; \ No newline at end of file +}]; diff --git a/src/widget/intervalslider/intervalslider.js b/src/widget/intervalslider/intervalslider.js index 71351dd71..59b1e1676 100644 --- a/src/widget/intervalslider/intervalslider.js +++ b/src/widget/intervalslider/intervalslider.js @@ -26,7 +26,7 @@ BI.IntervalSlider = BI.inherit(BI.Single, { beforeMount: function () { const { value, min, max } = this.options; - this.setMinAndMax({ + this._setMinAndMax({ min, max, }); @@ -260,12 +260,12 @@ BI.IntervalSlider = BI.inherit(BI.Single, { items: [ { el: this.sliderOne, - top: 1, + top: 0, bottom: 0, left: 0 }, { el: this.sliderTwo, - top: 1, + top: 0, bottom: 0, left: "100%" } @@ -487,22 +487,23 @@ BI.IntervalSlider = BI.inherit(BI.Single, { }, - setMinAndMax: function (v) { + _setMinAndMax: function (v) { var minNumber = BI.parseFloat(v.min); var maxNumber = BI.parseFloat(v.max); - if ((!isNaN(minNumber)) && (!isNaN(maxNumber)) && (maxNumber >= minNumber )) { + if ((!isNaN(minNumber)) && (!isNaN(maxNumber)) && (maxNumber >= minNumber)) { this.min = minNumber; this.max = maxNumber; this.valueOne = minNumber; this.valueTwo = maxNumber; this.precision = this._getPrecision(); - this.setEnable(true); - } - if (maxNumber === minNumber) { - this.setEnable(false); } }, + setMinAndMax: function (v) { + this._setMinAndMax(v); + this.setEnable(v.min <= v.max); + }, + setValue: function (v) { var o = this.options; var valueOne = BI.parseFloat(v.min);