Skip to content

Commit e70237d

Browse files
committed
feat(datutil): fixed the merge title issue
1 parent 0499d76 commit e70237d

File tree

4 files changed

+24
-12
lines changed

4 files changed

+24
-12
lines changed

.npmignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@
33
/src/
44
.github
55
/src-js
6+
/examples
7+
node_modules
68

dist/ExcelPlugin/utils/DataUtil.js

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,16 @@ var excelSheetFromDataSet = function excelSheetFromDataSet(dataSet, bigHeading)
9797
}
9898
};
9999
ws['!merges'] = [mergedRange];
100-
var mergeRef = xlsx_js_style_1.utils.encode_range({
101-
c: xSteps,
102-
r: 0
103-
}, {
104-
c: xSteps + dataSetItem.columns.length - 1,
105-
r: 0
106-
});
107-
getHeaderCell(bigHeading, mergeRef, ws);
100+
var cell = {
101+
t: 's',
102+
v: bigHeading.title,
103+
s: bigHeading.style ? bigHeading.style : {
104+
font: {
105+
bold: true
106+
}
107+
}
108+
};
109+
ws['A1'] = cell;
108110
rowCount += 1;
109111
}
110112
var columnsInfo = [];

src-js/ExcelPlugin/utils/DataUtil.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,12 @@ 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 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);
77+
let cell = {
78+
t: 's',
79+
v: bigHeading.title,
80+
s: bigHeading.style ? bigHeading.style : { font: { bold: true } },
81+
};
82+
ws['A1'] = cell;
7983
rowCount += 1;
8084
}
8185
let columnsInfo = [];

src/ExcelPlugin/utils/DataUtil.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,12 @@ 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 mergeRef = utils.encode_range({ c: xSteps, r: 0 }, { c: xSteps + dataSetItem.columns.length - 1, r: 0 });
85-
getHeaderCell(bigHeading, mergeRef, ws);
84+
let cell: CellObject = {
85+
t: 's',
86+
v: bigHeading.title,
87+
s: bigHeading.style ? bigHeading.style : { font: { bold: true } },
88+
};
89+
ws['A1'] = cell;
8690
rowCount += 1;
8791
}
8892

0 commit comments

Comments
 (0)