sheetjs
/
sheetjs
25
Fork 25
Code Issues 177 Pull Requests 12 Wiki Activity

allow rawNumber override raw option

This commit is contained in:
julitork 2023-08-29 16:04:32 +03:00
parent 485a4f30f1
commit 766fc4f4d2
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bits/90_utils.js
View File

@ -39,7 +39,7 @@ function make_json_row(sheet/*:Worksheet*/, r/*:Range*/, R/*:number*/, cols/*:Ar
else if(raw && v === null) row[hdr[C]] = null;
else continue;
} else {
row[hdr[C]] = raw && (val.t !== "n" || (val.t === "n" && o.rawNumbers !== false)) ? v : format_cell(val,v,o);
row[hdr[C]] = (val.t === 'n' && typeof o.rawNumbers === 'boolean' ? o.rawNumbers : raw) ? v : format_cell(val, v, o);
}
if(v != null) isempty = false;
}

17
test.js
View File

@ -1402,13 +1402,16 @@ describe('parse features', function() {
].forEach(function(m) { it(m[0], function() {
var wb = X.read(fs.readFileSync(m[1]), {type: TYPE, cellDates: true});
var ws = wb.Sheets[wb.SheetNames[0]];
var data = X.utils.sheet_to_json(ws, { header: 1, raw: true, rawNumbers: false });
assert.ok(data[0][1] instanceof Date);
assert.ok(data[1][1] instanceof Date);
assert.equal(data[2][1], '$123.00');
assert.equal(data[3][1], '98.76%');
assert.equal(data[4][1], '456.00');
assert.equal(data[5][1], '7,890');
var data1 = X.utils.sheet_to_json(ws, { header: 1, raw: true, rawNumbers: false });
var data2 = X.utils.sheet_to_json(ws, { header: 1, raw: false, rawNumbers: true });
assert.ok(data1[0][1] instanceof Date);
assert.ok(data1[1][1] instanceof Date);
assert.equal(data1[2][1], '$123.00');
assert.equal(data1[3][1], '98.76%');
assert.equal(data1[4][1], '456.00');
assert.equal(data1[5][1], '7,890');
assert.equal(data2[0][1], '7/23/2020');
assert.equal(data2[5][1], 7890);
}); }); });
it('date system', function() {[