cloud-web-corejs-haier 1.0.5 → 1.0.6

package/src/components/xform/utils/format.js

@@ -50,8 +50,7 @@ export function formatNumber1(v) {
 	if (typeof(v) != "number") {
 		return v;
 	}
-
-	let length = v.toString().split(".")[1].length;
+  let length = getFixedSize(v);
 	switch(length){
 		case 0:
 				v = v.toFixed(0)
@@ -82,13 +81,23 @@ export function formatNumber1(v) {
 	return res;
 }
 
+function getFixedSize(v){
+  let size = 0;
+  if(v!==null && v!==undefined){
+    let arr = v.toString().split(".");
+    if(arr.length>1){
+      size = arr[1].length;
+    }
+  }
+  return size;
+}
 //###,###,###,##0.00####
 export function formatNumber2(v) {
 	if (typeof(v) != "number") {
 		return v;
 	}
 
-	let length = v.toString().split(".")[1].length;
+	let length = getFixedSize(v);
 	switch(length){
 		case 0:
 		case 1:
@@ -181,7 +190,7 @@ export function formatNumber7(v) {
 		return v;
 	}
 
-	let length = v.toString().split(".")[1].length;
+	let length = getFixedSize(v);
 	v = v*100
 	switch(length){
 		case 0:
@@ -203,3 +212,4 @@ export function formatNumber7(v) {
 		})
 	return res+'%';
 }
+

package/src/components/xform/utils/formula-util.js

@@ -271,10 +271,6 @@ export function baseReplaceFieldsAndFunctionsOfFormula(VFR, formulaFieldRef, for
             }
           });
 
-          /* if(functionCalls.length){
-            debugger
-          } */
-
           if (isSameSubForm && !isInAggregationParam) {
             // 同一子表单且不在聚合函数参数中，使用当前行数据
             if(row){