fmui-base 2.1.54 → 2.1.55
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -0
- package/lib/form/table.js +8 -8
- package/package.json +1 -1
package/README.md
CHANGED
package/lib/form/table.js
CHANGED
|
@@ -1068,8 +1068,8 @@ var PageHome = function (_React$Component) {
|
|
|
1068
1068
|
//当为时间时且有differDate或者differHour函数
|
|
1069
1069
|
var differDateRegExp = new RegExp("differDate\\(", "g");
|
|
1070
1070
|
var differHourRegExp = new RegExp("differHour\\(", "g");
|
|
1071
|
-
var
|
|
1072
|
-
if (exp.match(differDateRegExp) || exp.match(differHourRegExp) || exp.match(
|
|
1071
|
+
var differHalfDayRegExp = new RegExp("differHalfDay\\(", "g");
|
|
1072
|
+
if (exp.match(differDateRegExp) || exp.match(differHourRegExp) || exp.match(differHalfDayRegExp)) {
|
|
1073
1073
|
//当有differDate函数
|
|
1074
1074
|
if (typeof filedItemValue == 'undefined' || filedItemValue == "" || filedItemValue == null) {
|
|
1075
1075
|
//filedItemValue = 0;
|
|
@@ -1115,7 +1115,7 @@ var PageHome = function (_React$Component) {
|
|
|
1115
1115
|
exp = exp.replace(new RegExp("rmb\\(", "g"), 'calculate.rmb(');
|
|
1116
1116
|
exp = exp.replace(new RegExp("differDate\\(", "g"), 'calculate.differDate(');
|
|
1117
1117
|
exp = exp.replace(new RegExp("differHour\\(", "g"), 'calculate.differHour(');
|
|
1118
|
-
exp = exp.replace(new RegExp("
|
|
1118
|
+
exp = exp.replace(new RegExp("differHalfDay\\(", "g"), 'calculate.differHalfDay(');
|
|
1119
1119
|
exp = exp.replace(new RegExp("adddays\\(", "g"), 'calculate.adddays(');
|
|
1120
1120
|
try {
|
|
1121
1121
|
var res = eval(exp);
|
|
@@ -1140,7 +1140,7 @@ var PageHome = function (_React$Component) {
|
|
|
1140
1140
|
decimalPlace = item.decimalPlace;
|
|
1141
1141
|
}
|
|
1142
1142
|
});
|
|
1143
|
-
if (exp.indexOf("
|
|
1143
|
+
if (exp.indexOf("differHalfDay") < 0) {
|
|
1144
1144
|
if (fieldType == 'int' || fieldType == 'float') {
|
|
1145
1145
|
res = Number(res).toFixed(decimalPlace) + '';
|
|
1146
1146
|
} else {
|
|
@@ -1233,8 +1233,8 @@ var PageHome = function (_React$Component) {
|
|
|
1233
1233
|
//当为时间时且有differDate或者differHour函数
|
|
1234
1234
|
var differDateRegExp = new RegExp("differDate\\(", "g");
|
|
1235
1235
|
var differHourRegExp = new RegExp("differHour\\(", "g");
|
|
1236
|
-
var
|
|
1237
|
-
if (exp.match(differDateRegExp) || exp.match(differHourRegExp) || exp.match(
|
|
1236
|
+
var differHalfDayRegExp = new RegExp("differHalfDay\\(", "g");
|
|
1237
|
+
if (exp.match(differDateRegExp) || exp.match(differHourRegExp) || exp.match(differHalfDayRegExp)) {
|
|
1238
1238
|
//当有differDate函数
|
|
1239
1239
|
if (typeof filedItemValue == 'undefined' || filedItemValue == "" || filedItemValue == null) {
|
|
1240
1240
|
//filedItemValue = 0;
|
|
@@ -1267,7 +1267,7 @@ var PageHome = function (_React$Component) {
|
|
|
1267
1267
|
exp = exp.replace(new RegExp("rmb\\(", "g"), 'calculate.rmb(');
|
|
1268
1268
|
exp = exp.replace(new RegExp("differDate\\(", "g"), 'calculate.differDate(');
|
|
1269
1269
|
exp = exp.replace(new RegExp("differHour\\(", "g"), 'calculate.differHour(');
|
|
1270
|
-
exp = exp.replace(new RegExp("
|
|
1270
|
+
exp = exp.replace(new RegExp("differHalfDay\\(", "g"), 'calculate.differHalfDay(');
|
|
1271
1271
|
try {
|
|
1272
1272
|
var res = eval(exp);
|
|
1273
1273
|
} catch (e) {
|
|
@@ -1302,7 +1302,7 @@ var PageHome = function (_React$Component) {
|
|
|
1302
1302
|
// decimalPlace = data.subTbl[h].subTblData[l].decimalPlace;
|
|
1303
1303
|
|
|
1304
1304
|
|
|
1305
|
-
if (exp.indexOf("
|
|
1305
|
+
if (exp.indexOf("differHalfDay") < 0) {
|
|
1306
1306
|
if (fieldType == 'int' || fieldType == 'float') {
|
|
1307
1307
|
res = Number(res).toFixed(decimalPlace) + '';
|
|
1308
1308
|
} else {
|