From a5f05eea3fc695be421dcdf36d13ee319541de4c Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Fri, 2 Dec 2022 18:53:21 +0800 Subject: [PATCH] fix(nocodb): provide header in XLSX.utils.json_to_sheet --- packages/nocodb/src/lib/meta/api/dataApis/helpers.ts | 5 ++++- .../src/lib/meta/api/publicApis/publicDataExportApis.ts | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/nocodb/src/lib/meta/api/dataApis/helpers.ts b/packages/nocodb/src/lib/meta/api/dataApis/helpers.ts index b68a10f1d3..5bb19fa1b4 100644 --- a/packages/nocodb/src/lib/meta/api/dataApis/helpers.ts +++ b/packages/nocodb/src/lib/meta/api/dataApis/helpers.ts @@ -58,7 +58,10 @@ export async function extractXlsxData(view: View, req: Request) { }); const { offset, dbRows, elapsed } = await getDbRows(baseModel, view, req); - const data = XLSX.utils.json_to_sheet(dbRows); + + const fields = req.query.fields as string[]; + + const data = XLSX.utils.json_to_sheet(dbRows, { header: fields }); return { offset, dbRows, elapsed, data }; } diff --git a/packages/nocodb/src/lib/meta/api/publicApis/publicDataExportApis.ts b/packages/nocodb/src/lib/meta/api/publicApis/publicDataExportApis.ts index 6d56f2f393..530504c9b7 100644 --- a/packages/nocodb/src/lib/meta/api/publicApis/publicDataExportApis.ts +++ b/packages/nocodb/src/lib/meta/api/publicApis/publicDataExportApis.ts @@ -32,7 +32,9 @@ async function exportExcel(req: Request, res: Response) { const { offset, dbRows, elapsed } = await getDbRows(model, view, req); - const data = XLSX.utils.json_to_sheet(dbRows); + const fields = req.query.fields as string[]; + + const data = XLSX.utils.json_to_sheet(dbRows, { header: fields }); const wb = XLSX.utils.book_new(); XLSX.utils.book_append_sheet(wb, data, view.title); const buf = XLSX.write(wb, { type: 'base64', bookType: 'xlsx' });