zmdms-webui 1.9.0 → 1.9.1
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.
|
@@ -144,10 +144,6 @@ function getSubtotalObj(fields, dataSource) {
|
|
|
144
144
|
summaryTotalObj[field] = summaryItem
|
|
145
145
|
? plus(summaryItem, dataItem)
|
|
146
146
|
: dataItem;
|
|
147
|
-
// 合计添加千分符
|
|
148
|
-
if (summaryTotalObj[field]) {
|
|
149
|
-
summaryTotalObj[field] = addThousedSeparator(summaryTotalObj[field]);
|
|
150
|
-
}
|
|
151
147
|
}
|
|
152
148
|
else {
|
|
153
149
|
var key = field.key, showKey = field.showKey, toFixedNum_1 = field.toFixedNum, value = field.value, callback = field.callback;
|
|
@@ -240,13 +236,14 @@ function getSubtotalObj(fields, dataSource) {
|
|
|
240
236
|
summaryTotalConfigObj[key] = {
|
|
241
237
|
align: field === null || field === void 0 ? void 0 : field.align,
|
|
242
238
|
};
|
|
243
|
-
// 合计添加千分符
|
|
244
|
-
if (summaryTotalObj[key]) {
|
|
245
|
-
summaryTotalObj[key] = addThousedSeparator(summaryTotalObj[key]);
|
|
246
|
-
}
|
|
247
239
|
}
|
|
248
240
|
});
|
|
249
241
|
});
|
|
242
|
+
Object.keys(summaryTotalObj).forEach(function (key) {
|
|
243
|
+
if (summaryTotalObj[key] !== undefined) {
|
|
244
|
+
summaryTotalObj[key] = addThousedSeparator(summaryTotalObj[key]);
|
|
245
|
+
}
|
|
246
|
+
});
|
|
250
247
|
return {
|
|
251
248
|
summaryTotalObj: summaryTotalObj,
|
|
252
249
|
summaryTotalConfigObj: summaryTotalConfigObj,
|