Merge pull request #15 from linways/#11

rohithb · web-flow · commit 6ce7615a1b3d · 2019-04-07T09:24:46.000+05:30
Added option to specify row height
diff --git a/README.md b/README.md
@@ -148,6 +148,18 @@ Example:
 </table>
 ```
 
+# Row Height
+
+Row Height can be set by specifying `data-height` in the `<tr>` tag.  
+Example:
+
+```html
+<tr data-height="42.5">
+  <td>Cell 1</td>
+  <td>Cell 2</td>
+</tr>
+```
+
 # Release Changelog
 
 ## 1.0.0
@@ -166,3 +178,11 @@ Example:
 - String "true/false" will be accepted as Boolean
 - Changed border style values
 - Text rotation values changed
+
+## 1.0.2
+
+- Fixed bug in handling multiple columns merges in a sheet
+
+## 1.0.3
+
+- Option to specify row height
diff --git a/dist/index.html b/dist/index.html
@@ -93,6 +93,9 @@
             <td data-exclude="true">Excluded Cell</td>
             <td>Included Cell</td>
           </tr>
+          <tr data-height="42">
+            <td>Row height 42</td>
+          </tr>
         </tbody>
       </table>
 
diff --git a/dist/index.js b/dist/index.js
@@ -198,7 +198,7 @@ var parent = module.bundle.parent;
 if ((!parent || !parent.isParcelRequire) && typeof WebSocket !== 'undefined') {
   var hostname = "" || location.hostname;
   var protocol = location.protocol === 'https:' ? 'wss' : 'ws';
-  var ws = new WebSocket(protocol + '://' + hostname + ':' + "52850" + '/');
+  var ws = new WebSocket(protocol + '://' + hostname + ':' + "49818" + '/');
 
   ws.onmessage = function (event) {
     var data = JSON.parse(event.data);
diff --git a/dist/tableToExcel.517b1af9.js b/dist/tableToExcel.517b1af9.js
@@ -141,17 +141,22 @@ var TTEParser = function () {
 
     for (_r = 0; _r < rows.length; ++_r) {
       var row = rows[_r];
+      r = _r + 1; // Actual excel row number
+
+      c = 1; // Actual excel col number
 
       if (row.getAttribute("data-exclude") === "true") {
         rows.splice(_r, 1);
         _r--;
         continue;
       }
 
-      var tds = _toConsumableArray(row.children);
+      if (row.getAttribute("data-height")) {
+        var exRow = ws.getRow(r);
+        exRow.height = parseFloat(row.getAttribute("data-height"));
+      }
 
-      r = _r + 1;
-      c = 1;
+      var tds = _toConsumableArray(row.children);
 
       for (_c = 0; _c < tds.length; ++_c) {
         var td = tds[_c];
@@ -44629,7 +44634,7 @@ var parent = module.bundle.parent;
 if ((!parent || !parent.isParcelRequire) && typeof WebSocket !== 'undefined') {
   var hostname = "" || location.hostname;
   var protocol = location.protocol === 'https:' ? 'wss' : 'ws';
-  var ws = new WebSocket(protocol + '://' + hostname + ':' + "52850" + '/');
+  var ws = new WebSocket(protocol + '://' + hostname + ':' + "49818" + '/');
 
   ws.onmessage = function (event) {
     var data = JSON.parse(event.data);
diff --git a/dist/tableToExcel.517b1af9.map b/dist/tableToExcel.517b1af9.map
diff --git a/dist/tableToExcel.js b/dist/tableToExcel.js
diff --git a/dist/tableToExcel.map b/dist/tableToExcel.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@linways/table-to-excel",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Javascript library to create 'valid' excel file from html table with styles",
   "main": "./dist/tableToExcel.js",
   "repository": {
diff --git a/sample/index.html b/sample/index.html
@@ -140,6 +140,9 @@
             <td data-exclude="true">Excluded Cell</td>
             <td>Included Cell</td>
           </tr>
+          <tr data-height="42">
+            <td>Row height 42</td>
+          </tr>
         </tbody>
       </table>
 
diff --git a/src/parser.js b/src/parser.js
@@ -17,14 +17,19 @@ const TTEParser = (function() {
     let merges = [];
     for (_r = 0; _r < rows.length; ++_r) {
       let row = rows[_r];
+      r = _r + 1; // Actual excel row number
+      c = 1; // Actual excel col number
       if (row.getAttribute("data-exclude") === "true") {
         rows.splice(_r, 1);
         _r--;
         continue;
       }
+      if (row.getAttribute("data-height")) {
+        let exRow = ws.getRow(r);
+        exRow.height = parseFloat(row.getAttribute("data-height"));
+      }
+
       let tds = [...row.children];
-      r = _r + 1;
-      c = 1;
       for (_c = 0; _c < tds.length; ++_c) {
         let td = tds[_c];
         if (td.getAttribute("data-exclude") === "true") {
diff --git a/test/parser.test.js b/test/parser.test.js
@@ -197,6 +197,15 @@ describe("Parser", function() {
     });
   });
 
+  describe("Row height", function() {
+    it("Should handle the row height", function() {
+      let table = getTable("styles");
+      let ws = getWorkSheet();
+      ws = Parser.parseDomToTable(ws, table, _opts);
+      expect(ws.getRow(13).height).to.equals(45);
+    });
+  });
+
   describe("Multiple merges", function() {
     var ws;
     it("should handle multiple merges properly", function() {
diff --git a/test/samples/styles.html b/test/samples/styles.html
@@ -122,5 +122,8 @@
       <td data-exclude="true">Excluded Cell</td>
       <td>Included Cell</td>
     </tr>
+    <tr data-height="45">
+      <td>Row height 45</td>
+    </tr>
   </tbody>
 </table>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@linways/table-to-excel",`
`3`		`- "version": "1.0.2",`
	`3`	`+ "version": "1.0.3",`
`4`	`4`	`"description": "Javascript library to create 'valid' excel file from html table with styles",`
`5`	`5`	`"main": "./dist/tableToExcel.js",`
`6`	`6`	`"repository": {`