diff --git a/dist/ExcelPlugin/components/ExcelFile.js b/dist/ExcelPlugin/components/ExcelFile.js index ae7d84ba..4d1c53c7 100644 --- a/dist/ExcelPlugin/components/ExcelFile.js +++ b/dist/ExcelPlugin/components/ExcelFile.js @@ -16,9 +16,9 @@ var _propTypes2 = _interopRequireDefault(_propTypes); var _fileSaver = require("file-saver"); -var _tempaXlsx = require("tempa-xlsx"); +var _xlsx = require("xlsx"); -var _tempaXlsx2 = _interopRequireDefault(_tempaXlsx); +var _xlsx2 = _interopRequireDefault(_xlsx); var _ExcelSheet = require("../elements/ExcelSheet"); @@ -101,7 +101,7 @@ var ExcelFile = function (_React$Component) { var fileExtension = this.getFileExtension(); var fileName = this.getFileName(); - var wbout = _tempaXlsx2.default.write(wb, { bookType: fileExtension, bookSST: true, type: 'binary' }); + var wbout = _xlsx2.default.write(wb, { bookType: fileExtension, bookSST: true, type: 'binary' }); (0, _fileSaver.saveAs)(new Blob([(0, _DataUtil.strToArrBuffer)(wbout)], { type: "application/octet-stream" }), fileName); } diff --git a/dist/ExcelPlugin/utils/DataUtil.js b/dist/ExcelPlugin/utils/DataUtil.js index 8b6ce80a..0c9211fd 100644 --- a/dist/ExcelPlugin/utils/DataUtil.js +++ b/dist/ExcelPlugin/utils/DataUtil.js @@ -7,9 +7,9 @@ exports.excelSheetFromDataSet = exports.excelSheetFromAoA = exports.dateToNumber var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; -var _tempaXlsx = require('tempa-xlsx'); +var _xlsx = require('xlsx'); -var _tempaXlsx2 = _interopRequireDefault(_tempaXlsx); +var _xlsx2 = _interopRequireDefault(_xlsx); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -66,7 +66,7 @@ var excelSheetFromDataSet = function excelSheetFromDataSet(dataSet) { if (columns.length >= 0) { columns.forEach(function (col, index) { - var cellRef = _tempaXlsx2.default.utils.encode_cell({ c: xSteps + index, r: rowCount }); + var cellRef = _xlsx2.default.utils.encode_cell({ c: xSteps + index, r: rowCount }); fixRange(range, 0, 0, rowCount, xSteps, ySteps); getHeaderCell(col, cellRef, ws); }); @@ -76,7 +76,7 @@ var excelSheetFromDataSet = function excelSheetFromDataSet(dataSet) { for (var R = 0; R != data.length; ++R, rowCount++) { for (var C = 0; C != data[R].length; ++C) { - var cellRef = _tempaXlsx2.default.utils.encode_cell({ c: C + xSteps, r: rowCount }); + var cellRef = _xlsx2.default.utils.encode_cell({ c: C + xSteps, r: rowCount }); fixRange(range, R, C, rowCount, xSteps, ySteps); getCell(data[R][C], cellRef, ws); } @@ -84,7 +84,7 @@ var excelSheetFromDataSet = function excelSheetFromDataSet(dataSet) { }); if (range.s.c < 10000000) { - ws['!ref'] = _tempaXlsx2.default.utils.encode_range(range); + ws['!ref'] = _xlsx2.default.utils.encode_range(range); } return ws; @@ -112,7 +112,7 @@ function getCell(v, cellRef, ws) { cell.t = 'b'; } else if (v instanceof Date) { cell.t = 'n'; - cell.z = _tempaXlsx2.default.SSF._table[14]; + cell.z = _xlsx2.default.SSF._table[14]; cell.v = dateToNumber(cell.v); } else if ((typeof v === 'undefined' ? 'undefined' : _typeof(v)) === 'object') { cell.v = v.value; @@ -169,14 +169,14 @@ var excelSheetFromAoA = function excelSheetFromAoA(data) { continue; } - var cellRef = _tempaXlsx2.default.utils.encode_cell({ c: C, r: R }); + var cellRef = _xlsx2.default.utils.encode_cell({ c: C, r: R }); if (typeof cell.v === 'number') { cell.t = 'n'; } else if (typeof cell.v === 'boolean') { cell.t = 'b'; } else if (cell.v instanceof Date) { cell.t = 'n'; - cell.z = _tempaXlsx2.default.SSF._table[14]; + cell.z = _xlsx2.default.SSF._table[14]; cell.v = dateToNumber(cell.v); } else { cell.t = 's'; @@ -187,7 +187,7 @@ var excelSheetFromAoA = function excelSheetFromAoA(data) { } if (range.s.c < 10000000) { - ws['!ref'] = _tempaXlsx2.default.utils.encode_range(range); + ws['!ref'] = _xlsx2.default.utils.encode_range(range); } return ws; diff --git a/package-lock.json b/package-lock.json index eb461199..b2a9b396 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11405,27 +11405,6 @@ } } }, - "tempa-xlsx": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/tempa-xlsx/-/tempa-xlsx-0.0.1.tgz", - "integrity": "sha512-rGIrFV2ZuuvSzucx+Nn2A8ndP77NyruJsEOlfXdnGVco6LmBBJfs9r5Re3E+ffnXNh6H5PonzsO3YVF4lv8TGg==", - "requires": { - "adler-32": "1.2.0", - "cfb": "1.0.5", - "codepage": "1.3.8", - "commander": "2.15.1", - "crc-32": "1.2.0", - "jszip": "2.4.0", - "ssf": "0.8.2" - }, - "dependencies": { - "commander": { - "version": "2.15.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", - "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==" - } - } - }, "test-exclude": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-4.2.1.tgz", diff --git a/package.json b/package.json index 32e03be5..f615c5cc 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,6 @@ "homepage": "https://github.com/securedeveloper/react-data-export#readme", "dependencies": { "file-saver": "1.3.3", - "tempa-xlsx": "0.0.1", "xlsx": "git+https://github.com/securedeveloper/js-xlsx.git" }, "devDependencies": { diff --git a/src/ExcelPlugin/components/ExcelFile.js b/src/ExcelPlugin/components/ExcelFile.js index 753a257b..ecb61d97 100644 --- a/src/ExcelPlugin/components/ExcelFile.js +++ b/src/ExcelPlugin/components/ExcelFile.js @@ -1,7 +1,7 @@ import React from "react"; import PropTypes from "prop-types"; import {saveAs} from "file-saver"; -import XLSX from "tempa-xlsx"; +import XLSX from "xlsx"; import ExcelSheet from "../elements/ExcelSheet"; import {strToArrBuffer, excelSheetFromAoA, excelSheetFromDataSet} from "../utils/DataUtil"; diff --git a/src/ExcelPlugin/utils/DataUtil.js b/src/ExcelPlugin/utils/DataUtil.js index 90e3020b..13f6b110 100644 --- a/src/ExcelPlugin/utils/DataUtil.js +++ b/src/ExcelPlugin/utils/DataUtil.js @@ -1,4 +1,4 @@ -import XLSX from "tempa-xlsx"; +import XLSX from "xlsx"; const strToArrBuffer = (s) => { var buf = new ArrayBuffer(s.length);