optimize

dist/index.js

@@ -10,7 +10,7 @@
     factory(mod.exports, global.XEUtils, global.XLSX);
     global.VXETablePluginExportXLSX = mod.exports.default;
   }
-})(this, function (_exports, _xeUtils, _xlsx) {
+})(typeof globalThis !== "undefined" ? globalThis : typeof self !== "undefined" ? self : this, function (_exports, _xeUtils, _xlsx) {
   "use strict";
 
   Object.defineProperty(_exports, "__esModule", {
@@ -62,7 +62,9 @@
     }
 
     if (isFooter) {
-      var footerData = $table.footerData;
+      var _$table$getTableData = $table.getTableData(),
+          footerData = _$table$getTableData.footerData;
+
       var footers = footerFilterMethod ? footerData.filter(footerFilterMethod) : footerData;
       footers.forEach(function (rows) {
         var item = {};
@@ -169,12 +171,11 @@
   }
 
   function importXLSX(params) {
-    var $table = params.$table,
-        columns = params.columns,
+    var columns = params.columns,
         options = params.options,
         file = params.file;
-    var _importCallback = $table._importCallback,
-        _importResolve = $table._importResolve;
+    var $table = params.$table;
+    var _importResolve = $table._importResolve;
     var fileReader = new FileReader();
 
     fileReader.onload = function (e) {
@@ -184,9 +185,10 @@
 
       var csvData = _xlsx["default"].utils.sheet_to_csv(workbook.Sheets.Sheet1);
 
-      var rest = parseCsv(columns, csvData);
-      var fields = rest.fields,
-          rows = rest.rows;
+      var _parseCsv = parseCsv(columns, csvData),
+          fields = _parseCsv.fields,
+          rows = _parseCsv.rows;
+
       var status = checkImportData(columns, fields, rows);
 
       if (status) {
@@ -215,11 +217,6 @@
         _importResolve(status);
 
         $table._importResolve = null;
-      } else if (_importCallback) {
-        // 已废弃
-        _importCallback(status);
-
-        $table._importCallback = null;
       }
     };
 

dist/index.min.js

@@ -1 +1 @@
-!function(e,t){if("function"==typeof define&&define.amd)define("vxe-table-plugin-export-xlsx",["exports","xe-utils","xlsx"],t);else if("undefined"!=typeof exports)t(exports,require("xe-utils"),require("xlsx"));else{var n={exports:{}};t(n.exports,e.XEUtils,e.XLSX),e.VXETablePluginExportXLSX=n.exports.default}}(this,function(e,h,y){"use strict";function t(e){return e&&e.__esModule?e:{default:e}}function n(e){var o=e.$table,t=e.options,r=e.columns,n=e.datas,a=t.sheetName,i=t.type,s=t.isHeader,l=t.isFooter,u=t.original,c=t.message,f=t.footerFilterMethod,d={},p=[],v=n;if(s&&r.forEach(function(e){d[e.id]=h.default.toString(u?e.property:e.getTitle())}),l){var m=o.footerData;(f?m.filter(f):m).forEach(function(t){var n={};r.forEach(function(e){n[e.id]=function(e,t,n,o){return h.default.toString(n[e.$getColumnIndex(o)])}(o,0,t,e)}),p.push(n)})}var x=y.default.utils.book_new(),b=y.default.utils.json_to_sheet((s?[d]:[]).concat(v).concat(p),{skipHeader:!0});y.default.utils.book_append_sheet(x,b,a);var g=y.default.write(x,{bookType:i,bookSST:!1,type:"binary"});!function(e,t){if(window.Blob){var n=t.filename,o=t.type;if(navigator.msSaveBlob)navigator.msSaveBlob(e,"".concat(n,".").concat(o));else{var r=document.createElement("a");r.target="_blank",r.download="".concat(n,".").concat(o),r.href=URL.createObjectURL(e),document.body.appendChild(r),r.click(),document.body.removeChild(r)}}else console.error(w("vxe.error.notExp"))}(new Blob([function(e){for(var t=new ArrayBuffer(e.length),n=new Uint8Array(t),o=0;o!==e.length;++o)n[o]=255&e.charCodeAt(o);return t}(g)],{type:"application/octet-stream"}),t),!1!==c&&o.$XModal.message({message:w("vxe.table.expSuccess"),status:"success"})}function f(e){return e.replace(/^"/,"").replace(/"$/,"")}function o(e){var i=e.$table,s=e.columns,l=e.options,t=e.file,u=i._importCallback,c=i._importResolve,n=new FileReader;n.onload=function(e){var t=y.default.read(e.target.result,{type:"binary"}),n=function(e,t){var n=t.split("\n"),o=[],r=[];if(n.length){var a=n.slice(1);n[0].split(",").map(f),a.forEach(function(e){if(e){var n={};e.split(",").forEach(function(e,t){o[t]&&(n[o[t]]=f(e))}),r.push(n)}})}return{fields:o,rows:r}}(0,y.default.utils.sheet_to_csv(t.Sheets.Sheet1)),o=n.fields,r=n.rows,a=function(e,t){var n=[];return e.forEach(function(e){var t=e.property;t&&n.push(t)}),n.every(function(e){return t.includes(e)})}(s,o);a?(i.createData(r).then(function(e){"append"===l.mode?i.insertAt(e,-1):i.reloadData(e)}),!1!==l.message&&i.$XModal.message({message:h.default.template(w("vxe.table.impSuccess"),[r.length]),status:"success"})):!1!==l.message&&i.$XModal.message({message:w("vxe.error.impFields"),status:"error"}),c?(c(a),i._importResolve=null):u&&(u(a),i._importCallback=null)},n.readAsBinaryString(t)}function r(e){if("xlsx"===e.options.type)return o(e),!1}function a(e){if("xlsx"===e.options.type)return n(e),!1}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.VXETablePluginExportXLSX=void 0,h=t(h),y=t(y);var i={install:function(e){Object.assign(e.types,{xlsx:1}),e.interceptor.mixin({"event.import":r,"event.export":a}),i.t=e.t}};function w(e){if(i.t)return i.t(e)}e.VXETablePluginExportXLSX=i,"undefined"!=typeof window&&window.VXETable&&window.VXETable.use(i);var s=i;e.default=s});
+!function(e,t){if("function"==typeof define&&define.amd)define("vxe-table-plugin-export-xlsx",["exports","xe-utils","xlsx"],t);else if("undefined"!=typeof exports)t(exports,require("xe-utils"),require("xlsx"));else{var o={exports:{}};t(o.exports,e.XEUtils,e.XLSX),e.VXETablePluginExportXLSX=o.exports.default}}("undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:this,function(e,h,y){"use strict";function t(e){return e&&e.__esModule?e:{default:e}}function o(e){var i=e.$table,t=e.options,o=e.columns,n=e.datas,a=t.sheetName,r=t.type,s=t.isHeader,l=t.isFooter,u=t.original,f=t.message,c=t.footerFilterMethod,d={},p=[],v=n;if(s&&o.forEach(function(e){d[e.id]=h.default.toString(u?e.property:e.getTitle())}),l){var x=i.getTableData().footerData;(c?x.filter(c):x).forEach(function(a){var r={};o.forEach(function(e){var t,o,n;r[e.id]=(t=i,o=a,n=e,h.default.toString(o[t.$getColumnIndex(n)]))}),p.push(r)})}var m=y.default.utils.book_new(),g=y.default.utils.json_to_sheet((s?[d]:[]).concat(v).concat(p),{skipHeader:!0});y.default.utils.book_append_sheet(m,g,a);var b=y.default.write(m,{bookType:r,bookSST:!1,type:"binary"});!function(e,t){if(window.Blob){var o=t.filename,n=t.type;if(navigator.msSaveBlob)navigator.msSaveBlob(e,"".concat(o,".").concat(n));else{var a=document.createElement("a");a.target="_blank",a.download="".concat(o,".").concat(n),a.href=URL.createObjectURL(e),document.body.appendChild(a),a.click(),document.body.removeChild(a)}}else console.error(w("vxe.error.notExp"))}(new Blob([function(e){for(var t=new ArrayBuffer(e.length),o=new Uint8Array(t),n=0;n!==e.length;++n)o[n]=255&e.charCodeAt(n);return t}(b)],{type:"application/octet-stream"}),t),!1!==f&&i.$XModal.message({message:w("vxe.table.expSuccess"),status:"success"})}function d(e){return e.replace(/^"/,"").replace(/"$/,"")}function n(e){var l=e.columns,u=e.options,t=e.file,f=e.$table,c=f._importResolve,o=new FileReader;o.onload=function(e){var t,o,n=y.default.read(e.target.result,{type:"binary"}),a=function(e){var t=e.split("\n"),n=[],a=[];if(t.length){var o=t.slice(1);t[0].split(",").map(d),o.forEach(function(e){if(e){var o={};e.split(",").forEach(function(e,t){n[t]&&(o[n[t]]=d(e))}),a.push(o)}})}return{fields:n,rows:a}}(y.default.utils.sheet_to_csv(n.Sheets.Sheet1)),r=a.fields,i=a.rows,s=(t=r,o=[],l.forEach(function(e){var t=e.property;t&&o.push(t)}),o.every(function(e){return t.includes(e)}));s?(f.createData(i).then(function(e){"append"===u.mode?f.insertAt(e,-1):f.reloadData(e)}),!1!==u.message&&f.$XModal.message({message:h.default.template(w("vxe.table.impSuccess"),[i.length]),status:"success"})):!1!==u.message&&f.$XModal.message({message:w("vxe.error.impFields"),status:"error"}),c&&(c(s),f._importResolve=null)},o.readAsBinaryString(t)}function a(e){if("xlsx"===e.options.type)return n(e),!1}function r(e){if("xlsx"===e.options.type)return o(e),!1}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.VXETablePluginExportXLSX=void 0,h=t(h),y=t(y);var i={install:function(e){Object.assign(e.types,{xlsx:1}),e.interceptor.mixin({"event.import":a,"event.export":r}),i.t=e.t}};function w(e){if(i.t)return i.t(e)}e.VXETablePluginExportXLSX=i,"undefined"!=typeof window&&window.VXETable&&window.VXETable.use(i);var s=i;e.default=s});

index.d.ts

@@ -1,15 +1,16 @@
 declare module 'xlsx' {
   interface utils {
+    /* eslint-disable camelcase */
     book_new(): any;
     json_to_sheet(list: any[], options: any): any;
     sheet_to_csv(Sheet: any): any;
-    book_append_sheet(book: any, sheet: any, sheetName: string): any;
+    book_append_sheet(book: any, sheet: any, sheetName?: string): any;
   }
   interface XLSXMethods {
     utils: utils;
     read(result: any, options: any): any;
     write(book: any, options: any): any;
   }
-  const XLSX: XLSXMethods;
+  const XLSX: XLSXMethods
   export default XLSX
 }

index.ts

@@ -1,8 +1,8 @@
 import XEUtils from 'xe-utils/methods/xe-utils'
-import VXETable from 'vxe-table/lib/vxe-table'
+import { VXETable, Table, InterceptorExportParams, InterceptorImportParams, ColumnConfig, ExportOptons } from 'vxe-table/lib/vxe-table' // eslint-disable-line no-unused-vars
 import XLSX from 'xlsx'
 
-function getFooterCellValue ($table: any, opts: any, rows: any[], column: any) {
+function getFooterCellValue ($table: Table, opts: ExportOptons, rows: any[], column: ColumnConfig) {
   var cellValue = XEUtils.toString(rows[$table.$getColumnIndex(column)])
   return cellValue
 }
@@ -14,23 +14,23 @@ function toBuffer (wbout: any) {
   return buf
 }
 
-function exportXLSX (params: any) {
+function exportXLSX (params: InterceptorExportParams) {
   const { $table, options, columns, datas } = params
   const { sheetName, type, isHeader, isFooter, original, message, footerFilterMethod } = options
-  const colHead: any = {}
-  const footList: any[] = []
+  const colHead: { [key: string]: any } = {}
+  const footList: { [key: string]: any }[] = []
   const rowList = datas
   if (isHeader) {
-    columns.forEach((column: any) => {
+    columns.forEach((column) => {
       colHead[column.id] = XEUtils.toString(original ? column.property : column.getTitle())
     })
   }
   if (isFooter) {
-    const footerData: any[] = $table.footerData
-    const footers: any[] = footerFilterMethod ? footerData.filter(footerFilterMethod) : footerData
-    footers.forEach((rows: any[]) => {
+    const { footerData } = $table.getTableData()
+    const footers = footerFilterMethod ? footerData.filter(footerFilterMethod) : footerData
+    footers.forEach((rows) => {
       const item: any = {}
-      columns.forEach((column: any) => {
+      columns.forEach((column) => {
         item[column.id] = getFooterCellValue($table, options, rows, column)
       })
       footList.push(item)
@@ -49,7 +49,7 @@ function exportXLSX (params: any) {
   }
 }
 
-function downloadFile (blob: Blob, options: any) {
+function downloadFile (blob: Blob, options: ExportOptons) {
   if (window.Blob) {
     const { filename, type } = options
     if (navigator.msSaveBlob) {
@@ -72,17 +72,17 @@ function replaceDoubleQuotation (val: string) {
   return val.replace(/^"/, '').replace(/"$/, '')
 }
 
-function parseCsv (columns: any[], content: string) {
-  const list: string[] = content.split('\n')
-  const fields: any[] = []
+function parseCsv (columns: ColumnConfig[], content: string) {
+  const list = content.split('\n')
+  const fields: string[] = []
   const rows: any[] = []
   if (list.length) {
-    const rList: string[] = list.slice(1)
+    const rList = list.slice(1)
     list[0].split(',').map(replaceDoubleQuotation)
-    rList.forEach((r: string) => {
+    rList.forEach((r) => {
       if (r) {
         const item: any = {}
-        r.split(',').forEach((val: string, colIndex: number) => {
+        r.split(',').forEach((val, colIndex) => {
           if (fields[colIndex]) {
             item[fields[colIndex]] = replaceDoubleQuotation(val)
           }
@@ -94,26 +94,26 @@ function parseCsv (columns: any[], content: string) {
   return { fields, rows }
 }
 
-function checkImportData (columns: any[], fields: string[], rows: any[]) {
+function checkImportData (columns: ColumnConfig[], fields: string[], rows: any[]) {
   let tableFields: string[] = []
-  columns.forEach((column: any) => {
-    let field: string = column.property
+  columns.forEach((column) => {
+    let field = column.property
     if (field) {
       tableFields.push(field)
     }
   })
-  return tableFields.every((field: string) => fields.includes(field))
+  return tableFields.every((field) => fields.includes(field))
 }
 
-function importXLSX (params: any) {
-  const { $table, columns, options, file } = params
-  const { _importCallback, _importResolve } = $table
+function importXLSX (params: InterceptorImportParams) {
+  const { columns, options, file } = params
+  const $table: any = params.$table
+  const { _importResolve } = $table
   const fileReader = new FileReader()
   fileReader.onload = (e: any) => {
     const workbook = XLSX.read(e.target.result, { type: 'binary' })
     const csvData: string = XLSX.utils.sheet_to_csv(workbook.Sheets.Sheet1)
-    const rest: any = parseCsv(columns, csvData)
-    const { fields, rows } = rest
+    const { fields, rows } = parseCsv(columns, csvData)
     const status = checkImportData(columns, fields, rows)
     if (status) {
       $table.createData(rows)
@@ -133,23 +133,19 @@ function importXLSX (params: any) {
     if (_importResolve) {
       _importResolve(status)
       $table._importResolve = null
-    } else if (_importCallback) {
-      // 已废弃
-      _importCallback(status)
-      $table._importCallback = null
     }
   }
   fileReader.readAsBinaryString(file)
 }
 
-function handleImportEvent (params: any) {
+function handleImportEvent (params: InterceptorImportParams) {
   if (params.options.type === 'xlsx') {
     importXLSX(params)
     return false
   }
 }
 
-function handleExportEvent (params: any) {
+function handleExportEvent (params: InterceptorExportParams) {
   if (params.options.type === 'xlsx') {
     exportXLSX(params)
     return false

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table-plugin-export-xlsx",
-  "version": "1.2.2",
+  "version": "1.3.0-alpha.0",
   "description": "基于 vxe-table 表格的增强插件，支持导出 xlsx 格式",
   "scripts": {
     "lib": "gulp build"
@@ -46,11 +46,11 @@
     "gulp-uglify": "^3.0.2",
     "markdown-doctest": "^0.9.1",
     "prettier": "^1.18.2",
-    "typescript": "^3.7.2",
-    "vue": "^2.6.10",
-    "vxe-table": "^2.8.18",
-    "xe-utils": "^2.4.1",
-    "xlsx": "^0.15.5"
+    "typescript": "^3.8.3",
+    "vue": "^2.6.11",
+    "vxe-table": "^2.8.31-alpha.3",
+    "xe-utils": "^2.4.2",
+    "xlsx": "^0.15.6"
   },
   "peerDependencies": {
     "vxe-table": ">=2.8.0",