Skip to content

Commit 0499d76

Browse files
committed
feat(datautil): big Heading is almost done, changed the npmignore
1 parent 355ad43 commit 0499d76

File tree

5 files changed

+27
-20
lines changed

5 files changed

+27
-20
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
node_modules
33
*.log
44
.idea/
5-
coverage/
5+
coverage/

.npmignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
.babelrc
22
/coverage/
3+
/src/
4+
.github
5+
/src-js
6+

dist/ExcelPlugin/utils/DataUtil.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,14 @@ var excelSheetFromDataSet = function excelSheetFromDataSet(dataSet, bigHeading)
9797
}
9898
};
9999
ws['!merges'] = [mergedRange];
100-
var cellRef = xlsx_js_style_1.utils.encode_cell({
100+
var mergeRef = xlsx_js_style_1.utils.encode_range({
101101
c: xSteps,
102-
r: rowCount
102+
r: 0
103+
}, {
104+
c: xSteps + dataSetItem.columns.length - 1,
105+
r: 0
103106
});
104-
getHeaderCell(bigHeading, cellRef, ws);
107+
getHeaderCell(bigHeading, mergeRef, ws);
105108
rowCount += 1;
106109
}
107110
var columnsInfo = [];
@@ -130,12 +133,12 @@ var excelSheetFromDataSet = function excelSheetFromDataSet(dataSet, bigHeading)
130133
}
131134
for (var R = 0; R !== data.length; ++R, rowCount++) {
132135
for (var C = 0; C !== data[R].length; ++C) {
133-
var _cellRef = xlsx_js_style_1.utils.encode_cell({
136+
var cellRef = xlsx_js_style_1.utils.encode_cell({
134137
c: C + xSteps,
135138
r: rowCount
136139
});
137140
fixRange(range, R, C, rowCount, xSteps, ySteps);
138-
getCell(data[R][C], _cellRef, ws);
141+
getCell(data[R][C], cellRef, ws);
139142
}
140143
}
141144
});

src-js/ExcelPlugin/utils/DataUtil.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,16 @@ const excelSheetFromDataSet = (dataSet, bigHeading) => {
7474
if (bigHeading?.title) {
7575
let mergedRange = { s: { c: xSteps, r: 0 }, e: { c: dataSetItem.columns.length - 1, r: 0 } };
7676
ws['!merges'] = [mergedRange];
77-
let cellRef = xlsx_js_style_1.utils.encode_cell({ c: xSteps, r: rowCount });
78-
getHeaderCell(bigHeading, cellRef, ws);
77+
let mergeRef = xlsx_js_style_1.utils.encode_range({ c: xSteps, r: 0 }, { c: xSteps + dataSetItem.columns.length - 1, r: 0 });
78+
getHeaderCell(bigHeading, mergeRef, ws);
7979
rowCount += 1;
8080
}
81-
var columnsInfo = [];
81+
let columnsInfo = [];
8282
if (columns.length >= 0) {
8383
columns.forEach((col, index) => {
84-
var cellRef = xlsx_js_style_1.utils.encode_cell({ c: xSteps + index, r: rowCount });
84+
let cellRef = xlsx_js_style_1.utils.encode_cell({ c: xSteps + index, r: rowCount });
8585
fixRange(range, 0, 0, rowCount, xSteps, ySteps);
86-
var colTitle = col;
86+
let colTitle = col;
8787
if (typeof col === 'object') {
8888
//colTitle = col.title; //moved to getHeaderCell
8989
columnsInfo.push(col.width || { wpx: 100, hidden: false }); /* wch (chars), wpx (pixels) - e.g. [{wch:6},{wpx:50}] */
@@ -110,10 +110,10 @@ const excelSheetFromDataSet = (dataSet, bigHeading) => {
110110
};
111111
exports.excelSheetFromDataSet = excelSheetFromDataSet;
112112
function getHeaderCell(v, cellRef, ws) {
113-
var cell = {
113+
let cell = {
114114
t: 's',
115115
};
116-
var headerCellStyle = v.style ? v.style : { font: { bold: true } }; //if style is then use it
116+
let headerCellStyle = v.style ? v.style : { font: { bold: true } }; //if style is then use it
117117
cell.v = v.title;
118118
cell.t = 's';
119119
cell.s = headerCellStyle;

src/ExcelPlugin/utils/DataUtil.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,17 +81,17 @@ const excelSheetFromDataSet = (dataSet: ExcelSheetData[], bigHeading?: ExcelShee
8181
if(bigHeading?.title) {
8282
let mergedRange: Range = { s: { c: xSteps, r: 0 }, e: { c: dataSetItem.columns.length - 1, r: 0 } };
8383
ws['!merges'] = [mergedRange];
84-
let cellRef = utils.encode_cell({ c: xSteps, r: rowCount });
85-
getHeaderCell(bigHeading, cellRef, ws);
84+
let mergeRef = utils.encode_range({ c: xSteps, r: 0 }, { c: xSteps + dataSetItem.columns.length - 1, r: 0 });
85+
getHeaderCell(bigHeading, mergeRef, ws);
8686
rowCount += 1;
8787
}
8888

89-
var columnsInfo: ColInfo[] = [];
89+
let columnsInfo: ColInfo[] = [];
9090
if (columns.length >= 0) {
9191
columns.forEach((col, index) => {
92-
var cellRef = utils.encode_cell({ c: xSteps + index, r: rowCount });
92+
let cellRef = utils.encode_cell({ c: xSteps + index, r: rowCount });
9393
fixRange(range, 0, 0, rowCount, xSteps, ySteps);
94-
var colTitle = col;
94+
let colTitle = col;
9595
if (typeof col === 'object'){
9696
//colTitle = col.title; //moved to getHeaderCell
9797
columnsInfo.push(col.width || { wpx: 100, hidden: false }); /* wch (chars), wpx (pixels) - e.g. [{wch:6},{wpx:50}] */
@@ -123,10 +123,10 @@ const excelSheetFromDataSet = (dataSet: ExcelSheetData[], bigHeading?: ExcelShee
123123
};
124124

125125
function getHeaderCell(v: ExcelSheetCol, cellRef: string, ws: WorkSheet): void {
126-
var cell: CellObject = {
126+
let cell: CellObject = {
127127
t: 's',
128128
};
129-
var headerCellStyle = v.style ? v.style : { font: { bold: true } }; //if style is then use it
129+
let headerCellStyle = v.style ? v.style : { font: { bold: true } }; //if style is then use it
130130
cell.v = v.title;
131131
cell.t = 's';
132132
cell.s = headerCellStyle;

0 commit comments

Comments
 (0)