Merge pull request #34 from Belphemur/develop

Belphemur · web-flow · commit 78fce7e77a91 · 2019-10-24T17:43:09.000-04:00
Release
diff --git a/src/JsonCSV.vue b/src/JsonCSV.vue
@@ -167,11 +167,10 @@
           return
         }
 
-        let csv = PapaParse.unparse(dataExport, {
+        let csv = PapaParse.unparse(dataExport, Object.assign({
           delimiter: this.delimiter,
           encoding: this.encoding,
-          ...this.advancedOptions
-        })
+        }, this.advancedOptions));
         if (this.separatorExcel) {
           csv = 'SEP=' + this.delimiter + '\r\n' + csv
         }

Original file line number	Diff line number	Diff line change
`@@ -167,11 +167,10 @@`
`167`	`167`	`return`
`168`	`168`	`}`
`169`	`169`
`170`		`- let csv = PapaParse.unparse(dataExport, {`
	`170`	`+ let csv = PapaParse.unparse(dataExport, Object.assign({`
`171`	`171`	`delimiter: this.delimiter,`
`172`	`172`	`encoding: this.encoding,`
`173`		`- ...this.advancedOptions`
`174`		`- })`
	`173`	`+ }, this.advancedOptions));`
`175`	`174`	`if (this.separatorExcel) {`
`176`	`175`	`csv = 'SEP=' + this.delimiter + '\r\n' + csv`
`177`	`176`	`}`