Browse Source

Merge pull request #150 in ~GUY/fineui from ~WINDY/fineui:master to master

* commit 'a0acef3ed43521b6f4047797e93b63cf23093083':
  singleSlider值没存
  singleSlider值没存
es6
windy 7 years ago
parent
commit
379f06da65
  1. 4
      bi/slider.js
  2. 2
      bi/widget.css
  3. 2
      dist/bundle.css
  4. 2
      dist/bundle.min.css
  5. 4
      dist/slider.js
  6. 2
      dist/widget.css
  7. 4
      src/addons/slider/slider/singleslider/singleslider.js

4
bi/slider.js

@ -137,7 +137,9 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
}
});
this.label.on(BI.SignEditor.EVENT_CONFIRM, function () {
var percent = self._getPercentByValue(this.getValue());
var v = BI.parseFloat(this.getValue());
self.value = v;
var percent = self._getPercentByValue(v);
var significantPercent = BI.parseFloat(percent.toFixed(1));
self._setAllPosition(significantPercent);
self.fireEvent(BI.SingleSlider.EVENT_CHANGE);

2
bi/widget.css

@ -433,7 +433,7 @@
/****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/
.bi-single-slider-slider .slider-button {
cursor: url('${remoteServletURL}?op=resource&resource=/com/fr/bi/web/images/1x/cursor/cursor_drag_slider.cur'), auto;
cursor: url('images/1x/cursor/cursor_drag_slider.cur'), auto;
-webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
-moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);

2
dist/bundle.css vendored

@ -3210,7 +3210,7 @@ li.CodeMirror-hint-active {
/****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/
.bi-single-slider-slider .slider-button {
cursor: url('${remoteServletURL}?op=resource&resource=/com/fr/bi/web/images/1x/cursor/cursor_drag_slider.cur'), auto;
cursor: url('images/1x/cursor/cursor_drag_slider.cur'), auto;
-webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
-moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

4
dist/slider.js vendored

@ -137,7 +137,9 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
}
});
this.label.on(BI.SignEditor.EVENT_CONFIRM, function () {
var percent = self._getPercentByValue(this.getValue());
var v = BI.parseFloat(this.getValue());
self.value = v;
var percent = self._getPercentByValue(v);
var significantPercent = BI.parseFloat(percent.toFixed(1));
self._setAllPosition(significantPercent);
self.fireEvent(BI.SingleSlider.EVENT_CHANGE);

2
dist/widget.css vendored

@ -433,7 +433,7 @@
/****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/
.bi-single-slider-slider .slider-button {
cursor: url('${remoteServletURL}?op=resource&resource=/com/fr/bi/web/images/1x/cursor/cursor_drag_slider.cur'), auto;
cursor: url('images/1x/cursor/cursor_drag_slider.cur'), auto;
-webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
-moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);

4
src/addons/slider/slider/singleslider/singleslider.js

@ -105,7 +105,9 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
}
});
this.label.on(BI.SignEditor.EVENT_CONFIRM, function () {
var percent = self._getPercentByValue(this.getValue());
var v = BI.parseFloat(this.getValue());
self.value = v;
var percent = self._getPercentByValue(v);
var significantPercent = BI.parseFloat(percent.toFixed(1));
self._setAllPosition(significantPercent);
self.fireEvent(BI.SingleSlider.EVENT_CHANGE);

Loading…
Cancel
Save