From 1b2df1c584ec68614e7c2062a2599dfddfabe026 Mon Sep 17 00:00:00 2001 From: Yugam18 Date: Wed, 21 Jun 2017 12:41:33 +0530 Subject: [PATCH 1/4] Update xlsx.js --- xlsx.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xlsx.js b/xlsx.js index 6bca3c673..e760c9d78 100644 --- a/xlsx.js +++ b/xlsx.js @@ -7682,7 +7682,7 @@ function write_ws_xml_cols(ws, cols) { } function write_ws_xml_cell(cell, ref, ws, opts, idx, wb) { - if (cell.v === undefined && cell.s === undefined) return ""; + if ( ! (cell.v || cell.s || cell.f ) ) return ""; var vv = ""; var oldt = cell.t, oldv = cell.v; switch (cell.t) { @@ -7707,7 +7707,8 @@ function write_ws_xml_cell(cell, ref, ws, opts, idx, wb) { vv = cell.v; break; } - var v = writetag('v', escapexml(vv)), o = {r: ref}; + var o = { r: ref }; + var v = cell.f ? writetag('f', escapexml(cell.f)) : writetag('v', escapexml(vv)); /* TODO: cell style */ var os = get_cell_style(opts.cellXfs, cell, opts); if (os !== 0) o.s = os; From 0f55358e44a0824f46213785e4b7459b3a02859a Mon Sep 17 00:00:00 2001 From: Yugam18 Date: Wed, 21 Jun 2017 14:42:57 +0530 Subject: [PATCH 2/4] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1c041277c..b53c986f3 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "bin": { "xlsx": "./bin/xlsx.njs" }, - "main": "./xlsx", + "main": "./xlsx-style", "dependencies": { "ssf":"~0.8.1", "codepage":"~1.3.6", From 44037cfabfb5528a09d697a50fbd07894825fcb6 Mon Sep 17 00:00:00 2001 From: Yugam18 Date: Wed, 21 Jun 2017 14:54:37 +0530 Subject: [PATCH 3/4] Update package.json --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index b53c986f3..8aa555ed1 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,13 @@ { - "name": "xlsx", - "version": "0.8.20", + "name": "itt-xlsx", + "version": "0.1.0", "author": "sheetjs", - "description": "Excel (XLSB/XLSX/XLSM/XLS/XML) and ODS spreadsheet parser and writer (extended to enable read/write of cell formats with xlsx files)", + "description": "A fork of xlsx-style with formula. Excel (XLSB/XLSX/XLSM/XLS/XML) and ODS spreadsheet parser and writer (extended to enable read/write of cell formats with xlsx files)", "keywords": [ "excel", "xls", "xlsx", "xlsb", "xlsm", "ods", "office", "spreadsheet" ], "bin": { "xlsx": "./bin/xlsx.njs" }, - "main": "./xlsx-style", + "main": "./itt-xlsx", "dependencies": { "ssf":"~0.8.1", "codepage":"~1.3.6", @@ -23,7 +23,7 @@ "xlsjs":"", "uglify-js":"" }, - "repository": { "type":"git", "url":"git://github.com/protobi/js-xlsx.git#beta" }, + "repository": { "type":"git", "url":"https://github.com/InTimeTecGitHub/js-xlsx.git" }, "scripts": { "pretest": "git submodule init && git submodule update", "test": "make test" From dd3a8e5caf1b0d4d79e0ecc6a3b074ce9ab77947 Mon Sep 17 00:00:00 2001 From: Yugam18 Date: Wed, 21 Jun 2017 15:58:19 +0530 Subject: [PATCH 4/4] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8aa555ed1..8bd956790 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "bin": { "xlsx": "./bin/xlsx.njs" }, - "main": "./itt-xlsx", + "main": "./xlsx", "dependencies": { "ssf":"~0.8.1", "codepage":"~1.3.6",