Skip to content

fix issue #1045 horizontalCentered & verticalCentered in page not working #1073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 17, 2020
Merged

fix issue #1045 horizontalCentered & verticalCentered in page not working #1073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8c1c7da
fix issue #1045
Alanscut Jan 15, 2020
f0070ea
Merge branch 'master' of https://github.com/exceljs/exceljs into issu…
Alanscut Jan 16, 2020
ab5e8b2
Merge branch 'master' of https://github.com/exceljs/exceljs into issu…
Alanscut Jan 17, 2020
969bc3f
fix issue #1079 and test code
Alanscut Jan 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions lib/xlsx/xform/sheet/worksheet-xform.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,10 +279,10 @@ class WorkSheetXform extends BaseXform {
};
const pageMarginsModel = model.pageSetup && model.pageSetup.margins;
const printOptionsModel = {
showRowColHeaders: model.showRowColHeaders,
showGridLines: model.showGridLines,
horizontalCentered: model.horizontalCentered,
verticalCentered: model.verticalCentered,
showRowColHeaders: model.pageSetup && model.pageSetup.showRowColHeaders,
showGridLines: model.pageSetup && model.pageSetup.showGridLines,
horizontalCentered: model.pageSetup && model.pageSetup.horizontalCentered,
verticalCentered: model.pageSetup && model.pageSetup.verticalCentered,
};
const sheetProtectionModel = model.sheetProtection;

Expand All @@ -301,8 +301,8 @@ class WorkSheetXform extends BaseXform {
this.map.hyperlinks.render(xmlStream, model.hyperlinks);

this.map.conditionalFormatting.render(xmlStream, model.conditionalFormattings);
this.map.printOptions.render(xmlStream, printOptionsModel); // Note: must be before pageMargins
this.map.pageMargins.render(xmlStream, pageMarginsModel);
this.map.printOptions.render(xmlStream, printOptionsModel);
this.map.pageSetup.render(xmlStream, model.pageSetup);
this.map.headerFooter.render(xmlStream, model.headerFooter);
this.map.rowBreaks.render(xmlStream, model.rowBreaks);
Expand Down
3 changes: 2 additions & 1 deletion spec/unit/xlsx/xform/sheet/data/sheet.1.0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"firstPageNumber": 5, "useFirstPageNumber": true, "usePrinterDefaults": true, "copies": 3,
"paperSize": 9, "orientation":"landscape", "horizontalDpi": 300, "verticalDpi": 300,
"fitToPage": true, "fitToHeight": 5, "fitToWidth": 7, "pageOrder": "overThenDown", "scale": 90,
"blackAndWhite": true, "cellComments": "atEnd", "draft": true, "errors": "dash"
"blackAndWhite": true, "cellComments": "atEnd", "draft": true, "errors": "dash",
"horizontalCentered": true, "verticalCentered": true, "showGridLines": true, "showRowColHeaders": true
},
"cols": [{"min": 2, "max": 2, "width": 10.15625, "bestFit": true}],
"rows": [
Expand Down
3 changes: 2 additions & 1 deletion spec/unit/xlsx/xform/sheet/data/sheet.1.1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"firstPageNumber": 5, "useFirstPageNumber": true, "usePrinterDefaults": true, "copies": 3,
"paperSize": 9, "orientation":"landscape", "horizontalDpi": 300, "verticalDpi": 300,
"fitToPage": true, "fitToHeight": 5, "fitToWidth": 7, "pageOrder": "overThenDown", "scale": 90,
"blackAndWhite": true, "cellComments": "atEnd", "draft": true, "errors": "dash"
"blackAndWhite": true, "cellComments": "atEnd", "draft": true, "errors": "dash",
"horizontalCentered": true, "verticalCentered": true, "showGridLines": true, "showRowColHeaders": true
},
"cols": [{"min": 2, "max": 2, "width": 10.15625, "bestFit": true}],
"rows": [
Expand Down
1 change: 1 addition & 0 deletions spec/unit/xlsx/xform/sheet/data/sheet.1.2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
<hyperlinks>
<hyperlink ref="B6" r:id="rId1"/>
</hyperlinks>
<printOptions horizontalCentered="1" verticalCentered="1" gridLines="1" headings="1" />
<pageMargins left="0.7" right="0.7" top="0.75" bottom="0.75" header="0.3" footer="0.3"/>
<pageSetup paperSize="9" pageOrder="overThenDown" orientation="landscape" horizontalDpi="300" verticalDpi="300"
firstPageNumber="5" useFirstPageNumber="1" usePrinterDefaults="1" copies="3"
Expand Down
3 changes: 2 additions & 1 deletion spec/unit/xlsx/xform/sheet/data/sheet.1.3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
"firstPageNumber": 5, "useFirstPageNumber": true, "usePrinterDefaults": true, "copies": 3,
"paperSize": 9, "orientation":"landscape", "horizontalDpi": 300, "verticalDpi": 300,
"fitToPage": true, "fitToHeight": 5, "fitToWidth": 7, "pageOrder": "overThenDown", "scale": 90,
"blackAndWhite": true, "cellComments": "atEnd", "draft": true, "errors": "dash"
"blackAndWhite": true, "cellComments": "atEnd", "draft": true, "errors": "dash",
"horizontalCentered": true, "verticalCentered": true, "showGridLines": true, "showRowColHeaders": true
},
"cols": [{"min": 2, "max": 2, "width": 10.15625, "bestFit": true}],
"rows": [
Expand Down
3 changes: 2 additions & 1 deletion spec/unit/xlsx/xform/sheet/data/sheet.1.4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"firstPageNumber": 5, "useFirstPageNumber": true, "usePrinterDefaults": true, "copies": 3,
"paperSize": 9, "orientation":"landscape", "horizontalDpi": 300, "verticalDpi": 300,
"fitToPage": true, "fitToHeight": 5, "fitToWidth": 7, "pageOrder": "overThenDown", "scale": 90,
"blackAndWhite": true, "cellComments": "atEnd", "draft": true, "errors": "dash"
"blackAndWhite": true, "cellComments": "atEnd", "draft": true, "errors": "dash",
"horizontalCentered": true, "verticalCentered": true, "showGridLines": true, "showRowColHeaders": true
},
"cols": [{"min": 2, "max": 2, "width": 10.15625, "bestFit": true}],
"rows": [
Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy