fmui-base 2.0.26 → 2.0.27

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志
+- 2.0.27：日期计算
 - 2.0.26：表单初始化计算人民币大写
 - 2.0.25：流程详情修改
 - 2.0.24：暂无数据文案修改

package/lib/form/form.js

@@ -1398,8 +1398,9 @@ var PageHome = function (_React$Component) {
         calculateExp = calculateExp.replace(new RegExp("\\[" + fieldArrayItem + "\\]", "g"), "(" + fieldArrayItemValue + ")");
       }
       calculateExp = calculateExp.replace(new RegExp("rmb\\(", "g"), 'calculate.rmb(');
+      var res = "";
       try {
-        var res = eval(exp);
+        res = eval(calculateExp);
       } catch (e) {
         res = '';
       }

package/lib/form/table.js

@@ -994,15 +994,17 @@ var PageHome = function (_React$Component) {
 											decimalPlace = item.decimalPlace;
 										}
 									});
-									if (fieldType == 'int' || fieldType == 'float') {
-										res = Number(res).toFixed(decimalPlace) + '';
-									} else {
-										if (fieldArray.length == 0) {
-											var aDP = this.getActualDecimalPlace(exp);
-											res = res.toFixed(aDP) + '';
+									if (exp.indexOf("differHalfDate") < 0) {
+										if (fieldType == 'int' || fieldType == 'float') {
+											res = Number(res).toFixed(decimalPlace) + '';
 										} else {
-											var maxDP = this.getMaxDecimalPlace(fieldItemArray); //获取参与计算的字段中 最长的小数位
-											res = res.toFixed(maxDP) + '';
+											if (fieldArray.length == 0) {
+												var aDP = this.getActualDecimalPlace(exp);
+												res = res.toFixed(aDP) + '';
+											} else {
+												var maxDP = this.getMaxDecimalPlace(fieldItemArray); //获取参与计算的字段中 最长的小数位
+												res = res.toFixed(maxDP) + '';
+											}
 										}
 									}
 								}
@@ -1074,7 +1076,8 @@ var PageHome = function (_React$Component) {
 										//当为时间时且有differDate或者differHour函数
 										var differDateRegExp = new RegExp("differDate\\(", "g");
 										var differHourRegExp = new RegExp("differHour\\(", "g");
-										if (exp.match(differDateRegExp) || exp.match(differHourRegExp)) {
+										var differHalfDateRegExp = new RegExp("differHalfDate\\(", "g");
+										if (exp.match(differDateRegExp) || exp.match(differHourRegExp) || exp.match(differHalfDateRegExp)) {
 											//当有differDate函数
 											if (typeof filedItemValue == 'undefined' || filedItemValue == "" || filedItemValue == null) {
 												//filedItemValue = 0;
@@ -1107,6 +1110,7 @@ var PageHome = function (_React$Component) {
 							exp = exp.replace(new RegExp("rmb\\(", "g"), 'calculate.rmb(');
 							exp = exp.replace(new RegExp("differDate\\(", "g"), 'calculate.differDate(');
 							exp = exp.replace(new RegExp("differHour\\(", "g"), 'calculate.differHour(');
+							exp = exp.replace(new RegExp("differHalfDate\\(", "g"), 'calculate.differHalfDate(');
 							try {
 								var res = eval(exp);
 							} catch (e) {
@@ -1137,15 +1141,17 @@ var PageHome = function (_React$Component) {
 										}
 									});
 
-									if (fieldType == 'int' || fieldType == 'float') {
-										res = Number(res).toFixed(decimalPlace) + '';
-									} else {
-										if (fieldArray.length == 0) {
-											var aDP = getActualDecimalPlace(exp);
-											res = res.toFixed(aDP) + '';
+									if (exp.indexOf("differHalfDate") < 0) {
+										if (fieldType == 'int' || fieldType == 'float') {
+											res = Number(res).toFixed(decimalPlace) + '';
 										} else {
-											var maxDP = getMaxDecimalPlace(fieldItemArray); //获取参与计算的字段中 最长的小数位
-											res = res.toFixed(maxDP) + '';
+											if (fieldArray.length == 0) {
+												var aDP = getActualDecimalPlace(exp);
+												res = res.toFixed(aDP) + '';
+											} else {
+												var maxDP = getMaxDecimalPlace(fieldItemArray); //获取参与计算的字段中 最长的小数位
+												res = res.toFixed(maxDP) + '';
+											}
 										}
 									}
 								}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fmui-base",
-  "version": "2.0.26",
+  "version": "2.0.27",
   "title": "fmui-base",
   "description": "fmui移动端组件",
   "main": "lib/index.js",