forked from sheetjs/sheetjs
version bump 0.14.3: formula niggle (closes #1388)
This commit is contained in:
parent
0c36667c0c
commit
9a6d8a1d3d
@ -1 +1 @@
|
|||||||
XLSX.version = '0.14.2';
|
XLSX.version = '0.14.3';
|
||||||
|
@ -695,9 +695,9 @@ function formula_quote_sheet_name(sname/*:string*/, opts)/*:string*/ {
|
|||||||
}
|
}
|
||||||
function get_ixti_raw(supbooks, ixti/*:number*/, opts)/*:string*/ {
|
function get_ixti_raw(supbooks, ixti/*:number*/, opts)/*:string*/ {
|
||||||
if(!supbooks) return "SH33TJSERR0";
|
if(!supbooks) return "SH33TJSERR0";
|
||||||
|
if(opts.biff > 8 && (!supbooks.XTI || !supbooks.XTI[ixti])) return supbooks.SheetNames[ixti];
|
||||||
if(!supbooks.XTI) return "SH33TJSERR6";
|
if(!supbooks.XTI) return "SH33TJSERR6";
|
||||||
var XTI = supbooks.XTI[ixti];
|
var XTI = supbooks.XTI[ixti];
|
||||||
if(opts.biff > 8 && !supbooks.XTI[ixti]) return supbooks.SheetNames[ixti];
|
|
||||||
if(opts.biff < 8) {
|
if(opts.biff < 8) {
|
||||||
if(ixti > 10000) ixti-= 65536;
|
if(ixti > 10000) ixti-= 65536;
|
||||||
if(ixti < 0) ixti = -ixti;
|
if(ixti < 0) ixti = -ixti;
|
||||||
|
@ -9,7 +9,7 @@ var dimregex = /"(\w*:\w*)"/;
|
|||||||
var colregex = /<(?:\w:)?col\b[^>]*[\/]?>/g;
|
var colregex = /<(?:\w:)?col\b[^>]*[\/]?>/g;
|
||||||
var afregex = /<(?:\w:)?autoFilter[^>]*([\/]|>([\s\S]*)<\/(?:\w:)?autoFilter)>/g;
|
var afregex = /<(?:\w:)?autoFilter[^>]*([\/]|>([\s\S]*)<\/(?:\w:)?autoFilter)>/g;
|
||||||
var marginregex= /<(?:\w:)?pageMargins[^>]*\/>/g;
|
var marginregex= /<(?:\w:)?pageMargins[^>]*\/>/g;
|
||||||
var sheetprregex = /<(?:\w:)?sheetPr(?:[^>a-z][^>]*)?\/>/;
|
var sheetprregex = /<(?:\w:)?sheetPr\b(?:[^>a-z][^>]*)?\/>/;
|
||||||
var svsregex = /<(?:\w:)?sheetViews[^>]*(?:[\/]|>([\s\S]*)<\/(?:\w:)?sheetViews)>/;
|
var svsregex = /<(?:\w:)?sheetViews[^>]*(?:[\/]|>([\s\S]*)<\/(?:\w:)?sheetViews)>/;
|
||||||
/* 18.3 Worksheets */
|
/* 18.3 Worksheets */
|
||||||
function parse_ws_xml(data/*:?string*/, opts, idx/*:number*/, rels, wb/*:WBWBProps*/, themes, styles)/*:Worksheet*/ {
|
function parse_ws_xml(data/*:?string*/, opts, idx/*:number*/, rels, wb/*:WBWBProps*/, themes, styles)/*:Worksheet*/ {
|
||||||
@ -343,11 +343,11 @@ return function parse_ws_xml_data(sdata/*:string*/, s, opts, guess/*:Range*/, th
|
|||||||
} else if(/*::cref != null && cref[0] != null && */cref[0].indexOf('t="shared"') > -1) {
|
} else if(/*::cref != null && cref[0] != null && */cref[0].indexOf('t="shared"') > -1) {
|
||||||
// TODO: parse formula
|
// TODO: parse formula
|
||||||
ftag = parsexmltag(cref[0]);
|
ftag = parsexmltag(cref[0]);
|
||||||
sharedf[parseInt(ftag.si, 10)] = [ftag, _xlfn(unescapexml(utf8read(cref[1])))];
|
sharedf[parseInt(ftag.si, 10)] = [ftag, _xlfn(unescapexml(utf8read(cref[1]))), tag.r];
|
||||||
}
|
}
|
||||||
} else if((cref=d.match(/<f[^>]*\/>/))) {
|
} else if((cref=d.match(/<f[^>]*\/>/))) {
|
||||||
ftag = parsexmltag(cref[0]);
|
ftag = parsexmltag(cref[0]);
|
||||||
if(sharedf[ftag.si]) p.f = shift_formula_xlsx(sharedf[ftag.si][1], sharedf[ftag.si][0].ref, tag.r);
|
if(sharedf[ftag.si]) p.f = shift_formula_xlsx(sharedf[ftag.si][1], sharedf[ftag.si][2]/*[0].ref*/, tag.r);
|
||||||
}
|
}
|
||||||
/* TODO: factor out contains logic */
|
/* TODO: factor out contains logic */
|
||||||
var _tag = decode_cell(tag.r);
|
var _tag = decode_cell(tag.r);
|
||||||
|
@ -418,7 +418,7 @@ function parse_ws_bin(data, _opts, idx, rels, wb/*:WBWBProps*/, themes, styles)/
|
|||||||
|
|
||||||
var arrayf/*:Array<[Range, string]>*/ = [];
|
var arrayf/*:Array<[Range, string]>*/ = [];
|
||||||
var sharedf = {};
|
var sharedf = {};
|
||||||
var supbooks = opts.supbooks || ([[]]/*:any*/);
|
var supbooks = opts.supbooks || wb.supbooks || ([[]]/*:any*/);
|
||||||
supbooks.sharedf = sharedf;
|
supbooks.sharedf = sharedf;
|
||||||
supbooks.arrayf = arrayf;
|
supbooks.arrayf = arrayf;
|
||||||
supbooks.SheetNames = wb.SheetNames || wb.Sheets.map(function(x) { return x.name; });
|
supbooks.SheetNames = wb.SheetNames || wb.Sheets.map(function(x) { return x.name; });
|
||||||
|
6
dist/xlsx.core.min.js
generated
vendored
6
dist/xlsx.core.min.js
generated
vendored
File diff suppressed because one or more lines are too long
2
dist/xlsx.core.min.map
generated
vendored
2
dist/xlsx.core.min.map
generated
vendored
File diff suppressed because one or more lines are too long
12
dist/xlsx.extendscript.js
generated
vendored
12
dist/xlsx.extendscript.js
generated
vendored
@ -9160,7 +9160,7 @@ module.exports = ZStream;
|
|||||||
/*global global, exports, module, require:false, process:false, Buffer:false, ArrayBuffer:false */
|
/*global global, exports, module, require:false, process:false, Buffer:false, ArrayBuffer:false */
|
||||||
var XLSX = {};
|
var XLSX = {};
|
||||||
function make_xlsx_lib(XLSX){
|
function make_xlsx_lib(XLSX){
|
||||||
XLSX.version = '0.14.2';
|
XLSX.version = '0.14.3';
|
||||||
var current_codepage = 1200, current_ansi = 1252;
|
var current_codepage = 1200, current_ansi = 1252;
|
||||||
/*global cptable:true, window */
|
/*global cptable:true, window */
|
||||||
if(typeof module !== "undefined" && typeof require !== 'undefined') {
|
if(typeof module !== "undefined" && typeof require !== 'undefined') {
|
||||||
@ -20074,9 +20074,9 @@ function formula_quote_sheet_name(sname, opts) {
|
|||||||
}
|
}
|
||||||
function get_ixti_raw(supbooks, ixti, opts) {
|
function get_ixti_raw(supbooks, ixti, opts) {
|
||||||
if(!supbooks) return "SH33TJSERR0";
|
if(!supbooks) return "SH33TJSERR0";
|
||||||
|
if(opts.biff > 8 && (!supbooks.XTI || !supbooks.XTI[ixti])) return supbooks.SheetNames[ixti];
|
||||||
if(!supbooks.XTI) return "SH33TJSERR6";
|
if(!supbooks.XTI) return "SH33TJSERR6";
|
||||||
var XTI = supbooks.XTI[ixti];
|
var XTI = supbooks.XTI[ixti];
|
||||||
if(opts.biff > 8 && !supbooks.XTI[ixti]) return supbooks.SheetNames[ixti];
|
|
||||||
if(opts.biff < 8) {
|
if(opts.biff < 8) {
|
||||||
if(ixti > 10000) ixti-= 65536;
|
if(ixti > 10000) ixti-= 65536;
|
||||||
if(ixti < 0) ixti = -ixti;
|
if(ixti < 0) ixti = -ixti;
|
||||||
@ -21948,7 +21948,7 @@ var dimregex = /"(\w*:\w*)"/;
|
|||||||
var colregex = /<(?:\w:)?col\b[^>]*[\/]?>/g;
|
var colregex = /<(?:\w:)?col\b[^>]*[\/]?>/g;
|
||||||
var afregex = /<(?:\w:)?autoFilter[^>]*([\/]|>([\s\S]*)<\/(?:\w:)?autoFilter)>/g;
|
var afregex = /<(?:\w:)?autoFilter[^>]*([\/]|>([\s\S]*)<\/(?:\w:)?autoFilter)>/g;
|
||||||
var marginregex= /<(?:\w:)?pageMargins[^>]*\/>/g;
|
var marginregex= /<(?:\w:)?pageMargins[^>]*\/>/g;
|
||||||
var sheetprregex = /<(?:\w:)?sheetPr(?:[^>a-z][^>]*)?\/>/;
|
var sheetprregex = /<(?:\w:)?sheetPr\b(?:[^>a-z][^>]*)?\/>/;
|
||||||
var svsregex = /<(?:\w:)?sheetViews[^>]*(?:[\/]|>([\s\S]*)<\/(?:\w:)?sheetViews)>/;
|
var svsregex = /<(?:\w:)?sheetViews[^>]*(?:[\/]|>([\s\S]*)<\/(?:\w:)?sheetViews)>/;
|
||||||
/* 18.3 Worksheets */
|
/* 18.3 Worksheets */
|
||||||
function parse_ws_xml(data, opts, idx, rels, wb, themes, styles) {
|
function parse_ws_xml(data, opts, idx, rels, wb, themes, styles) {
|
||||||
@ -22282,11 +22282,11 @@ return function parse_ws_xml_data(sdata, s, opts, guess, themes, styles) {
|
|||||||
} else if(cref[0].indexOf('t="shared"') > -1) {
|
} else if(cref[0].indexOf('t="shared"') > -1) {
|
||||||
// TODO: parse formula
|
// TODO: parse formula
|
||||||
ftag = parsexmltag(cref[0]);
|
ftag = parsexmltag(cref[0]);
|
||||||
sharedf[parseInt(ftag.si, 10)] = [ftag, _xlfn(unescapexml(utf8read(cref[1])))];
|
sharedf[parseInt(ftag.si, 10)] = [ftag, _xlfn(unescapexml(utf8read(cref[1]))), tag.r];
|
||||||
}
|
}
|
||||||
} else if((cref=d.match(/<f[^>]*\/>/))) {
|
} else if((cref=d.match(/<f[^>]*\/>/))) {
|
||||||
ftag = parsexmltag(cref[0]);
|
ftag = parsexmltag(cref[0]);
|
||||||
if(sharedf[ftag.si]) p.f = shift_formula_xlsx(sharedf[ftag.si][1], sharedf[ftag.si][0].ref, tag.r);
|
if(sharedf[ftag.si]) p.f = shift_formula_xlsx(sharedf[ftag.si][1], sharedf[ftag.si][2]/*[0].ref*/, tag.r);
|
||||||
}
|
}
|
||||||
/* TODO: factor out contains logic */
|
/* TODO: factor out contains logic */
|
||||||
var _tag = decode_cell(tag.r);
|
var _tag = decode_cell(tag.r);
|
||||||
@ -22955,7 +22955,7 @@ function parse_ws_bin(data, _opts, idx, rels, wb, themes, styles) {
|
|||||||
|
|
||||||
var arrayf = [];
|
var arrayf = [];
|
||||||
var sharedf = {};
|
var sharedf = {};
|
||||||
var supbooks = opts.supbooks || ([[]]);
|
var supbooks = opts.supbooks || wb.supbooks || ([[]]);
|
||||||
supbooks.sharedf = sharedf;
|
supbooks.sharedf = sharedf;
|
||||||
supbooks.arrayf = arrayf;
|
supbooks.arrayf = arrayf;
|
||||||
supbooks.SheetNames = wb.SheetNames || wb.Sheets.map(function(x) { return x.name; });
|
supbooks.SheetNames = wb.SheetNames || wb.Sheets.map(function(x) { return x.name; });
|
||||||
|
12
dist/xlsx.full.min.js
generated
vendored
12
dist/xlsx.full.min.js
generated
vendored
File diff suppressed because one or more lines are too long
2
dist/xlsx.full.min.map
generated
vendored
2
dist/xlsx.full.min.map
generated
vendored
File diff suppressed because one or more lines are too long
12
dist/xlsx.js
generated
vendored
12
dist/xlsx.js
generated
vendored
@ -4,7 +4,7 @@
|
|||||||
/*global global, exports, module, require:false, process:false, Buffer:false, ArrayBuffer:false */
|
/*global global, exports, module, require:false, process:false, Buffer:false, ArrayBuffer:false */
|
||||||
var XLSX = {};
|
var XLSX = {};
|
||||||
function make_xlsx_lib(XLSX){
|
function make_xlsx_lib(XLSX){
|
||||||
XLSX.version = '0.14.2';
|
XLSX.version = '0.14.3';
|
||||||
var current_codepage = 1200, current_ansi = 1252;
|
var current_codepage = 1200, current_ansi = 1252;
|
||||||
/*global cptable:true, window */
|
/*global cptable:true, window */
|
||||||
if(typeof module !== "undefined" && typeof require !== 'undefined') {
|
if(typeof module !== "undefined" && typeof require !== 'undefined') {
|
||||||
@ -10918,9 +10918,9 @@ function formula_quote_sheet_name(sname, opts) {
|
|||||||
}
|
}
|
||||||
function get_ixti_raw(supbooks, ixti, opts) {
|
function get_ixti_raw(supbooks, ixti, opts) {
|
||||||
if(!supbooks) return "SH33TJSERR0";
|
if(!supbooks) return "SH33TJSERR0";
|
||||||
|
if(opts.biff > 8 && (!supbooks.XTI || !supbooks.XTI[ixti])) return supbooks.SheetNames[ixti];
|
||||||
if(!supbooks.XTI) return "SH33TJSERR6";
|
if(!supbooks.XTI) return "SH33TJSERR6";
|
||||||
var XTI = supbooks.XTI[ixti];
|
var XTI = supbooks.XTI[ixti];
|
||||||
if(opts.biff > 8 && !supbooks.XTI[ixti]) return supbooks.SheetNames[ixti];
|
|
||||||
if(opts.biff < 8) {
|
if(opts.biff < 8) {
|
||||||
if(ixti > 10000) ixti-= 65536;
|
if(ixti > 10000) ixti-= 65536;
|
||||||
if(ixti < 0) ixti = -ixti;
|
if(ixti < 0) ixti = -ixti;
|
||||||
@ -12792,7 +12792,7 @@ var dimregex = /"(\w*:\w*)"/;
|
|||||||
var colregex = /<(?:\w:)?col\b[^>]*[\/]?>/g;
|
var colregex = /<(?:\w:)?col\b[^>]*[\/]?>/g;
|
||||||
var afregex = /<(?:\w:)?autoFilter[^>]*([\/]|>([\s\S]*)<\/(?:\w:)?autoFilter)>/g;
|
var afregex = /<(?:\w:)?autoFilter[^>]*([\/]|>([\s\S]*)<\/(?:\w:)?autoFilter)>/g;
|
||||||
var marginregex= /<(?:\w:)?pageMargins[^>]*\/>/g;
|
var marginregex= /<(?:\w:)?pageMargins[^>]*\/>/g;
|
||||||
var sheetprregex = /<(?:\w:)?sheetPr(?:[^>a-z][^>]*)?\/>/;
|
var sheetprregex = /<(?:\w:)?sheetPr\b(?:[^>a-z][^>]*)?\/>/;
|
||||||
var svsregex = /<(?:\w:)?sheetViews[^>]*(?:[\/]|>([\s\S]*)<\/(?:\w:)?sheetViews)>/;
|
var svsregex = /<(?:\w:)?sheetViews[^>]*(?:[\/]|>([\s\S]*)<\/(?:\w:)?sheetViews)>/;
|
||||||
/* 18.3 Worksheets */
|
/* 18.3 Worksheets */
|
||||||
function parse_ws_xml(data, opts, idx, rels, wb, themes, styles) {
|
function parse_ws_xml(data, opts, idx, rels, wb, themes, styles) {
|
||||||
@ -13126,11 +13126,11 @@ return function parse_ws_xml_data(sdata, s, opts, guess, themes, styles) {
|
|||||||
} else if(cref[0].indexOf('t="shared"') > -1) {
|
} else if(cref[0].indexOf('t="shared"') > -1) {
|
||||||
// TODO: parse formula
|
// TODO: parse formula
|
||||||
ftag = parsexmltag(cref[0]);
|
ftag = parsexmltag(cref[0]);
|
||||||
sharedf[parseInt(ftag.si, 10)] = [ftag, _xlfn(unescapexml(utf8read(cref[1])))];
|
sharedf[parseInt(ftag.si, 10)] = [ftag, _xlfn(unescapexml(utf8read(cref[1]))), tag.r];
|
||||||
}
|
}
|
||||||
} else if((cref=d.match(/<f[^>]*\/>/))) {
|
} else if((cref=d.match(/<f[^>]*\/>/))) {
|
||||||
ftag = parsexmltag(cref[0]);
|
ftag = parsexmltag(cref[0]);
|
||||||
if(sharedf[ftag.si]) p.f = shift_formula_xlsx(sharedf[ftag.si][1], sharedf[ftag.si][0].ref, tag.r);
|
if(sharedf[ftag.si]) p.f = shift_formula_xlsx(sharedf[ftag.si][1], sharedf[ftag.si][2]/*[0].ref*/, tag.r);
|
||||||
}
|
}
|
||||||
/* TODO: factor out contains logic */
|
/* TODO: factor out contains logic */
|
||||||
var _tag = decode_cell(tag.r);
|
var _tag = decode_cell(tag.r);
|
||||||
@ -13799,7 +13799,7 @@ function parse_ws_bin(data, _opts, idx, rels, wb, themes, styles) {
|
|||||||
|
|
||||||
var arrayf = [];
|
var arrayf = [];
|
||||||
var sharedf = {};
|
var sharedf = {};
|
||||||
var supbooks = opts.supbooks || ([[]]);
|
var supbooks = opts.supbooks || wb.supbooks || ([[]]);
|
||||||
supbooks.sharedf = sharedf;
|
supbooks.sharedf = sharedf;
|
||||||
supbooks.arrayf = arrayf;
|
supbooks.arrayf = arrayf;
|
||||||
supbooks.SheetNames = wb.SheetNames || wb.Sheets.map(function(x) { return x.name; });
|
supbooks.SheetNames = wb.SheetNames || wb.Sheets.map(function(x) { return x.name; });
|
||||||
|
8
dist/xlsx.min.js
generated
vendored
8
dist/xlsx.min.js
generated
vendored
File diff suppressed because one or more lines are too long
2
dist/xlsx.min.map
generated
vendored
2
dist/xlsx.min.map
generated
vendored
File diff suppressed because one or more lines are too long
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "xlsx",
|
"name": "xlsx",
|
||||||
"version": "0.14.2",
|
"version": "0.14.3",
|
||||||
"author": "sheetjs",
|
"author": "sheetjs",
|
||||||
"description": "SheetJS Spreadsheet data parser and writer",
|
"description": "SheetJS Spreadsheet data parser and writer",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
|
12
xlsx.flow.js
12
xlsx.flow.js
@ -4,7 +4,7 @@
|
|||||||
/*global global, exports, module, require:false, process:false, Buffer:false, ArrayBuffer:false */
|
/*global global, exports, module, require:false, process:false, Buffer:false, ArrayBuffer:false */
|
||||||
var XLSX = {};
|
var XLSX = {};
|
||||||
function make_xlsx_lib(XLSX){
|
function make_xlsx_lib(XLSX){
|
||||||
XLSX.version = '0.14.2';
|
XLSX.version = '0.14.3';
|
||||||
var current_codepage = 1200, current_ansi = 1252;
|
var current_codepage = 1200, current_ansi = 1252;
|
||||||
/*:: declare var cptable:any; */
|
/*:: declare var cptable:any; */
|
||||||
/*global cptable:true, window */
|
/*global cptable:true, window */
|
||||||
@ -11019,9 +11019,9 @@ function formula_quote_sheet_name(sname/*:string*/, opts)/*:string*/ {
|
|||||||
}
|
}
|
||||||
function get_ixti_raw(supbooks, ixti/*:number*/, opts)/*:string*/ {
|
function get_ixti_raw(supbooks, ixti/*:number*/, opts)/*:string*/ {
|
||||||
if(!supbooks) return "SH33TJSERR0";
|
if(!supbooks) return "SH33TJSERR0";
|
||||||
|
if(opts.biff > 8 && (!supbooks.XTI || !supbooks.XTI[ixti])) return supbooks.SheetNames[ixti];
|
||||||
if(!supbooks.XTI) return "SH33TJSERR6";
|
if(!supbooks.XTI) return "SH33TJSERR6";
|
||||||
var XTI = supbooks.XTI[ixti];
|
var XTI = supbooks.XTI[ixti];
|
||||||
if(opts.biff > 8 && !supbooks.XTI[ixti]) return supbooks.SheetNames[ixti];
|
|
||||||
if(opts.biff < 8) {
|
if(opts.biff < 8) {
|
||||||
if(ixti > 10000) ixti-= 65536;
|
if(ixti > 10000) ixti-= 65536;
|
||||||
if(ixti < 0) ixti = -ixti;
|
if(ixti < 0) ixti = -ixti;
|
||||||
@ -12893,7 +12893,7 @@ var dimregex = /"(\w*:\w*)"/;
|
|||||||
var colregex = /<(?:\w:)?col\b[^>]*[\/]?>/g;
|
var colregex = /<(?:\w:)?col\b[^>]*[\/]?>/g;
|
||||||
var afregex = /<(?:\w:)?autoFilter[^>]*([\/]|>([\s\S]*)<\/(?:\w:)?autoFilter)>/g;
|
var afregex = /<(?:\w:)?autoFilter[^>]*([\/]|>([\s\S]*)<\/(?:\w:)?autoFilter)>/g;
|
||||||
var marginregex= /<(?:\w:)?pageMargins[^>]*\/>/g;
|
var marginregex= /<(?:\w:)?pageMargins[^>]*\/>/g;
|
||||||
var sheetprregex = /<(?:\w:)?sheetPr(?:[^>a-z][^>]*)?\/>/;
|
var sheetprregex = /<(?:\w:)?sheetPr\b(?:[^>a-z][^>]*)?\/>/;
|
||||||
var svsregex = /<(?:\w:)?sheetViews[^>]*(?:[\/]|>([\s\S]*)<\/(?:\w:)?sheetViews)>/;
|
var svsregex = /<(?:\w:)?sheetViews[^>]*(?:[\/]|>([\s\S]*)<\/(?:\w:)?sheetViews)>/;
|
||||||
/* 18.3 Worksheets */
|
/* 18.3 Worksheets */
|
||||||
function parse_ws_xml(data/*:?string*/, opts, idx/*:number*/, rels, wb/*:WBWBProps*/, themes, styles)/*:Worksheet*/ {
|
function parse_ws_xml(data/*:?string*/, opts, idx/*:number*/, rels, wb/*:WBWBProps*/, themes, styles)/*:Worksheet*/ {
|
||||||
@ -13227,11 +13227,11 @@ return function parse_ws_xml_data(sdata/*:string*/, s, opts, guess/*:Range*/, th
|
|||||||
} else if(/*::cref != null && cref[0] != null && */cref[0].indexOf('t="shared"') > -1) {
|
} else if(/*::cref != null && cref[0] != null && */cref[0].indexOf('t="shared"') > -1) {
|
||||||
// TODO: parse formula
|
// TODO: parse formula
|
||||||
ftag = parsexmltag(cref[0]);
|
ftag = parsexmltag(cref[0]);
|
||||||
sharedf[parseInt(ftag.si, 10)] = [ftag, _xlfn(unescapexml(utf8read(cref[1])))];
|
sharedf[parseInt(ftag.si, 10)] = [ftag, _xlfn(unescapexml(utf8read(cref[1]))), tag.r];
|
||||||
}
|
}
|
||||||
} else if((cref=d.match(/<f[^>]*\/>/))) {
|
} else if((cref=d.match(/<f[^>]*\/>/))) {
|
||||||
ftag = parsexmltag(cref[0]);
|
ftag = parsexmltag(cref[0]);
|
||||||
if(sharedf[ftag.si]) p.f = shift_formula_xlsx(sharedf[ftag.si][1], sharedf[ftag.si][0].ref, tag.r);
|
if(sharedf[ftag.si]) p.f = shift_formula_xlsx(sharedf[ftag.si][1], sharedf[ftag.si][2]/*[0].ref*/, tag.r);
|
||||||
}
|
}
|
||||||
/* TODO: factor out contains logic */
|
/* TODO: factor out contains logic */
|
||||||
var _tag = decode_cell(tag.r);
|
var _tag = decode_cell(tag.r);
|
||||||
@ -13901,7 +13901,7 @@ function parse_ws_bin(data, _opts, idx, rels, wb/*:WBWBProps*/, themes, styles)/
|
|||||||
|
|
||||||
var arrayf/*:Array<[Range, string]>*/ = [];
|
var arrayf/*:Array<[Range, string]>*/ = [];
|
||||||
var sharedf = {};
|
var sharedf = {};
|
||||||
var supbooks = opts.supbooks || ([[]]/*:any*/);
|
var supbooks = opts.supbooks || wb.supbooks || ([[]]/*:any*/);
|
||||||
supbooks.sharedf = sharedf;
|
supbooks.sharedf = sharedf;
|
||||||
supbooks.arrayf = arrayf;
|
supbooks.arrayf = arrayf;
|
||||||
supbooks.SheetNames = wb.SheetNames || wb.Sheets.map(function(x) { return x.name; });
|
supbooks.SheetNames = wb.SheetNames || wb.Sheets.map(function(x) { return x.name; });
|
||||||
|
12
xlsx.js
generated
12
xlsx.js
generated
@ -4,7 +4,7 @@
|
|||||||
/*global global, exports, module, require:false, process:false, Buffer:false, ArrayBuffer:false */
|
/*global global, exports, module, require:false, process:false, Buffer:false, ArrayBuffer:false */
|
||||||
var XLSX = {};
|
var XLSX = {};
|
||||||
function make_xlsx_lib(XLSX){
|
function make_xlsx_lib(XLSX){
|
||||||
XLSX.version = '0.14.2';
|
XLSX.version = '0.14.3';
|
||||||
var current_codepage = 1200, current_ansi = 1252;
|
var current_codepage = 1200, current_ansi = 1252;
|
||||||
/*global cptable:true, window */
|
/*global cptable:true, window */
|
||||||
if(typeof module !== "undefined" && typeof require !== 'undefined') {
|
if(typeof module !== "undefined" && typeof require !== 'undefined') {
|
||||||
@ -10918,9 +10918,9 @@ function formula_quote_sheet_name(sname, opts) {
|
|||||||
}
|
}
|
||||||
function get_ixti_raw(supbooks, ixti, opts) {
|
function get_ixti_raw(supbooks, ixti, opts) {
|
||||||
if(!supbooks) return "SH33TJSERR0";
|
if(!supbooks) return "SH33TJSERR0";
|
||||||
|
if(opts.biff > 8 && (!supbooks.XTI || !supbooks.XTI[ixti])) return supbooks.SheetNames[ixti];
|
||||||
if(!supbooks.XTI) return "SH33TJSERR6";
|
if(!supbooks.XTI) return "SH33TJSERR6";
|
||||||
var XTI = supbooks.XTI[ixti];
|
var XTI = supbooks.XTI[ixti];
|
||||||
if(opts.biff > 8 && !supbooks.XTI[ixti]) return supbooks.SheetNames[ixti];
|
|
||||||
if(opts.biff < 8) {
|
if(opts.biff < 8) {
|
||||||
if(ixti > 10000) ixti-= 65536;
|
if(ixti > 10000) ixti-= 65536;
|
||||||
if(ixti < 0) ixti = -ixti;
|
if(ixti < 0) ixti = -ixti;
|
||||||
@ -12792,7 +12792,7 @@ var dimregex = /"(\w*:\w*)"/;
|
|||||||
var colregex = /<(?:\w:)?col\b[^>]*[\/]?>/g;
|
var colregex = /<(?:\w:)?col\b[^>]*[\/]?>/g;
|
||||||
var afregex = /<(?:\w:)?autoFilter[^>]*([\/]|>([\s\S]*)<\/(?:\w:)?autoFilter)>/g;
|
var afregex = /<(?:\w:)?autoFilter[^>]*([\/]|>([\s\S]*)<\/(?:\w:)?autoFilter)>/g;
|
||||||
var marginregex= /<(?:\w:)?pageMargins[^>]*\/>/g;
|
var marginregex= /<(?:\w:)?pageMargins[^>]*\/>/g;
|
||||||
var sheetprregex = /<(?:\w:)?sheetPr(?:[^>a-z][^>]*)?\/>/;
|
var sheetprregex = /<(?:\w:)?sheetPr\b(?:[^>a-z][^>]*)?\/>/;
|
||||||
var svsregex = /<(?:\w:)?sheetViews[^>]*(?:[\/]|>([\s\S]*)<\/(?:\w:)?sheetViews)>/;
|
var svsregex = /<(?:\w:)?sheetViews[^>]*(?:[\/]|>([\s\S]*)<\/(?:\w:)?sheetViews)>/;
|
||||||
/* 18.3 Worksheets */
|
/* 18.3 Worksheets */
|
||||||
function parse_ws_xml(data, opts, idx, rels, wb, themes, styles) {
|
function parse_ws_xml(data, opts, idx, rels, wb, themes, styles) {
|
||||||
@ -13126,11 +13126,11 @@ return function parse_ws_xml_data(sdata, s, opts, guess, themes, styles) {
|
|||||||
} else if(cref[0].indexOf('t="shared"') > -1) {
|
} else if(cref[0].indexOf('t="shared"') > -1) {
|
||||||
// TODO: parse formula
|
// TODO: parse formula
|
||||||
ftag = parsexmltag(cref[0]);
|
ftag = parsexmltag(cref[0]);
|
||||||
sharedf[parseInt(ftag.si, 10)] = [ftag, _xlfn(unescapexml(utf8read(cref[1])))];
|
sharedf[parseInt(ftag.si, 10)] = [ftag, _xlfn(unescapexml(utf8read(cref[1]))), tag.r];
|
||||||
}
|
}
|
||||||
} else if((cref=d.match(/<f[^>]*\/>/))) {
|
} else if((cref=d.match(/<f[^>]*\/>/))) {
|
||||||
ftag = parsexmltag(cref[0]);
|
ftag = parsexmltag(cref[0]);
|
||||||
if(sharedf[ftag.si]) p.f = shift_formula_xlsx(sharedf[ftag.si][1], sharedf[ftag.si][0].ref, tag.r);
|
if(sharedf[ftag.si]) p.f = shift_formula_xlsx(sharedf[ftag.si][1], sharedf[ftag.si][2]/*[0].ref*/, tag.r);
|
||||||
}
|
}
|
||||||
/* TODO: factor out contains logic */
|
/* TODO: factor out contains logic */
|
||||||
var _tag = decode_cell(tag.r);
|
var _tag = decode_cell(tag.r);
|
||||||
@ -13799,7 +13799,7 @@ function parse_ws_bin(data, _opts, idx, rels, wb, themes, styles) {
|
|||||||
|
|
||||||
var arrayf = [];
|
var arrayf = [];
|
||||||
var sharedf = {};
|
var sharedf = {};
|
||||||
var supbooks = opts.supbooks || ([[]]);
|
var supbooks = opts.supbooks || wb.supbooks || ([[]]);
|
||||||
supbooks.sharedf = sharedf;
|
supbooks.sharedf = sharedf;
|
||||||
supbooks.arrayf = arrayf;
|
supbooks.arrayf = arrayf;
|
||||||
supbooks.SheetNames = wb.SheetNames || wb.Sheets.map(function(x) { return x.name; });
|
supbooks.SheetNames = wb.SheetNames || wb.Sheets.map(function(x) { return x.name; });
|
||||||
|
Loading…
Reference in New Issue
Block a user