Merge pull request #250 in ~GUY/fineui from ~WINDY/fineui:BI4.1 to BI4.1

* commit '78b775d5c1e20a38c3a1aefbe41deb6c2fb67b72': 处理一下90.0这样的
7 years ago · 4deba2da0e
5 changed files with 46 additions and 26 deletions
--- a/bi/widget.js
+++ b/bi/widget.js
@ -5911,12 +5911,17 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
    _checkValidation: function (v) {
        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);
+        //像90.这样的既不属于整数又不属于小数，是不合法的值
+        var dotText = (v + "").split(".")[1];
+        if (BI.isEmptyString(dotText)) {
+        }else{
+            if (BI.isNumeric(v) && !(BI.isNull(v) || v < this.min || v > this.max)) {
+                if(o.digit === false){
+                    valid = true;
+                }else{
+                    dotText = dotText || "";
+                    valid = (dotText.length === o.digit);
+                }
            }
        }
        return valid;
--- a/dist/bundle.js
+++ b/dist/bundle.js
@ -81154,12 +81154,17 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
    _checkValidation: function (v) {
        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);
+        //像90.这样的既不属于整数又不属于小数，是不合法的值
+        var dotText = (v + "").split(".")[1];
+        if (BI.isEmptyString(dotText)) {
+        }else{
+            if (BI.isNumeric(v) && !(BI.isNull(v) || v < this.min || v > this.max)) {
+                if(o.digit === false){
+                    valid = true;
+                }else{
+                    dotText = dotText || "";
+                    valid = (dotText.length === o.digit);
+                }
            }
        }
        return valid;
--- a/dist/bundle.min.js
+++ b/dist/bundle.min.js
--- a/dist/widget.js
+++ b/dist/widget.js
@ -5911,12 +5911,17 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
    _checkValidation: function (v) {
        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);
+        //像90.这样的既不属于整数又不属于小数，是不合法的值
+        var dotText = (v + "").split(".")[1];
+        if (BI.isEmptyString(dotText)) {
+        }else{
+            if (BI.isNumeric(v) && !(BI.isNull(v) || v < this.min || v > this.max)) {
+                if(o.digit === false){
+                    valid = true;
+                }else{
+                    dotText = dotText || "";
+                    valid = (dotText.length === o.digit);
+                }
            }
        }
        return valid;
--- a/src/widget/intervalslider/intervalslider.js
+++ b/src/widget/intervalslider/intervalslider.js
@ -295,12 +295,17 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
    _checkValidation: function (v) {
        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);
+        //像90.这样的既不属于整数又不属于小数，是不合法的值
+        var dotText = (v + "").split(".")[1];
+        if (BI.isEmptyString(dotText)) {
+        }else{
+            if (BI.isNumeric(v) && !(BI.isNull(v) || v < this.min || v > this.max)) {
+                if(o.digit === false){
+                    valid = true;
+                }else{
+                    dotText = dotText || "";
+                    valid = (dotText.length === o.digit);
+                }
            }
        }
        return valid;