Browse Source

Merge pull request #238914 in DEC/fineui from master to feature/x

* commit '0f89570ec5ff2f73ffb75f9e70f608ccaf4c13c1':
  auto upgrade version to 2.0.20230518101454
  JSY-29426 fix:绑定空值时与刷新后展示不同
master
superman 2 years ago
parent
commit
af0081d73f
  1. 2
      package.json
  2. 12
      src/widget/intervalslider/intervalslider.js

2
package.json

@ -1,6 +1,6 @@
{ {
"name": "fineui", "name": "fineui",
"version": "2.0.20230515174710", "version": "2.0.20230518101454",
"description": "fineui", "description": "fineui",
"main": "dist/fineui_without_conflict.min.js", "main": "dist/fineui_without_conflict.min.js",
"types": "dist/lib/index.d.ts", "types": "dist/lib/index.d.ts",

12
src/widget/intervalslider/intervalslider.js

@ -103,7 +103,7 @@ BI.IntervalSlider = BI.inherit(BI.Single, {
var oldValueTwo = self.valueTwo; var oldValueTwo = self.valueTwo;
var v = BI.parseFloat(this.getValue()); var v = BI.parseFloat(this.getValue());
self.valueTwo = v; self.valueTwo = v;
var percent = self._getPercentByValue(v); var percent = self._getPercentByValue(v, true);
var significantPercent = BI.parseFloat(percent.toFixed(1)); var significantPercent = BI.parseFloat(percent.toFixed(1));
self._setSliderTwoPosition(significantPercent); self._setSliderTwoPosition(significantPercent);
self._setBlueTrack(); self._setBlueTrack();
@ -381,7 +381,7 @@ BI.IntervalSlider = BI.inherit(BI.Single, {
_setBlueTrack: function () { _setBlueTrack: function () {
var percentOne = this._getPercentByValue(this.labelOne.getValue()); var percentOne = this._getPercentByValue(this.labelOne.getValue());
var percentTwo = this._getPercentByValue(this.labelTwo.getValue()); var percentTwo = this._getPercentByValue(this.labelTwo.getValue(), true);
if (percentOne <= percentTwo) { if (percentOne <= percentTwo) {
this._setBlueTrackLeft(percentOne); this._setBlueTrackLeft(percentOne);
this._setBlueTrackWidth(percentTwo - percentOne); this._setBlueTrackWidth(percentTwo - percentOne);
@ -435,7 +435,11 @@ BI.IntervalSlider = BI.inherit(BI.Single, {
}, },
_getPercentByValue: function (v) { _getPercentByValue: function (v, isLast) {
if (this.max === this.min) {
return isLast ? 100 : 0;
}
return (v - this.min) * 100 / (this.max - this.min); return (v - this.min) * 100 / (this.max - this.min);
}, },
@ -545,7 +549,7 @@ BI.IntervalSlider = BI.inherit(BI.Single, {
if ((BI.isNumeric(this.valueOne) || BI.isNotEmptyString(this.valueOne)) && (BI.isNumeric(this.valueTwo) || BI.isNotEmptyString(this.valueTwo))) { if ((BI.isNumeric(this.valueOne) || BI.isNotEmptyString(this.valueOne)) && (BI.isNumeric(this.valueTwo) || BI.isNotEmptyString(this.valueTwo))) {
this.labelOne.setValue(o.digit === false ? this.valueOne : BI.parseFloat(this.valueOne).toFixed(o.digit)); this.labelOne.setValue(o.digit === false ? this.valueOne : BI.parseFloat(this.valueOne).toFixed(o.digit));
this.labelTwo.setValue(o.digit === false ? this.valueTwo : BI.parseFloat(this.valueTwo).toFixed(o.digit)); this.labelTwo.setValue(o.digit === false ? this.valueTwo : BI.parseFloat(this.valueTwo).toFixed(o.digit));
this._setAllPosition(this._getPercentByValue(this.valueOne), this._getPercentByValue(this.valueTwo)); this._setAllPosition(this._getPercentByValue(this.valueOne), this._getPercentByValue(this.valueTwo, true));
} else { } else {
this.labelOne.setValue(this.min); this.labelOne.setValue(this.min);
this.labelTwo.setValue(this.max); this.labelTwo.setValue(this.max);

Loading…
Cancel
Save