XLSX verify formula is string (fixes #1703)

赵风昭 · SheetJSDev · SheetJSDev · commit 0cc6cc962775 · 2020-09-08T20:18:48.000-04:00
Co-authored-by: SheetJS &lt;dev@sheetjs.com&gt;
diff --git a/bits/67_wsxml.js b/bits/67_wsxml.js
@@ -242,7 +242,7 @@ function write_ws_xml_sheetviews(ws, opts, idx, wb)/*:string*/ {
 }
 
 function write_ws_xml_cell(cell/*:Cell*/, ref, ws, opts/*::, idx, wb*/)/*:string*/ {
-	if(cell.v === undefined && cell.f === undefined || cell.t === 'z') return "";
+	if(cell.v === undefined && typeof cell.f !== "string" || cell.t === 'z') return "";
 	var vv = "";
 	var oldt = cell.t, oldv = cell.v;
 	if(cell.t !== "z") switch(cell.t) {
@@ -278,7 +278,7 @@ function write_ws_xml_cell(cell/*:Cell*/, ref, ws, opts/*::, idx, wb*/)/*:string
 			o.t = "str"; break;
 	}
 	if(cell.t != oldt) { cell.t = oldt; cell.v = oldv; }
-	if(cell.f) {
+	if(typeof cell.f == "string" && cell.f) {
 		var ff = cell.F && cell.F.slice(0, ref.length) == ref ? {t:"array", ref:cell.F} : null;
 		v = writextag('f', escapexml(cell.f), ff) + (cell.v != null ? v : "");
 	}

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ function write_ws_xml_sheetviews(ws, opts, idx, wb)/:string/ {`
`242`	`242`	`}`
`243`	`243`
`244`	`244`	`function write_ws_xml_cell(cell/:Cell/, ref, ws, opts/::, idx, wb/)/:string/ {`
`245`		`- if(cell.v === undefined && cell.f === undefined \|\| cell.t === 'z') return "";`
	`245`	`+ if(cell.v === undefined && typeof cell.f !== "string" \|\| cell.t === 'z') return "";`
`246`	`246`	`var vv = "";`
`247`	`247`	`var oldt = cell.t, oldv = cell.v;`
`248`	`248`	`if(cell.t !== "z") switch(cell.t) {`
`@@ -278,7 +278,7 @@ function write_ws_xml_cell(cell/:Cell/, ref, ws, opts/::, idx, wb/)/*:string`
`278`	`278`	`o.t = "str"; break;`
`279`	`279`	`}`
`280`	`280`	`if(cell.t != oldt) { cell.t = oldt; cell.v = oldv; }`
`281`		`- if(cell.f) {`
	`281`	`+ if(typeof cell.f == "string" && cell.f) {`
`282`	`282`	`var ff = cell.F && cell.F.slice(0, ref.length) == ref ? {t:"array", ref:cell.F} : null;`
`283`	`283`	`v = writextag('f', escapexml(cell.f), ff) + (cell.v != null ? v : "");`
`284`	`284`	`}`