Merge pull request #11 from zurmokeeper/bugfix/cell_style_and_datavalidation_bug

Bugfix/cell style and datavalidation bug

Author: CTyrannosaurus

.github/workflows/tests.yml

@@ -76,7 +76,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 12.x
+          node-version: 14.x
       - name: Create the npm cache directory
         run: mkdir npm-cache && npm config set cache ./npm-cache --global
       - name: Cache node modules

lib/doc/cell.js

@@ -349,7 +349,7 @@ class Cell {
     }
 
     if (value.style) {
-      this.style = value.style;
+      this.style = _.cloneDeep(value.style);
     } else {
       this.style = {};
     }
@@ -862,8 +862,7 @@ class FormulaValue {
     if (!this._translatedFormula && this.model.sharedFormula) {
       const {worksheet} = this.cell;
       const master = worksheet.findCell(this.model.sharedFormula);
-      this._translatedFormula =
-        master && slideFormula(master.formula, master.address, this.model.address);
+      this._translatedFormula = master && slideFormula(master.formula, master.address, this.model.address);
     }
     return this._translatedFormula;
   }

lib/utils/under-dash.js

@@ -179,6 +179,34 @@ const _ = {
     }
     return target;
   },
+
+  cloneDeep: function cloneDeep(value, preserveUndefined) {
+    if (preserveUndefined === undefined) {
+      preserveUndefined = true;
+    }
+    let clone;
+    if (value === null) {
+      return null;
+    }
+    if (value instanceof Date) {
+      return value;
+    }
+    if (value instanceof Array) {
+      clone = [];
+    } else if (typeof value === 'object') {
+      clone = {};
+    } else {
+      return value;
+    }
+    _.each(value, (_value, name) => {
+      if (_value !== undefined) {
+        clone[name] = cloneDeep(_value, preserveUndefined);
+      } else if (preserveUndefined) {
+        clone[name] = undefined;
+      }
+    });
+    return clone;
+  },
 };
 
 module.exports = _;

lib/xlsx/xform/sheet/data-validations-xform.js

@@ -143,6 +143,14 @@ class DataValidationsXform extends BaseXform {
           if (value.type === 'date') {
             xmlStream.writeText(utils.dateToExcel(new Date(formula)));
           } else {
+            if (value.type === 'list') {
+              const pattern = /^".*"$/; // Match "XX, XXX1"
+              if (pattern.test(formula) && formula.length - '""'.length > 255) {
+                throw new Error(
+                  'The input cannot be larger than 255 characters. Please check the value of dataValidation.formulae'
+                );
+              }
+            }
             xmlStream.writeText(formula);
           }
           xmlStream.closeNode();

lib/xlsx/xlsx.js

@@ -677,6 +677,10 @@ class XLSX {
         resolve();
       });
       stream.on('error', error => {
+        // TODO: Now the error is still generated, consider how to deal with it, manually delete the file?
+        // fs.unlink(filename, err =>{
+        //   reject(err);
+        // });
         reject(error);
       });
 
@@ -685,6 +689,7 @@ class XLSX {
           stream.end();
         })
         .catch(err => {
+          // stream.emit('error', err);
           reject(err);
         });
     });

spec/end-to-end/express-encryption.spec.js

