Skip to content

Commit 32f76ee

Browse files
Merge pull request #80 from securedeveloper/issues-fixes
fixes of issues
2 parents d65eeb3 + 0144afc commit 32f76ee

File tree

4 files changed

+82
-13
lines changed

4 files changed

+82
-13
lines changed

dist/ExcelPlugin/components/ExcelFile.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ var _propTypes2 = _interopRequireDefault(_propTypes);
1616

1717
var _fileSaver = require("file-saver");
1818

19-
var _xlsx = require("xlsx");
19+
var _tempaXlsx = require("tempa-xlsx");
2020

21-
var _xlsx2 = _interopRequireDefault(_xlsx);
21+
var _tempaXlsx2 = _interopRequireDefault(_tempaXlsx);
2222

2323
var _ExcelSheet = require("../elements/ExcelSheet");
2424

@@ -101,7 +101,7 @@ var ExcelFile = function (_React$Component) {
101101

102102
var fileExtension = this.getFileExtension();
103103
var fileName = this.getFileName();
104-
var wbout = _xlsx2.default.write(wb, { bookType: fileExtension, bookSST: true, type: 'binary' });
104+
var wbout = _tempaXlsx2.default.write(wb, { bookType: fileExtension, bookSST: true, type: 'binary' });
105105

106106
(0, _fileSaver.saveAs)(new Blob([(0, _DataUtil.strToArrBuffer)(wbout)], { type: "application/octet-stream" }), fileName);
107107
}

dist/ExcelPlugin/utils/DataUtil.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ exports.excelSheetFromDataSet = exports.excelSheetFromAoA = exports.dateToNumber
77

88
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; };
99

10-
var _xlsx = require('xlsx');
10+
var _tempaXlsx = require('tempa-xlsx');
1111

12-
var _xlsx2 = _interopRequireDefault(_xlsx);
12+
var _tempaXlsx2 = _interopRequireDefault(_tempaXlsx);
1313

1414
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
1515

@@ -67,7 +67,7 @@ var excelSheetFromDataSet = function excelSheetFromDataSet(dataSet) {
6767
var columnsWidth = [];
6868
if (columns.length >= 0) {
6969
columns.forEach(function (col, index) {
70-
var cellRef = _xlsx2.default.utils.encode_cell({ c: xSteps + index, r: rowCount });
70+
var cellRef = _tempaXlsx2.default.utils.encode_cell({ c: xSteps + index, r: rowCount });
7171
fixRange(range, 0, 0, rowCount, xSteps, ySteps);
7272
var colTitle = col;
7373
if ((typeof col === 'undefined' ? 'undefined' : _typeof(col)) === 'object') {
@@ -86,15 +86,15 @@ var excelSheetFromDataSet = function excelSheetFromDataSet(dataSet) {
8686

8787
for (var R = 0; R != data.length; ++R, rowCount++) {
8888
for (var C = 0; C != data[R].length; ++C) {
89-
var cellRef = _xlsx2.default.utils.encode_cell({ c: C + xSteps, r: rowCount });
89+
var cellRef = _tempaXlsx2.default.utils.encode_cell({ c: C + xSteps, r: rowCount });
9090
fixRange(range, R, C, rowCount, xSteps, ySteps);
9191
getCell(data[R][C], cellRef, ws);
9292
}
9393
}
9494
});
9595

9696
if (range.s.c < 10000000) {
97-
ws['!ref'] = _xlsx2.default.utils.encode_range(range);
97+
ws['!ref'] = _tempaXlsx2.default.utils.encode_range(range);
9898
}
9999

100100
return ws;
@@ -129,7 +129,7 @@ function getCell(v, cellRef, ws) {
129129
cell.t = 'b';
130130
} else if (isDate) {
131131
cell.t = 'n';
132-
cell.z = _xlsx2.default.SSF._table[14];
132+
cell.z = _tempaXlsx2.default.SSF._table[14];
133133
cell.v = dateToNumber(cell.v);
134134
} else {
135135
cell.t = 's';
@@ -182,14 +182,14 @@ var excelSheetFromAoA = function excelSheetFromAoA(data) {
182182
continue;
183183
}
184184

185-
var cellRef = _xlsx2.default.utils.encode_cell({ c: C, r: R });
185+
var cellRef = _tempaXlsx2.default.utils.encode_cell({ c: C, r: R });
186186
if (typeof cell.v === 'number') {
187187
cell.t = 'n';
188188
} else if (typeof cell.v === 'boolean') {
189189
cell.t = 'b';
190190
} else if (cell.v instanceof Date) {
191191
cell.t = 'n';
192-
cell.z = _xlsx2.default.SSF._table[14];
192+
cell.z = _tempaXlsx2.default.SSF._table[14];
193193
cell.v = dateToNumber(cell.v);
194194
} else {
195195
cell.t = 's';
@@ -200,7 +200,7 @@ var excelSheetFromAoA = function excelSheetFromAoA(data) {
200200
}
201201

202202
if (range.s.c < 10000000) {
203-
ws['!ref'] = _xlsx2.default.utils.encode_range(range);
203+
ws['!ref'] = _tempaXlsx2.default.utils.encode_range(range);
204204
}
205205

206206
return ws;

package-lock.json

Lines changed: 68 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@
5050
"prop-types": "15.6.0",
5151
"react": "16.0.0",
5252
"react-dom": "16.0.0",
53-
"standard-version": "^4.4.0"
53+
"standard-version": "^4.4.0",
54+
"xlsx": "^0.14.0"
5455
},
5556
"scripts": {
5657
"commitmsg": "commitlint -e $GIT_PARAMS",

0 commit comments

Comments
 (0)