Skip to content

Commit 9351135

Browse files
securedevelopersecuredeveloper
authored
Merge pull request #17 from securedeveloper/release
Add support for multiple datasets
2 parents 2f21e50 + 4f78c6c commit 9351135

File tree

11 files changed

+246
-164
lines changed

11 files changed

+246
-164
lines changed

‎dist/components/ExcelFile.js

+13-49
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,7 @@ Object.defineProperty(exports, "__esModule", {
44
value: true
55
});
66

7-
var _createClass = function () {
8-
function defineProperties(target, props) {
9-
for (var i = 0; i < props.length; i++) {
10-
var descriptor = props[i];
11-
descriptor.enumerable = descriptor.enumerable || false;
12-
descriptor.configurable = true;
13-
if ("value" in descriptor) descriptor.writable = true;
14-
Object.defineProperty(target, descriptor.key, descriptor);
15-
}
16-
}
17-
18-
return function (Constructor, protoProps, staticProps) {
19-
if (protoProps) defineProperties(Constructor.prototype, protoProps);
20-
if (staticProps) defineProperties(Constructor, staticProps);
21-
return Constructor;
22-
};
23-
}();
7+
var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
248

259
var _react = require("react");
2610

@@ -42,37 +26,13 @@ var _ExcelSheet2 = _interopRequireDefault(_ExcelSheet);
4226

4327
var _DataUtil = require("../utils/DataUtil");
4428

45-
function _interopRequireDefault(obj) {
46-
return obj && obj.__esModule ? obj : {default: obj};
47-
}
29+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
4830

49-
function _classCallCheck(instance, Constructor) {
50-
if (!(instance instanceof Constructor)) {
51-
throw new TypeError("Cannot call a class as a function");
52-
}
53-
}
31+
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
5432

55-
function _possibleConstructorReturn(self, call) {
56-
if (!self) {
57-
throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
58-
}
59-
return call && (typeof call === "object" || typeof call === "function") ? call : self;
60-
}
33+
function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
6134

62-
function _inherits(subClass, superClass) {
63-
if (typeof superClass !== "function" && superClass !== null) {
64-
throw new TypeError("Super expression must either be null or a function, not " + typeof superClass);
65-
}
66-
subClass.prototype = Object.create(superClass && superClass.prototype, {
67-
constructor: {
68-
value: subClass,
69-
enumerable: false,
70-
writable: true,
71-
configurable: true
72-
}
73-
});
74-
if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass;
75-
}
35+
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
7636

