Merge branch 'fix/Number' into 'develop'

Merge of fix/Number 修复数字字段一些情况获取或保存值不为数值的情况  to develop

See merge request o2oa/o2oa!898

o2web/source/o2_core/o2/xScript/CMSEnvironment.js

@@ -2292,9 +2292,12 @@ MWF.xScript.CMSJSONData = function(data, callback, key, parent, _form){
                         return d;
                     }
                 }},
-            "check": {"value": function(kk, v){
-                    this.add(kk, v||"", false, true);
-                }},
+            "check": {
+                "value": function(kk, v){
+                    var value = typeOf( v ) === "null" ? "" : v;
+                    this.add(kk, value, false, true);
+                }
+             },
             "del": {"value": function(delKey){
                     if (!this.hasOwnProperty(delKey)) return null;
                     // delete data[delKey];

o2web/source/o2_core/o2/xScript/Environment.js

@@ -4084,9 +4084,12 @@ MWF.xScript.JSONData = function(data, callback, key, parent, _form){
                         return d;
                     }
                 }},
-            "check": {"value": function(kk, v){
-                    this.add(kk, v||"", false, true);
-                }},
+            "check": {
+                "value": function(kk, v){
+                    var value = typeOf( v ) === "null" ? "" : v;
+                    this.add(kk, value, false, true);
+                }
+            },
             "del": {"value": function(delKey){
                     if (!this.hasOwnProperty(delKey)) return null;
                     // delete data[delKey];

o2web/source/o2_core/o2/xScript/PageEnvironment.js

@@ -2487,7 +2487,8 @@ if (!MWF.xScript.JSONData) {
                 },
                 "check": {
                     "value": function (kk, v) {
-                        this.add(kk, v || "", false, true);
+                        var value = typeOf( v ) === "null" ? "" : v;
+                        this.add(kk, value, false, true);
                     }
                 },
                 "del": {

o2web/source/x_component_process_Xform/Number.js

@@ -96,7 +96,7 @@ MWF.xApplication.process.Xform.Number = MWF.APPNumber =  new Class({
     getInputData: function( flag ){
         if (this.node.getFirst()){
             var v = this.node.getElement("input").get("value");
-            if( flag )return v;  //不判断，直接返回原值
+            if( flag )return o2.typeOf(v) === "string" ? v.toFloat() : v;  //不判断，直接返回原值
             var n = v.toFloat();
             return (isNaN(n)) ? (this.json.emptyValue === "string" ? "" : 0) : n;
             //return (isNaN(n)) ? 0 : n;
@@ -181,7 +181,6 @@ MWF.xApplication.process.Xform.Number = MWF.APPNumber =  new Class({
         return true;
     },
     validationConfigItem: function(routeName, data){
-        debugger;
         var flag = (data.status=="all") ? true: (routeName == data.decision);
         if (flag){
             var n = this.getInputData();
@@ -302,7 +301,9 @@ MWF.xApplication.process.Xform.Number = MWF.APPNumber =  new Class({
         this.node.getFirst().addEvent("change", function(){
             this.validationMode();
             if (this.validation()) {
-                this._setBusinessData(this.getInputData("change"));
+                var value = this.getInputData("change");
+                var v = this.isNumber( value ) ? parseFloat(value) : value;
+                this._setBusinessData(v);
                 this.fireEvent("change");
             }
         }.bind(this));
@@ -337,11 +338,15 @@ MWF.xApplication.process.Xform.Number = MWF.APPNumber =  new Class({
         }
     },
     __setValue: function(value){
-        this._setBusinessData(value);
+        var v = this.isNumber( value ) ? parseFloat(value) : value;
+        this._setBusinessData(v);
         if (this.node.getFirst()) this.node.getFirst().set("value", value || (this.json.emptyValue === "string" ? "" : "0"));
         if (this.isReadonly()) this.node.set("text", value);
         this.moduleValueAG = null;
         this.fieldModuleLoaded = true;
         return value;
+    },
+    isNumber : function( d ){
+        return parseFloat(d).toString() !== "NaN";
     }
 });