diff --git a/.gitee/ISSUE_TEMPLATE.en.md b/.gitee/ISSUE_TEMPLATE.en.md deleted file mode 100644 index 05401a1..0000000 --- a/.gitee/ISSUE_TEMPLATE.en.md +++ /dev/null @@ -1,15 +0,0 @@ -**(Required) Describe the bug or screenshots:** -? - -**(Required) Reproduction link:** -? - -**(Required) Expected behavior:** -? - -**(Required) Please fill in the version information:** - -- OS: ? -- Browser: ? -- vue: ? -- vxe-table: ? diff --git a/.gitee/ISSUE_TEMPLATE.md b/.gitee/ISSUE_TEMPLATE.md deleted file mode 100644 index 0a314ea..0000000 --- a/.gitee/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,15 +0,0 @@ -**（必填）请填写问题描述或截图：** -？ - -**（必填）请填重在线链接：** -？ - -**（必填）请填写期望的结果：** -？ - -**（必填）请填写以下信息：** - -- OS: ？ -- Browser: ？ -- vue: ？ -- vxe-table: ？ diff --git a/.gitee/ISSUE_TEMPLATE.zh-TW.md b/.gitee/ISSUE_TEMPLATE.zh-TW.md deleted file mode 100644 index 1ad0c7e..0000000 --- a/.gitee/ISSUE_TEMPLATE.zh-TW.md +++ /dev/null @@ -1,15 +0,0 @@ -**（必填）請填寫問題描述或截圖：** -？ - -**（必填）請填重線上連結：** -？ - -**（必填）請填寫期望的結果：** -？ - -**（必填）請填寫以下資訊：** - -- OS: ？ -- Browser: ？ -- vue: ？ -- vxe-table: ？ diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 9a05f3c..0000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,24 +0,0 @@ ---- -name: Bug report -about: 反馈问题：请将问题的重现步骤描述清楚！ -title: '' -labels: bug -assignees: '' - ---- - -**（必填）请填写问题描述或截图：** -？ - -**（必填）请填在线链接：** -？ - -**（必填）请填写期望的结果：** -？ - -**（必填）请填写以下信息：** - -- OS: ？ -- Browser: ？ -- vue: ？ -- vxe-table: ？ diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index abfc3e1..0000000 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -name: Feature request -about: 功能需求：这个需求解决了什么问题？ -title: '' -labels: enhancement -assignees: '' - ---- - -**（必填）这个需求解决了什么问题：** -？ - -**截图或在线链接：** -？ - -**建议的 API 是什么样的：** -？ - -**是否已有其他不错的替代方案：** -？ diff --git a/index.ts b/index.ts index f1210c4..3a54b63 100644 --- a/index.ts +++ b/index.ts @@ -7,7 +7,7 @@ import { ColumnConfig, TableExportConfig, ColumnAlign -} from 'vxe-table/lib/vxe-table' +} from 'vxe-table' import * as ExcelJS from 'exceljs' const defaultHeaderBackgroundColor = 'f8f8f9' @@ -19,7 +19,7 @@ function getCellLabel (column: ColumnConfig, cellValue: any) { if (cellValue) { switch (column.cellType) { case 'string': - return XEUtils.toString(cellValue) + return XEUtils.toValueString(cellValue) case 'number': if (!isNaN(cellValue)) { return Number(cellValue) @@ -45,7 +45,7 @@ function getFooterCellValue ($table: Table, opts: TableExportConfig, rows: any[] return cellValue } -declare module 'vxe-table/lib/vxe-table' { +declare module 'vxe-table' { interface ColumnInfo { _row: any; _colSpan: number; @@ -135,7 +135,7 @@ function exportXLSX (params: InterceptorExportParams) { // 处理分组 if (isColgroup && !original && colgroups) { colgroups.forEach((cols, rIndex) => { - let groupHead: any = {} + const groupHead: any = {} columns.forEach((column) => { groupHead[column.id] = null }) @@ -161,7 +161,7 @@ function exportXLSX (params: InterceptorExportParams) { // 处理合并 if (isMerge && !original) { mergeCells.forEach(mergeItem => { - let { row: mergeRowIndex, rowspan: mergeRowspan, col: mergeColIndex, colspan: mergeColspan } = mergeItem + const { row: mergeRowIndex, rowspan: mergeRowspan, col: mergeColIndex, colspan: mergeColspan } = mergeItem sheetMerges.push({ s: { r: mergeRowIndex + beforeRowCount, c: mergeColIndex }, e: { r: mergeRowIndex + beforeRowCount + mergeRowspan - 1, c: mergeColIndex + mergeColspan - 1 } @@ -184,7 +184,7 @@ function exportXLSX (params: InterceptorExportParams) { // 处理合并 if (isMerge && !original) { mergeFooterItems.forEach(mergeItem => { - let { row: mergeRowIndex, rowspan: mergeRowspan, col: mergeColIndex, colspan: mergeColspan } = mergeItem + const { row: mergeRowIndex, rowspan: mergeRowspan, col: mergeColIndex, colspan: mergeColspan } = mergeItem sheetMerges.push({ s: { r: mergeRowIndex + beforeRowCount, c: mergeColIndex }, e: { r: mergeRowIndex + beforeRowCount + mergeRowspan - 1, c: mergeColIndex + mergeColspan - 1 } @@ -224,7 +224,7 @@ function exportXLSX (params: InterceptorExportParams) { }, fill: { type: 'pattern', - pattern:'solid', + pattern: 'solid', fgColor: { argb: defaultHeaderBackgroundColor } @@ -280,23 +280,24 @@ function exportXLSX (params: InterceptorExportParams) { }) } if (useStyle && sheetMethod) { - sheetMethod({ options, workbook, worksheet: sheet, columns, colgroups, datas, $table }) + const sParams = { options: options as any, workbook, worksheet: sheet, columns, colgroups, datas, $table } + sheetMethod(sParams) } sheetMerges.forEach(({ s, e }) => { sheet.mergeCells(s.r + 1, s.c + 1, e.r + 1, e.c + 1) }) - workbook.xlsx.writeBuffer().then(buffer => { - var blob = new Blob([buffer], { type: 'application/octet-stream' }) + workbook.xlsx.writeBuffer().then(buffer => { + const blob = new Blob([buffer], { type: 'application/octet-stream' }) // 导出 xlsx downloadFile(params, blob, options) - if (showMsg) { + if (showMsg && modal) { modal.close(msgKey) - modal.message({ message: t('vxe.table.expSuccess'), status: 'success' }) + modal.message({ content: t('vxe.table.expSuccess') as string, status: 'success' }) } }) } - if (showMsg) { - modal.message({ id: msgKey, message: t('vxe.table.expLoading'), status: 'loading', duration: -1 }) + if (showMsg && modal) { + modal.message({ id: msgKey, content: t('vxe.table.expLoading') as string, status: 'loading', duration: -1 }) setTimeout(exportMethod, 1500) } else { exportMethod() @@ -310,8 +311,8 @@ function downloadFile (params: InterceptorExportParams, blob: Blob, options: Tab const { message, filename, type } = options const showMsg = message !== false if (window.Blob) { - if (navigator.msSaveBlob) { - navigator.msSaveBlob(blob, `${filename}.${type}`) + if ((navigator as any).msSaveBlob) { + (navigator as any).msSaveBlob(blob, `${filename}.${type}`) } else { const linkElem = document.createElement('a') linkElem.target = '_blank' @@ -322,8 +323,8 @@ function downloadFile (params: InterceptorExportParams, blob: Blob, options: Tab document.body.removeChild(linkElem) } } else { - if (showMsg) { - modal.alert({ message: t('vxe.error.notExp'), status: 'error' }) + if (showMsg && modal) { + modal.alert({ content: t('vxe.error.notExp') as string, status: 'error' }) } } } @@ -332,7 +333,7 @@ function checkImportData (tableFields: string[], fields: string[]) { return fields.some(field => tableFields.indexOf(field) > -1) } -declare module 'vxe-table/lib/vxe-table' { +declare module 'vxe-table' { interface Table { _importResolve?: Function | null; _importReject?: Function | null; @@ -343,8 +344,8 @@ function importError (params: InterceptorImportParams) { const { $vxe, _importReject } = $table const showMsg = options.message !== false const { modal, t } = $vxe - if (showMsg) { - modal.message({ message: t('vxe.error.impFields'), status: 'error' }) + if (showMsg && modal) { + modal.message({ content: t('vxe.error.impFields') as string, status: 'error' }) } if (_importReject) { _importReject({ status: false }) @@ -380,7 +381,7 @@ function importXLSX (params: InterceptorImportParams) { const status = checkImportData(tableFields, fields) if (status) { const records = sheetValues.slice(fieldIndex).map(list => { - const item : any= {} + const item : any = {} list.forEach((cellValue, cIndex) => { item[fields[cIndex]] = cellValue }) @@ -404,8 +405,8 @@ function importXLSX (params: InterceptorImportParams) { } }) }) - if (showMsg) { - modal.message({ message: t('vxe.table.impSuccess', [records.length]), status: 'success' }) + if (showMsg && modal) { + modal.message({ content: t('vxe.table.impSuccess', [records.length]) as string, status: 'success' }) } } else { importError(params) diff --git a/package.json b/package.json index 8c99c2e..580776a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vxe-table-plugin-export-xlsx", - "version": "2.2.1", + "version": "2.2.2", "description": "基于 vxe-table 的表格插件，支持导出 xlsx 格式", "scripts": { "lib": "gulp build" @@ -48,9 +48,9 @@ "markdown-doctest": "^1.1.0", "prettier": "^2.1.2", "typescript": "^4.0.5", - "vue": "^2.6.12", - "vxe-table": "^3.2.4", - "xe-utils": "^3.1.12" + "vue": "^2.6.14", + "vxe-table": "^3.4.4", + "xe-utils": "^3.4.0" }, "peerDependencies": { "vxe-table": "^2.10.0 || ^3.2.0"