Merge branch 'master' into deploy

2019-03-21 11:20:29 +08:00 · 2019-03-21 11:20:29 +08:00 · 082b62e960
parent ae02d6bb56 ccb227fbec
commit 082b62e960
1 changed files with 2 additions and 2 deletions
--- a/src/vendor/Export2Excel.js
+++ b/src/vendor/Export2Excel.js
@ -145,11 +145,11 @@ export function export_table_to_excel(id) {
 }

 export function export_json_to_excel({
-  multiHeader,
+  multiHeader = [],
  header,
  data,
  filename,
-  merges,
+  merges = [],
  autoWidth = true,
  bookType=  'xlsx'
 } = {}) {