diff --git a/bi/slider.js b/bi/slider.js index f65d80897..4bcc063db 100644 --- a/bi/slider.js +++ b/bi/slider.js @@ -46,13 +46,14 @@ BI.SingleSlider = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.SingleSlider.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-single-slider bi-slider-track", - digit: 3 + digit: "" }); }, _init: function () { BI.SingleSlider.superclass._init.apply(this, arguments); var self = this, o = this.options; + var digitExist = (o.digit === "") ? false : true; var c = this._constant; this.enable = false; this.value = ""; @@ -81,7 +82,8 @@ BI.SingleSlider = BI.inherit(BI.Widget, { var significantPercent = BI.parseFloat(percent.toFixed(1));//直接对计算出来的百分数保留到小数点后一位,相当于分成了1000份。 self._setBlueTrack(significantPercent); self._setLabelPosition(significantPercent); - var v = self._getValueByPercent(significantPercent).toFixed(o.digit); + var v = self._getValueByPercent(significantPercent); + v = digitExist ? v.toFixed(o.digit) : v; self.label.setValue(v); self.value = v; self.fireEvent(BI.SingleSlider.EVENT_CHANGE); @@ -118,7 +120,8 @@ BI.SingleSlider = BI.inherit(BI.Widget, { } var significantPercent = BI.parseFloat(percent.toFixed(1)); self._setAllPosition(significantPercent); - var v = self._getValueByPercent(significantPercent).toFixed(o.digit); + var v = self._getValueByPercent(significantPercent); + v = digitExist ? v.toFixed(o.digit) : v; self.label.setValue(v); self.value = v; self.fireEvent(BI.SingleSlider.EVENT_CHANGE); @@ -140,11 +143,12 @@ BI.SingleSlider = BI.inherit(BI.Widget, { }); this.label.on(BI.SignEditor.EVENT_CONFIRM, function () { var v = BI.parseFloat(this.getValue()); - this.setValue(v.toFixed(o.digit)); - self.value = v.toFixed(o.digit); var percent = self._getPercentByValue(v); var significantPercent = BI.parseFloat(percent.toFixed(1)); self._setAllPosition(significantPercent); + v = digitExist ? v.toFixed(o.digit) : v; + this.setValue(v); + self.value = v; self.fireEvent(BI.SingleSlider.EVENT_CHANGE); }); this._setVisible(false); @@ -266,8 +270,9 @@ BI.SingleSlider = BI.inherit(BI.Widget, { setValue: function (v) { var o = this.options; + var digitExist = (o.digit === "") ? false : true; var value = BI.parseFloat(v); - value = value.toFixed(o.digit); + value = digitExist ? value.toFixed(o.digit) : value; if ((!isNaN(value))) { if (this._checkValidation(value)) { this.value = value; diff --git a/dist/slider.js b/dist/slider.js index f65d80897..4bcc063db 100644 --- a/dist/slider.js +++ b/dist/slider.js @@ -46,13 +46,14 @@ BI.SingleSlider = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.SingleSlider.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-single-slider bi-slider-track", - digit: 3 + digit: "" }); }, _init: function () { BI.SingleSlider.superclass._init.apply(this, arguments); var self = this, o = this.options; + var digitExist = (o.digit === "") ? false : true; var c = this._constant; this.enable = false; this.value = ""; @@ -81,7 +82,8 @@ BI.SingleSlider = BI.inherit(BI.Widget, { var significantPercent = BI.parseFloat(percent.toFixed(1));//直接对计算出来的百分数保留到小数点后一位,相当于分成了1000份。 self._setBlueTrack(significantPercent); self._setLabelPosition(significantPercent); - var v = self._getValueByPercent(significantPercent).toFixed(o.digit); + var v = self._getValueByPercent(significantPercent); + v = digitExist ? v.toFixed(o.digit) : v; self.label.setValue(v); self.value = v; self.fireEvent(BI.SingleSlider.EVENT_CHANGE); @@ -118,7 +120,8 @@ BI.SingleSlider = BI.inherit(BI.Widget, { } var significantPercent = BI.parseFloat(percent.toFixed(1)); self._setAllPosition(significantPercent); - var v = self._getValueByPercent(significantPercent).toFixed(o.digit); + var v = self._getValueByPercent(significantPercent); + v = digitExist ? v.toFixed(o.digit) : v; self.label.setValue(v); self.value = v; self.fireEvent(BI.SingleSlider.EVENT_CHANGE); @@ -140,11 +143,12 @@ BI.SingleSlider = BI.inherit(BI.Widget, { }); this.label.on(BI.SignEditor.EVENT_CONFIRM, function () { var v = BI.parseFloat(this.getValue()); - this.setValue(v.toFixed(o.digit)); - self.value = v.toFixed(o.digit); var percent = self._getPercentByValue(v); var significantPercent = BI.parseFloat(percent.toFixed(1)); self._setAllPosition(significantPercent); + v = digitExist ? v.toFixed(o.digit) : v; + this.setValue(v); + self.value = v; self.fireEvent(BI.SingleSlider.EVENT_CHANGE); }); this._setVisible(false); @@ -266,8 +270,9 @@ BI.SingleSlider = BI.inherit(BI.Widget, { setValue: function (v) { var o = this.options; + var digitExist = (o.digit === "") ? false : true; var value = BI.parseFloat(v); - value = value.toFixed(o.digit); + value = digitExist ? value.toFixed(o.digit) : value; if ((!isNaN(value))) { if (this._checkValidation(value)) { this.value = value; diff --git a/src/addons/slider/singleslider/singleslider.js b/src/addons/slider/singleslider/singleslider.js index 5547135e4..8dfbc19de 100644 --- a/src/addons/slider/singleslider/singleslider.js +++ b/src/addons/slider/singleslider/singleslider.js @@ -14,13 +14,14 @@ BI.SingleSlider = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.SingleSlider.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-single-slider bi-slider-track", - digit: 3 + digit: "" }); }, _init: function () { BI.SingleSlider.superclass._init.apply(this, arguments); var self = this, o = this.options; + var digitExist = (o.digit === "") ? false : true; var c = this._constant; this.enable = false; this.value = ""; @@ -49,7 +50,8 @@ BI.SingleSlider = BI.inherit(BI.Widget, { var significantPercent = BI.parseFloat(percent.toFixed(1));//直接对计算出来的百分数保留到小数点后一位,相当于分成了1000份。 self._setBlueTrack(significantPercent); self._setLabelPosition(significantPercent); - var v = self._getValueByPercent(significantPercent).toFixed(o.digit); + var v = self._getValueByPercent(significantPercent); + v = digitExist ? v.toFixed(o.digit) : v; self.label.setValue(v); self.value = v; self.fireEvent(BI.SingleSlider.EVENT_CHANGE); @@ -86,7 +88,8 @@ BI.SingleSlider = BI.inherit(BI.Widget, { } var significantPercent = BI.parseFloat(percent.toFixed(1)); self._setAllPosition(significantPercent); - var v = self._getValueByPercent(significantPercent).toFixed(o.digit); + var v = self._getValueByPercent(significantPercent); + v = digitExist ? v.toFixed(o.digit) : v; self.label.setValue(v); self.value = v; self.fireEvent(BI.SingleSlider.EVENT_CHANGE); @@ -108,11 +111,12 @@ BI.SingleSlider = BI.inherit(BI.Widget, { }); this.label.on(BI.SignEditor.EVENT_CONFIRM, function () { var v = BI.parseFloat(this.getValue()); - this.setValue(v.toFixed(o.digit)); - self.value = v.toFixed(o.digit); var percent = self._getPercentByValue(v); var significantPercent = BI.parseFloat(percent.toFixed(1)); self._setAllPosition(significantPercent); + v = digitExist ? v.toFixed(o.digit) : v; + this.setValue(v); + self.value = v; self.fireEvent(BI.SingleSlider.EVENT_CHANGE); }); this._setVisible(false); @@ -234,8 +238,9 @@ BI.SingleSlider = BI.inherit(BI.Widget, { setValue: function (v) { var o = this.options; + var digitExist = (o.digit === "") ? false : true; var value = BI.parseFloat(v); - value = value.toFixed(o.digit); + value = digitExist ? value.toFixed(o.digit) : value; if ((!isNaN(value))) { if (this._checkValidation(value)) { this.value = value;