diff --git a/src/vendor/Export2Excel.js b/src/vendor/Export2Excel.js
index 75f33ae1..523f90ce 100644
--- a/src/vendor/Export2Excel.js
+++ b/src/vendor/Export2Excel.js
@@ -149,7 +149,8 @@ export function export_json_to_excel({
header,
data,
filename,
- autoWidth = true
+ autoWidth = true,
+ bookType= 'xlsx'
} = {}) {
/* original data */
filename = filename || 'excel-list'
@@ -196,11 +197,11 @@ export function export_json_to_excel({
wb.Sheets[ws_name] = ws;
var wbout = XLSX.write(wb, {
- bookType: 'xlsx',
+ bookType: bookType,
bookSST: false,
type: 'binary'
});
saveAs(new Blob([s2ab(wbout)], {
type: "application/octet-stream"
- }), filename + ".xlsx");
+ }), `${filename}.${bookType}`);
}
diff --git a/src/views/excel/components/AutoWidthOption.vue b/src/views/excel/components/AutoWidthOption.vue
new file mode 100644
index 00000000..06aad430
--- /dev/null
+++ b/src/views/excel/components/AutoWidthOption.vue
@@ -0,0 +1,30 @@
+
+
+
+
+ True
+ False
+
+
+
+
+
diff --git a/src/views/excel/components/BookTypeOption.vue b/src/views/excel/components/BookTypeOption.vue
new file mode 100644
index 00000000..9970b0e4
--- /dev/null
+++ b/src/views/excel/components/BookTypeOption.vue
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/excel/components/FilenameOption.vue b/src/views/excel/components/FilenameOption.vue
new file mode 100644
index 00000000..5cc931ad
--- /dev/null
+++ b/src/views/excel/components/FilenameOption.vue
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/excel/exportExcel.vue b/src/views/excel/exportExcel.vue
index ae32b3aa..bbd5980c 100644
--- a/src/views/excel/exportExcel.vue
+++ b/src/views/excel/exportExcel.vue
@@ -2,14 +2,12 @@
-
-
-
-
- True
- False
-
-
{{ $t('excel.export') }} Excel
+
+
+
+
+
{{ $t('excel.export') }} Excel
+
@@ -46,15 +44,22 @@
import { fetchList } from '@/api/article'
import { parseTime } from '@/utils'
+// options components
+import FilenameOption from './components/FilenameOption'
+import AutoWidthOption from './components/AutoWidthOption'
+import BookTypeOption from './components/BookTypeOption'
+
export default {
name: 'ExportExcel',
+ components: { FilenameOption, AutoWidthOption, BookTypeOption },
data() {
return {
list: null,
listLoading: true,
downloadLoading: false,
filename: '',
- autoWidth: true
+ autoWidth: true,
+ bookType: 'xlsx'
}
},
created() {
@@ -79,7 +84,8 @@ export default {
header: tHeader,
data,
filename: this.filename,
- autoWidth: this.autoWidth
+ autoWidth: this.autoWidth,
+ bookType: this.bookType
})
this.downloadLoading = false
})