From 85dbed8b2ce4f874b3b53461b3b64435db85e0cf Mon Sep 17 00:00:00 2001 From: Swapnil Sharma Date: Mon, 8 Aug 2022 19:17:27 +0530 Subject: [PATCH] #2737 Fix --- bits/27_csfutils.js | 6 +++++- package.json | 3 +-- xlsx.flow.js | 6 +++++- xlsx.js | 6 +++++- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/bits/27_csfutils.js b/bits/27_csfutils.js index 31d94b0..4ddabbd 100644 --- a/bits/27_csfutils.js +++ b/bits/27_csfutils.js @@ -173,7 +173,11 @@ function sheet_add_aoa(_ws/*:?Worksheet*/, data/*:AOA*/, opts/*:?any*/)/*:Worksh } } } - if(range.s.c < 10000000) ws['!ref'] = encode_range(range); + if(range.s.c < 10000000) { + if(range.s.c > _C) range.s.c = _C; + if(range.s.r > _R) range.s.r = _R; + ws['!ref'] = encode_range(range); + } return ws; } function aoa_to_sheet(data/*:AOA*/, opts/*:?any*/)/*:Worksheet*/ { return sheet_add_aoa(null, data, opts); } diff --git a/package.json b/package.json index 6950bdc..02c17cd 100644 --- a/package.json +++ b/package.json @@ -54,8 +54,7 @@ "fs": false }, "sideEffects": false, - "dependencies": { - }, + "dependencies": {}, "devDependencies": { "@sheetjs/uglify-js": "~2.7.3", "@types/node": "^8.5.9", diff --git a/xlsx.flow.js b/xlsx.flow.js index 9f9aef5..f67db7c 100644 --- a/xlsx.flow.js +++ b/xlsx.flow.js @@ -4423,7 +4423,11 @@ function sheet_add_aoa(_ws/*:?Worksheet*/, data/*:AOA*/, opts/*:?any*/)/*:Worksh } } } - if(range.s.c < 10000000) ws['!ref'] = encode_range(range); + if(range.s.c < 10000000) { + if(range.s.c > _C) range.s.c = _C; + if(range.s.r > _R) range.s.r = _R; + ws['!ref'] = encode_range(range); + } return ws; } function aoa_to_sheet(data/*:AOA*/, opts/*:?any*/)/*:Worksheet*/ { return sheet_add_aoa(null, data, opts); } diff --git a/xlsx.js b/xlsx.js index d277b1f..bc29a0e 100644 --- a/xlsx.js +++ b/xlsx.js @@ -4338,7 +4338,11 @@ function sheet_add_aoa(_ws, data, opts) { } } } - if(range.s.c < 10000000) ws['!ref'] = encode_range(range); + if(range.s.c < 10000000) { + if(range.s.c > _C) range.s.c = _C; + if(range.s.r > _R) range.s.r = _R; + ws['!ref'] = encode_range(range); + } return ws; } function aoa_to_sheet(data, opts) { return sheet_add_aoa(null, data, opts); }