Fix Issue #1075

kigh-ota · kigh-ota · commit b247766f0a64 · 2020-01-16T01:24:33.000+09:00
diff --git a/README.md b/README.md
@@ -326,6 +326,7 @@ worksheet.properties.defaultRowHeight = 15;
 | outlineLevelCol  | 0          | The worksheet column outline level |
 | outlineLevelRow  | 0          | The worksheet row outline level |
 | defaultRowHeight | 15         | Default row height |
+| defaultColWidth  | (optional) | Default column width |
 | dyDescent        | 55         | TBD |
 
 ### Worksheet Metrics
diff --git a/README_zh.md b/README_zh.md
@@ -273,6 +273,7 @@ worksheet.properties.defaultRowHeight = 15;
 | outlineLevelCol  | 0          | 工作表列大纲级别 |
 | outlineLevelRow  | 0          | 工作表行大纲级别 |
 | defaultRowHeight | 15         | 默认行高 |
+| defaultColWidth  | (optional) | TBD |
 | dyDescent        | 55         | TBD |
 
 ### 工作表指标
diff --git a/index.d.ts b/index.d.ts
@@ -1198,6 +1198,11 @@ export interface WorksheetProperties {
 	 */
 	defaultRowHeight: number;
 
+	/**
+	 * Default column width (optional)
+	 */
+	defaultColWidth?: number;
+
 	/**
 	 * default: 55
 	 */
diff --git a/lib/stream/xlsx/worksheet-writer.js b/lib/stream/xlsx/worksheet-writer.js
@@ -464,6 +464,9 @@ class WorksheetWriter {
         outlineLevelRow: properties.outlineLevelRow,
       }
       : undefined;
+    if (properties.defaultColWidth) {
+      sheetFormatPropertiesModel.defaultColWidth = properties.defaultColWidth;
+    }
 
     xmlBuf.addText(xform.sheetFormatProperties.toXml(sheetFormatPropertiesModel));
   }
diff --git a/lib/xlsx/xform/sheet/sheet-format-properties-xform.js b/lib/xlsx/xform/sheet/sheet-format-properties-xform.js
@@ -14,6 +14,9 @@ class SheetFormatPropertiesXform extends BaseXform {
         outlineLevelCol: model.outlineLevelCol,
         'x14ac:dyDescent': model.dyDescent,
       };
+      if (model.defaultColWidth) {
+        attributes.defaultColWidth = model.defaultColWidth;
+      }
 
       // default value for 'defaultRowHeight' is 15, this should not be 'custom'
       if (!model.defaultRowHeight || (model.defaultRowHeight !== 15)) {
@@ -34,6 +37,9 @@ class SheetFormatPropertiesXform extends BaseXform {
         outlineLevelRow: parseInt(node.attributes.outlineLevelRow || '0', 10),
         outlineLevelCol: parseInt(node.attributes.outlineLevelCol || '0', 10),
       };
+      if (node.attributes.defaultColWidth) {
+        this.model.defaultColWidth = parseFloat(node.attributes.defaultColWidth);
+      }
       return true;
     }
     return false;
diff --git a/lib/xlsx/xform/sheet/worksheet-xform.js b/lib/xlsx/xform/sheet/worksheet-xform.js
@@ -205,6 +205,9 @@ class WorkSheetXform extends BaseXform {
         outlineLevelRow: model.properties.outlineLevelRow,
       }
       : undefined;
+    if (model.properties && model.properties.defaultColWidth) {
+      sheetFormatPropertiesModel.defaultColWidth = model.properties.defaultColWidth;
+    }
     const sheetPropertiesModel = {
       outlineProperties: model.properties && model.properties.outlineProperties,
       tabColor: model.properties && model.properties.tabColor,
diff --git a/spec/unit/xlsx/xform/sheet/sheet-format-properties-xform.spec.js b/spec/unit/xlsx/xform/sheet/sheet-format-properties-xform.spec.js
@@ -10,14 +10,16 @@ const expectations = [
     },
     preparedModel: {
       defaultRowHeight: 14.4,
+      defaultColWidth: 2.17,
       dyDescent: 0.55,
       outlineLevelRow: 5,
       outlineLevelCol: 2,
     },
     xml:
-      '<sheetFormatPr defaultRowHeight="14.4" customHeight="1" outlineLevelRow="5" outlineLevelCol="2" x14ac:dyDescent="0.55"/>',
+      '<sheetFormatPr defaultRowHeight="14.4" defaultColWidth="2.17" customHeight="1" outlineLevelRow="5" outlineLevelCol="2" x14ac:dyDescent="0.55"/>',
     parsedModel: {
       defaultRowHeight: 14.4,
+      defaultColWidth: 2.17,
       dyDescent: 0.55,
       outlineLevelRow: 5,
       outlineLevelCol: 2,

Original file line number	Diff line number	Diff line change
`@@ -464,6 +464,9 @@ class WorksheetWriter {`
`464`	`464`	`outlineLevelRow: properties.outlineLevelRow,`
`465`	`465`	`}`
`466`	`466`	`: undefined;`
	`467`	`+ if (properties.defaultColWidth) {`
	`468`	`+ sheetFormatPropertiesModel.defaultColWidth = properties.defaultColWidth;`
	`469`	`+ }`
`467`	`470`
`468`	`471`	`xmlBuf.addText(xform.sheetFormatProperties.toXml(sheetFormatPropertiesModel));`
`469`	`472`	`}`