diff --git a/src/mixins/ConfigurableTableMixin.js b/src/mixins/ConfigurableTableMixin.js index e0eec074..c4bcdfd1 100644 --- a/src/mixins/ConfigurableTableMixin.js +++ b/src/mixins/ConfigurableTableMixin.js @@ -297,8 +297,9 @@ export const ConfigurableTableMixin = { /** * 导出 * @param fileName + * @param fileSuffix */ - handleExportXls (fileName) { + handleExportXls (fileName, fileSuffix = '.xls') { if (!fileName || typeof fileName !== 'string') { fileName = '导出文件' } @@ -323,13 +324,13 @@ export const ConfigurableTableMixin = { return } if (typeof window.navigator.msSaveBlob !== 'undefined') { - window.navigator.msSaveBlob(new Blob([data], { type: 'application/vnd.ms-excel' }), fileName + '.xls') + window.navigator.msSaveBlob(new Blob([data], { type: 'application/vnd.ms-excel' }), fileName + fileSuffix) } else { const url = window.URL.createObjectURL(new Blob([data], { type: 'application/vnd.ms-excel' })) const link = document.createElement('a') link.style.display = 'none' link.href = url - link.setAttribute('download', fileName + '.xls') + link.setAttribute('download', fileName + fileSuffix) document.body.appendChild(link) link.click() document.body.removeChild(link) // 下载完成移除元素 @@ -373,11 +374,11 @@ export const ConfigurableTableMixin = { }) }, // 下载导入模板 - downTemplate (fileName) { + downTemplate (fileName, fileSuffix = '.xlsx') { if (!fileName || typeof fileName !== 'string') { fileName = '模板文件' } - downloadFile(this.url.downTemplateUrl, fileName + '.xlsx') + downloadFile(this.url.downTemplateUrl, fileName + fileSuffix) }, /** * 批量删除 diff --git a/src/mixins/JeroListMixin.js b/src/mixins/JeroListMixin.js index 7503cdce..35e8c4a6 100644 --- a/src/mixins/JeroListMixin.js +++ b/src/mixins/JeroListMixin.js @@ -288,7 +288,7 @@ export const JeroListMixin = { const paramsStr = encodeURI(JSON.stringify(this.getQueryParams())) window.location.href = `${window._CONFIG.domianURL}/${this.url.exportXlsUrl}?paramsStr=${paramsStr}` }, - handleExportXls (fileName) { + handleExportXls (fileName, fileSuffix = '.xlsx') { if (!fileName || typeof fileName !== 'string') { fileName = '导出文件' } @@ -313,13 +313,13 @@ export const JeroListMixin = { return } if (typeof window.navigator.msSaveBlob !== 'undefined') { - window.navigator.msSaveBlob(new Blob([data], { type: 'application/vnd.ms-excel' }), fileName + '.xlsx') + window.navigator.msSaveBlob(new Blob([data], { type: 'application/vnd.ms-excel' }), fileName + fileSuffix) } else { const url = window.URL.createObjectURL(new Blob([data], { type: 'application/vnd.ms-excel' })) const link = document.createElement('a') link.style.display = 'none' link.href = url - link.setAttribute('download', fileName + '.xlsx') + link.setAttribute('download', fileName + fileSuffix) document.body.appendChild(link) link.click() document.body.removeChild(link) // 下载完成移除元素 @@ -462,11 +462,11 @@ export const JeroListMixin = { window.open(url) }, // 下载导入模板 - downTemplate (fileName) { + downTemplate (fileName, fileSuffix = '.xlsx') { if (!fileName || typeof fileName !== 'string') { fileName = '模板文件' } - downloadFile(this.url.downTemplateUrl, fileName + '.xlsx') + downloadFile(this.url.downTemplateUrl, fileName + fileSuffix) }, handleImportByFileId (fileId) { // TODO 完善通过文件id上传文件的方法