Skip to content

Commit bd01031

Browse files
default number formatting
1 parent 5e9b916 commit bd01031

1 file changed

Lines changed: 13 additions & 2 deletions

File tree

source/js/PivotView.js

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ PivotView.prototype.formatNumber = function (mask, value) {
359359
ip1 = integerPart = parseInt(value).toString();
360360
fp1 = fractionalPart = (parseFloat(value) - parseInt(integerPart))
361361
.toString()
362-
.concat((new Array(this.controller.CONFIG["formatNumbers"].length))
362+
.concat((new Array(mask.length))
363363
.join("0"));
364364
for (var i = fp.length - 1; i > -1; i--) {
365365
if (fp[i][0] !== "#") continue;
@@ -545,7 +545,18 @@ PivotView.prototype.renderRawData = function (data) {
545545
data[y][x].value
546546
);
547547
} else {
548-
span.textContent = data[y][x].value;
548+
if (Number(data[y][x].value) === data[y][x].value) { // if number
549+
// perform default formatting
550+
if (data[y][x].value % 1 === 0) { // if integer
551+
span.textContent =
552+
this.formatNumber("#,###,###.##", data[y][x].value)
553+
.replace(/\..*/, "");
554+
} else { // if float
555+
span.textContent = this.formatNumber("#,###,###.##", data[y][x].value);
556+
}
557+
} else {
558+
span.textContent = data[y][x].value;
559+
}
549560
}
550561

551562
(function (x, y) {addTrigger(td, clickEvent, function (event) {

0 commit comments

Comments
 (0)