dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-28 10:45:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Jan Prochazka
2021-09-09 08:28:58 +02:00
parent 3776c00377 a0de1b1171
commit eec1840e8a
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -1,6 +1,6 @@
{ {
"private": true, "private": true,
"version": "4.2.8-beta.3", "version": "4.2.8-beta.4",
"name": "dbgate-all", "name": "dbgate-all",
"workspaces": [ "workspaces": [
"packages/*", "packages/*",

6
packages/web/src/datagrid/DataGridCore.svelte
View File

@@ -165,7 +165,9 @@
return `Rows: ${allRowCount.toLocaleString()}`; return `Rows: ${allRowCount.toLocaleString()}`;
} }
function getCopiedValue(value) { function extractCopiedValue(row, col) {
let value = row[col];
if (value === undefined) value = _.get(row, col);
if (value === null) return '(NULL)'; if (value === null) return '(NULL)';
if (value === undefined) return '(NoField)'; if (value === undefined) return '(NoField)';
if (_.isPlainObject(value) || _.isArray(value)) return JSON.stringify(value); if (_.isPlainObject(value) || _.isArray(value)) return JSON.stringify(value);
@@ -339,7 +341,7 @@
if (!rowData) return ''; if (!rowData) return '';
const line = colIndexes const line = colIndexes
.map(col => realColumnUniqueNames[col]) .map(col => realColumnUniqueNames[col])
.map(col => getCopiedValue(rowData[col])) .map(col => extractCopiedValue(rowData, col))
.join('\t'); .join('\t');
return line; return line;
}); });