@@ -30,7 +30,7 @@ describe('Express test workbook.xlsx.write encryption', () => {
   });
 
   it('downloads a workbook, workbook.xlsx.write encryption successful', async function() {
-    this.timeout(5000);
+    this.timeout(50000);
     const res = got.stream('http://127.0.0.1:3003/workbook', {
       decompress: false,
     });

spec/integration/data/extra-large.xlsx

@@ -0,0 +1,70 @@
+const ExcelJS = verquire('exceljs');
+
+describe('github issues', () => {
+  describe('issue 10 - (dataValidation) The exported table inserts a drop-down menu for the cell. The cell cannot display drop-down options', () => {
+    it('issue 10 - (dataValidation) Input content is 266 characters, more than 255 characters, throw error', async () => {
+      async function test() {
+        const workbook = new ExcelJS.Workbook();
+        const worksheet = workbook.addWorksheet('sheet');
+        const columns = [
+          {
+            header: 'Test1',
+            key: 'test1',
+            width: 25,
+          },
+        ];
+        worksheet.columns = columns;
+        const cell = worksheet.getCell('A2');
+        const value =
+          '"1234 Main St, Anytown 56789,5678 Elm Ave, Smallville 23456,9012 Oak Rd, Big City 34567,3456 Pine Dr, Tinytown 67890,7890 Maple Ln, Mediumtown 12345,2345 Hickory St, Suburbia 45678,6789 Cedar Cir, Urbanville 89012,0123 Birch Blvd, Countryside 23456,4567 Wal"';
+        cell.dataValidation = {
+          type: 'list',
+          allowBlank: true,
+          formulae: [value],
+        };
+        await workbook.xlsx.writeFile(
+          './spec/integration/data/test-new-issue-10-1.xlsx'
+        );
+      }
+      let error;
+      try {
+        await test();
+      } catch (err) {
+        error = err;
+      }
+      expect(error)
+        .to.be.an('error')
+        .with.property(
+          'message',
+          'The input cannot be larger than 255 characters. Please check the value of dataValidation.formulae'
+        );
+    });
+
+    it('issue 2256 - (dataValidation) Input content is 255 characters, normal display', async () => {
+      async function test() {
+        const workbook = new ExcelJS.Workbook();
+        const worksheet = workbook.addWorksheet('sheet');
+        const columns = [
+          {
+            header: 'Test1',
+            key: 'test1',
+            width: 25,
+          },
+        ];
+        worksheet.columns = columns;
+        const cell = worksheet.getCell('A2');
+        const value =
+          '"1234 Main St, Anytown 56789,5678 Elm Ave, Smallville 23456,9012 Oak Rd, Big City 34567,3456 Pine Dr, Tinytown 67890,7890 Maple Ln, Mediumtown 12345,2345 Hickory St, Suburbia 45678,6789 Cedar Cir, Urbanville 89012,0123 Birch Blvd, Countryside 23456,4567 Wa"';
+        cell.dataValidation = {
+          type: 'list',
+          allowBlank: true,
+          formulae: [value],
+        };
+        await workbook.xlsx.writeFile(
+          './spec/integration/data/test-new-issue-10-2.xlsx'
+        );
+      }
+      await test();
+    });
+  });
+});

spec/integration/issues/new/new-issues-10-data-validation-length.spec.js

@@ -130,6 +130,24 @@ describe('WorkbookReader', () => {
           {maxRows: 20}
         );
       });
+
+      // describe('Big file support', () => {
+      //   it('should read large file correctly', function(done) {
+      //     this.timeout(20000);
+      //     const workbook = new ExcelJS.Workbook();
+      //     workbook.xlsx
+      //       .read(
+      //         fs.createReadStream('./spec/integration/data/extra-large.xlsx')
+      //       )
+      //       .then(result => {
+      //         expect(result._worksheets[1]._rows.length).to.equal(512781);
+      //         expect(
+      //           result._worksheets[1]._rows[500000]._cells[4]._value.value
+      //         ).to.equal(11);
+      //         done();
+      //       });
+      //   });
+      // });
     });
   });
 

spec/integration/workbook-xlsx-reader.spec.js

@@ -639,9 +639,13 @@ describe('Workbook', () => {
               const ws2 = wb2.getWorksheet('duplicateTest');
 
               expect(ws2.getCell('A2').value).to.equal('OneInfo');
-              expect(ws2.getCell('A2').style).to.equal(ws2.getCell('A1').style);
+              expect(ws2.getCell('A2').style).to.deep.equal(
+                ws2.getCell('A1').style
+              );
               expect(ws2.getCell('A3').value).to.equal('OneInfo');
-              expect(ws2.getCell('A3').style).to.equal(ws2.getCell('A1').style);
+              expect(ws2.getCell('A3').style).to.deep.equal(
+                ws2.getCell('A1').style
+              );
               expect(ws2.getCell('A4').value).to.be.null();
             });
         });