Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix defaultRowHeight not working #855

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 2 commits into from
Jun 13, 2019
Merged

Fix defaultRowHeight not working #855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0793132
Fix defaultRowHeight not working
autukill Jun 11, 2019
05da937
Update unit tests
autukill Jun 11, 2019
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
1 change: 1 addition & 0 deletions lib/xlsx/xform/sheet/sheet-format-properties-xform.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ class SheetFormatPropertiesXform extends BaseXform {
outlineLevelRow: model.outlineLevelRow,
outlineLevelCol: model.outlineLevelCol,
'x14ac:dyDescent': model.dyDescent,
customHeight: model.defaultRowHeight === 0 ? '0' : '1',
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you fix the unit tests that have failed due to this change

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes

};
if (_.some(attributes, value => value !== undefined)) {
xmlStream.leafNode('sheetFormatPr', attributes);
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -4,7 +4,7 @@
<sheetViews>
<sheetView workbookViewId="0"/>
</sheetViews>
<sheetFormatPr defaultRowHeight="15" x14ac:dyDescent="0.25"/>
<sheetFormatPr defaultRowHeight="15" customHeight="1" x14ac:dyDescent="0.25"/>
<sheetPr>
<tabColor rgb="FF00FF00"/>
<pageSetUpPr fitToPage="1"/>
Expand Down
2 changes: 1 addition & 1 deletion spec/unit/xlsx/xform/sheet/data/sheet.2.2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<sheetViews>
<sheetView workbookViewId="0"/>
</sheetViews>
<sheetFormatPr defaultRowHeight="14.4" x14ac:dyDescent="0.55" outlineLevelRow="2"/>
<sheetFormatPr defaultRowHeight="14.4" customHeight="1" x14ac:dyDescent="0.55" outlineLevelRow="2"/>
<sheetData>
<row r="1" spans="1:3" x14ac:dyDescent="0.25">
<c r="A1" t="s">
Expand Down
2 changes: 1 addition & 1 deletion spec/unit/xlsx/xform/sheet/data/sheet.3.2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="x14ac" xmlns:x14ac="http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac">
<dimension ref="A1:A1"/>
<sheetFormatPr defaultRowHeight="14.4" x14ac:dyDescent="0.55" outlineLevelRow="2"/>
<sheetFormatPr defaultRowHeight="14.4" customHeight="1" x14ac:dyDescent="0.55" outlineLevelRow="2"/>
<sheetData/>
</worksheet>
2 changes: 1 addition & 1 deletion spec/unit/xlsx/xform/sheet/data/sheet.5.2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="x14ac" xmlns:x14ac="http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac">
<dimension ref="A1:B1"/>
<sheetFormatPr defaultRowHeight="14.4" x14ac:dyDescent="0.55" outlineLevelRow="2"/>
<sheetFormatPr defaultRowHeight="14.4" customHeight="1" x14ac:dyDescent="0.55" outlineLevelRow="2"/>
<sheetData>
<row r="1" spans="1:3" x14ac:dyDescent="0.25">
<c r="A1">
Expand Down
2 changes: 1 addition & 1 deletion spec/unit/xlsx/xform/sheet/data/sheet.6.2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="x14ac" xmlns:x14ac="http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac">
<dimension ref="A1:B1"/>
<sheetFormatPr defaultRowHeight="14.4" x14ac:dyDescent="0.55" outlineLevelRow="2"/>
<sheetFormatPr defaultRowHeight="14.4" customHeight="1" x14ac:dyDescent="0.55" outlineLevelRow="2"/>
<sheetData>
<row r="1" spans="1:2" x14ac:dyDescent="0.25">
<c r="A1">
Expand Down
2 changes: 1 addition & 1 deletion spec/unit/xlsx/xform/sheet/data/sheet.7.2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<sheetViews>
<sheetView workbookViewId="0"/>
</sheetViews>
<sheetFormatPr defaultRowHeight="14.4" x14ac:dyDescent="0.55" outlineLevelRow="2"/>
<sheetFormatPr defaultRowHeight="14.4" customHeight="1" x14ac:dyDescent="0.55" outlineLevelRow="2"/>
<sheetData>
<row r="1" spans="1:3" x14ac:dyDescent="0.25">
<c r="A1" t="s">
Expand Down
6 changes: 3 additions & 3 deletions spec/unit/xlsx/xform/sheet/sheet-format-properties-xform.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const expectations = [
outlineLevelCol: 2,
},
xml:
'<sheetFormatPr defaultRowHeight="14.4" outlineLevelRow="5" outlineLevelCol="2" x14ac:dyDescent="0.55"/>',
'<sheetFormatPr defaultRowHeight="14.4" customHeight="1" outlineLevelRow="5" outlineLevelCol="2" x14ac:dyDescent="0.55"/>',
parsedModel: {
defaultRowHeight: 14.4,
dyDescent: 0.55,
Expand All @@ -30,8 +30,8 @@ const expectations = [
create() {
return new SheetFormatPropertiesXform();
},
preparedModel: { defaultRowHeight: 14.4, dyDescent: 0.55 },
xml: '<sheetFormatPr defaultRowHeight="14.4" x14ac:dyDescent="0.55"/>',
preparedModel: {defaultRowHeight: 14.4, dyDescent: 0.55},
xml: '<sheetFormatPr defaultRowHeight="14.4" customHeight="1" x14ac:dyDescent="0.55"/>',
parsedModel: {
defaultRowHeight: 14.4,
dyDescent: 0.55,
Expand Down