Merge branch 'cherry-pick-e371bff3' into 'release'

Merge branch 'fix/CMS.number' into 'wrdp'

See merge request o2oa/o2oa!5217

o2web/source/x_component_cms_FormDesigner/Module/Number/number.html

@@ -30,6 +30,13 @@
                     <input type="radio" name="isReadonly" value="true" text{($.isReadonly)?'checked':''}/>{{$.lp.yes}}
                     <input type="radio" name="isReadonly" value="false" text{(!$.isReadonly)?'checked':''}/>{{$.lp.no}}
                 </td>
+            </tr>
+            <tr>
+                <td class="editTableTitle">{{$.lp.emptyValue}}:</td>
+                <td class="editTableValue">
+                    <input type="radio" name="emptyValue" value="zero" text{($.emptyValue!='string')?'checked':''}/>{{$.lp.showZero}}
+                    <input type="radio" name="emptyValue" value="string" text{($.emptyValue=='string')?'checked':''}/>{{$.lp.showNullString}}
+                </td>
             </tr>
 		</table>
 		

o2web/source/x_component_cms_Xform/Number.js

@@ -6,10 +6,11 @@ MWF.xApplication.cms.Xform.Number = MWF.CMSNumber =  new Class({
         var flag = (data.status=="all") ? true: (routeName == "publish");
         if (flag){
             var n = this.getInputData();
+            if( n === "" && this.json.emptyValue === "string" )n = 0;
             var v = (data.valueType=="value") ? n : n.length;
             switch (data.operateor){
                 case "isnull":
-                    if (!v){
+                    if (!v && v.toString()!=='0'){
                         this.notValidationMode(data.prompt);
                         return false;
                     }

o2web/source/x_component_process_Xform/Number.js

@@ -150,13 +150,13 @@ debugger;
                     }
                     break;
                 case "contain":
-                    if (v.indexOf(data.value)!=-1){
+                    if (v.toString().indexOf(data.value)!=-1){
                         this.notValidationMode(data.prompt);
                         return false;
                     }
                     break;
                 case "notcontain":
-                    if (v.indexOf(data.value)==-1){
+                    if (v.toString().indexOf(data.value)==-1){
                         this.notValidationMode(data.prompt);
                         return false;
                     }