Browse Source

Merge remote-tracking branch 'origin/master'

es6
guy 7 years ago
parent
commit
c11076b7f8
  1. 12
      bi/widget.js
  2. 12
      dist/bundle.js
  3. 4
      dist/bundle.min.js
  4. 12
      dist/widget.js
  5. 22
      src/less/lib/constant.less
  6. 12
      src/widget/singleslider/singleslider.js

12
bi/widget.js

@ -17305,7 +17305,17 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
}, },
_checkValidation: function (v) { _checkValidation: function (v) {
return BI.isNumeric(v) && !(BI.isNull(v) || v < this.min || v > this.max) var o = this.options;
var valid = false;
if (BI.isNumeric(v) && !(BI.isNull(v) || v < this.min || v > this.max)) {
if(o.digit === false){
valid = true;
}else{
var dotText = (v + "").split(".")[1] || "";
valid = (dotText.length === o.digit);
}
}
return valid;
}, },
_setBlueTrack: function (percent) { _setBlueTrack: function (percent) {

12
dist/bundle.js vendored

@ -92497,7 +92497,17 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
}, },
_checkValidation: function (v) { _checkValidation: function (v) {
return BI.isNumeric(v) && !(BI.isNull(v) || v < this.min || v > this.max) var o = this.options;
var valid = false;
if (BI.isNumeric(v) && !(BI.isNull(v) || v < this.min || v > this.max)) {
if(o.digit === false){
valid = true;
}else{
var dotText = (v + "").split(".")[1] || "";
valid = (dotText.length === o.digit);
}
}
return valid;
}, },
_setBlueTrack: function (percent) { _setBlueTrack: function (percent) {

4
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

12
dist/widget.js vendored

@ -17305,7 +17305,17 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
}, },
_checkValidation: function (v) { _checkValidation: function (v) {
return BI.isNumeric(v) && !(BI.isNull(v) || v < this.min || v > this.max) var o = this.options;
var valid = false;
if (BI.isNumeric(v) && !(BI.isNull(v) || v < this.min || v > this.max)) {
if(o.digit === false){
valid = true;
}else{
var dotText = (v + "").split(".")[1] || "";
valid = (dotText.length === o.digit);
}
}
return valid;
}, },
_setBlueTrack: function (percent) { _setBlueTrack: function (percent) {

22
src/less/lib/constant.less

@ -16,18 +16,18 @@
//font color //font color
@font-color-black: #1a1a1a;// @font-color-black: #1a1a1a;//
@font-color-normal: #666666;// @font-color-normal: #3d4d66;//
@font-color-normal-theme-dark: #cccccc;// @font-color-normal-theme-dark: #cccccc;//
@font-color-disabled: #cccccc;// @font-color-disabled: #9ea6b2;//
@font-color-disabled-theme-dark: #666666;// @font-color-disabled-theme-dark: #666666;//
@font-color-tips: #999999;// @font-color-tips: #c4c9d1;//
@font-color-dark: #d4dadd; @font-color-dark: #232e40;
@font-color-gray: #999999; @font-color-gray: #999999;
@font-color-white: #ffffff;// @font-color-white: #ffffff;//
@font-color-highlight: #3f8ce8; @font-color-highlight: #3685f2;
@font-color-success: #0c6d23; @font-color-success: #5cb75d;
@font-color-warning: #e85050;// @font-color-warning: #faaa39;//
@font-color-redmark: #f07d0a;// @font-color-redmark: #ff4949;//
@font-color-orange: #fbb03b;// @font-color-orange: #fbb03b;//
//background color //background color
@ -37,13 +37,13 @@
@background-color-normal: #eff1f4;// @background-color-normal: #eff1f4;//
@background-color-normal-theme-dark: #191B2B;// @background-color-normal-theme-dark: #191B2B;//
@background-color-highlight: #3f8ce8; @background-color-highlight: #3f8ce8;
@background-color-dark: #d4dadd; @background-color-dark: #232e40;
@background-color-gray: #999999; @background-color-gray: #999999;
@background-color-disabled: #cccccc; @background-color-disabled: #cccccc;
@background-color-alert: #fddddd; @background-color-alert: #fddddd;
@background-color-warning: #fbb03b; @background-color-warning: #faaa39;
@background-color-negative: #e85050; @background-color-negative: #ff4949;
@background-color-dark-success: #58cc7d; @background-color-dark-success: #58cc7d;
@background-color-light-success: #e1f4e7; @background-color-light-success: #e1f4e7;

12
src/widget/singleslider/singleslider.js

@ -225,7 +225,17 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
}, },
_checkValidation: function (v) { _checkValidation: function (v) {
return BI.isNumeric(v) && !(BI.isNull(v) || v < this.min || v > this.max) var o = this.options;
var valid = false;
if (BI.isNumeric(v) && !(BI.isNull(v) || v < this.min || v > this.max)) {
if(o.digit === false){
valid = true;
}else{
var dotText = (v + "").split(".")[1] || "";
valid = (dotText.length === o.digit);
}
}
return valid;
}, },
_setBlueTrack: function (percent) { _setBlueTrack: function (percent) {

Loading…
Cancel
Save