opensource/beekeeper-studio
1
0
Fork 0
mirror of https://github.com/beekeeper-studio/beekeeper-studio.git synced 2026-03-13 10:12:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2938 from therealrinku/fix/excel-export-null-values

Browse Source 
fix: excel export null values
This commit is contained in:
Day Matchullis
2025-03-27 13:54:44 -06:00
committed by GitHub
parent bc2cdca427 da662f59a2
commit b30c0572f6
1 changed files with 44 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
apps/studio/src/components/editor/ResultTable.vue
View File

@@ -27,6 +27,7 @@
import { copyRanges, copyActionsMenu, commonColumnMenu, resizeAllColumnsToFitContent, resizeAllColumnsToFixedWidth } from '@/lib/menu/tableMenu';
import { rowHeaderField } from '@/common/utils'
import { tabulatorForTableData } from '@/common/tabulator';
import XLSX from 'xlsx';
export default {
mixins: [Converter, Mutators, FkLinkMixin],
@@ -223,23 +224,52 @@
return firstObjectOnly ? result[0] : result
},
download(format) {
let formatter = format !== 'md' ? format : (rows, options, setFileContents) => {
const values = rows.map(row => row.columns.map(col => typeof col.value === 'object' ? JSON.stringify(col.value) : col.value))
setFileContents(markdownTable(values), 'text/markdown')
};
let formatter = format;
const dateString = dateFormat(new Date(), 'yyyy-mm-dd_hMMss');
const title = this.query.title ? _.snakeCase(this.query.title) : 'query_results';
if(format === 'md'){
formatter = (rows, options, setFileContents) => {
const values = rows.map(row => row.columns.map(col => typeof col.value === 'object' ? JSON.stringify(col.value) : col.value));
setFileContents(markdownTable(values), 'text/markdown')
};
}
// Fix Issue #1493 Lost column names in json query download
// by overriding the tabulator-generated json with ...what cipboard() does, below:
formatter = format !== 'json' ? formatter : (rows, options, setFileContents) => {
setFileContents(
JSON.stringify(this.dataToJson(this.tabulator.getData(), false), null, " "), 'text/json'
)
};
const dateString = dateFormat(new Date(), 'yyyy-mm-dd_hMMss')
const title = this.query.title ? _.snakeCase(this.query.title) : "query_results"
if(format === 'json'){
formatter = (rows, options, setFileContents) => {
const newValue = JSON.stringify(this.dataToJson(this.tabulator.getData(), false), null, " ");
setFileContents(newValue, 'text/json');
};
}
// xlsx seems to be the only one that doesn't know what 'all' is it would seem https://tabulator.info/docs/5.4/download#xlsx
const options = typeof formatter !== 'function' && formatter.toLowerCase() === 'xlsx' ? {} : 'all'
this.tabulator.download(formatter, `${title}-${dateString}.${format}`, options)
// Fix Issue #2863 replacing null values with empty string
if(format === 'xlsx'){
formatter = (rows, options, setFileContents) => {
const values = rows.map(row => row.columns.map(col => {
if(col.value === null){
return '';
}
if(typeof col.value === 'object'){
return JSON.stringify(col.value);
}
return col.value;
})
);
const ws = XLSX.utils.aoa_to_sheet(values);
const wb = XLSX.utils.book_new();
XLSX.utils.book_append_sheet(wb, ws, title);
const excel = XLSX.write(wb, { type: 'buffer' });
setFileContents(excel);
}
}
this.tabulator.download(formatter, `${title}-${dateString}.${format}`, 'all');
},
clipboard(format = null) {
// this.tabulator.copyToClipboard("all")