7737
var ExcelFile = function (_React$Component) {
7838
_inherits(ExcelFile, _React$Component);
@@ -124,18 +84,22 @@ var ExcelFile = function (_React$Component) {
12484
};
12585

12686
_react2.default.Children.forEach(this.props.children, function (sheet) {
127-
wb.Sheets[sheet.props.name] = (0, _DataUtil.excelSheetFromAoA)(_this2.createSheetData(sheet));
87+
if (typeof sheet.props.dataSet === 'undefined' || sheet.props.dataSet.length === 0) {
88+
wb.Sheets[sheet.props.name] = (0, _DataUtil.excelSheetFromAoA)(_this2.createSheetData(sheet));
89+
} else {
90+
wb.Sheets[sheet.props.name] = (0, _DataUtil.excelSheetFromDataSet)(sheet.props.dataSet);
91+
}
12892
});
12993

130-
var wbout = _xlsx2.default.write(wb, {bookType: 'xlsx', bookSST: true, type: 'binary'});
131-
(0, _fileSaver.saveAs)(new Blob([(0, _DataUtil.strToArrBuffer)(wbout)], {type: "application/octet-stream"}), this.props.filename);
94+
var wbout = _xlsx2.default.write(wb, { bookType: 'xlsx', bookSST: true, type: 'binary' });
95+
(0, _fileSaver.saveAs)(new Blob([(0, _DataUtil.strToArrBuffer)(wbout)], { type: "application/octet-stream" }), this.props.filename);
13296
}
13397
}, {
13498
key: "render",
13599
value: function render() {
136100
return _react2.default.createElement(
137101
"span",
138-
{onClick: this.handleDownload},
102+
{ onClick: this.handleDownload },
139103
this.props.element
140104
);
141105
}

‎dist/elements/ExcelColumn.js

+5-45
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,7 @@ Object.defineProperty(exports, "__esModule", {
44
value: true
55
});
66

7-
var _createClass = function () {
8-
function defineProperties(target, props) {
9-
for (var i = 0; i < props.length; i++) {
10-
var descriptor = props[i];
11-
descriptor.enumerable = descriptor.enumerable || false;
12-
descriptor.configurable = true;
13-
if ("value" in descriptor) descriptor.writable = true;
14-
Object.defineProperty(target, descriptor.key, descriptor);
15-
}
16-
}
17-
18-
return function (Constructor, protoProps, staticProps) {
19-
if (protoProps) defineProperties(Constructor.prototype, protoProps);
20-
if (staticProps) defineProperties(Constructor, staticProps);
21-
return Constructor;
22-
};
23-
}();
7+
var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
248

259
var _react = require("react");
2610

@@ -30,37 +14,13 @@ var _propTypes = require("prop-types");
3014

3115
var _propTypes2 = _interopRequireDefault(_propTypes);
3216

33-
function _interopRequireDefault(obj) {
34-
return obj && obj.__esModule ? obj : {default: obj};
35-
}
17+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
3618

37-
function _classCallCheck(instance, Constructor) {
38-
if (!(instance instanceof Constructor)) {
39-
throw new TypeError("Cannot call a class as a function");
40-
}
41-
}
19+
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
4220

43-
function _possibleConstructorReturn(self, call) {
44-
if (!self) {
45-
throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
46-
}
47-
return call && (typeof call === "object" || typeof call === "function") ? call : self;
48-
}
21+
function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
4922

50-
function _inherits(subClass, superClass) {
51-
if (typeof superClass !== "function" && superClass !== null) {
52-
throw new TypeError("Super expression must either be null or a function, not " + typeof superClass);
53-
}
54-
subClass.prototype = Object.create(superClass && superClass.prototype, {
55-
constructor: {
56-
value: subClass,
57-
enumerable: false,
58-
writable: true,
59-
configurable: true
60-
}
61-
});
62-
if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass;
63-
}
23+
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
6424

6525
var ExcelColumn = function (_React$Component) {
6626
_inherits(ExcelColumn, _React$Component);

‎dist/elements/ExcelSheet.js

+7-45
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,7 @@ Object.defineProperty(exports, "__esModule", {
44
value: true
55
});
66

7-
var _createClass = function () {
8-
function defineProperties(target, props) {
9-
for (var i = 0; i < props.length; i++) {
10-
var descriptor = props[i];
11-
descriptor.enumerable = descriptor.enumerable || false;
12-
descriptor.configurable = true;
13-
if ("value" in descriptor) descriptor.writable = true;
14-
Object.defineProperty(target, descriptor.key, descriptor);
15-
}
16-
}
17-
18-
return function (Constructor, protoProps, staticProps) {
19-
if (protoProps) defineProperties(Constructor.prototype, protoProps);
20-
if (staticProps) defineProperties(Constructor, staticProps);
21-
return Constructor;
22-
};
23-
}();
7+
var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
248

259
var _react = require("react");
2610

@@ -34,37 +18,13 @@ var _ExcelColumn = require("./ExcelColumn");
3418

3519
var _ExcelColumn2 = _interopRequireDefault(_ExcelColumn);
3620

37-
function _interopRequireDefault(obj) {
38-
return obj && obj.__esModule ? obj : {default: obj};
39-
}
21+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
4022

41-
function _classCallCheck(instance, Constructor) {
42-
if (!(instance instanceof Constructor)) {
43-
throw new TypeError("Cannot call a class as a function");
44-
}
45-
}
23+
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
4624

47-
function _possibleConstructorReturn(self, call) {
48-
if (!self) {
49-
throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
50-
}
51-
return call && (typeof call === "object" || typeof call === "function") ? call : self;
52-
}
25+
function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
5326

54-
function _inherits(subClass, superClass) {
55-
if (typeof superClass !== "function" && superClass !== null) {
56-
throw new TypeError("Super expression must either be null or a function, not " + typeof superClass);
57-
}
58-
subClass.prototype = Object.create(superClass && superClass.prototype, {
59-
constructor: {
60-
value: subClass,
61-
enumerable: false,
62-
writable: true,
63-
configurable: true
64-
}
65-
});
66-
if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass;
67-
}
27+
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
6828

6929
var ExcelSheet = function (_React$Component) {
7030
_inherits(ExcelSheet, _React$Component);
@@ -87,6 +47,8 @@ var ExcelSheet = function (_React$Component) {
8747

8848
ExcelSheet.propsTypes = {
8949
name: _propTypes2.default.string.isRequired,
50+
data: _propTypes2.default.arrayOf(_propTypes2.default.object),
51+
dataSet: _propTypes2.default.arrayOf(_propTypes2.default.object),
9052
value: _propTypes2.default.oneOfType([_propTypes2.default.array, _propTypes2.default.func]).isRequired,
9153
children: _propTypes2.default.arrayOf(function (propValue, key) {
9254
var type = propValue[key];

‎dist/index.js

+12-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
"use strict";
22

3+
Object.defineProperty(exports, "__esModule", {
4+
value: true
5+
});
6+
exports.ExcelColumn = exports.ExcelSheet = undefined;
7+
38
var _ExcelFile = require("./components/ExcelFile");
49

510
var _ExcelFile2 = _interopRequireDefault(_ExcelFile);
@@ -12,12 +17,11 @@ var _ExcelColumn = require("./elements/ExcelColumn");
1217

1318
var _ExcelColumn2 = _interopRequireDefault(_ExcelColumn);
1419

15-
function _interopRequireDefault(obj) {
16-
return obj && obj.__esModule ? obj : {default: obj};
17-
}
20+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
21+
22+
_ExcelFile2.default.ExcelSheet = _ExcelSheet2.default;
23+
_ExcelFile2.default.ExcelColumn = _ExcelColumn2.default;
1824

19-
module.exports = {
20-
ExcelFile: _ExcelFile2.default,
21-
ExcelSheet: _ExcelSheet2.default,
22-
ExcelColumn: _ExcelColumn2.default
23-
};
25+
exports.default = _ExcelFile2.default;
26+
exports.ExcelSheet = _ExcelSheet2.default;
27+
exports.ExcelColumn = _ExcelColumn2.default;

‎dist/model/Dataset.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
"use strict";
2+
3+
var Column = {
4+
name: name
5+
};

0 commit comments

Comments
 (0)