IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Allow configuration of CSV and clipboard formatting of query results. Fixes #2781

Browse Source
This commit is contained in:
Khushboo Vashi
2017-11-20 13:50:47 +00:00
committed by Dave Page
parent 2579458091
commit 0c566f132e
19 changed files with 247 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
web/pgadmin/static/js/selection/copy_data.js
View File

@@ -14,6 +14,7 @@ function ($, _, clipboard, RangeSelectionHelper, rangeBoundaryNavigator) {
var selectedRanges = grid.getSelectionModel().getSelectedRanges();
var dataView = grid.getData();
var rows = grid.getSelectedRows();
var CSVOptions = grid.CSVOptions;
if (RangeSelectionHelper.areAllRangesCompleteRows(grid, selectedRanges)) {
self.copied_rows = rows.map(function (rowIndex) {
@@ -24,7 +25,7 @@ function ($, _, clipboard, RangeSelectionHelper, rangeBoundaryNavigator) {
self.copied_rows = [];
setPasteRowButtonEnablement(self.can_edit, false);
}
var csvText = rangeBoundaryNavigator.rangesToCsv(dataView.getItems(), columnDefinitions, selectedRanges);
var csvText = rangeBoundaryNavigator.rangesToCsv(dataView.getItems(), columnDefinitions, selectedRanges, CSVOptions);
if (csvText) {
clipboard.copyTextToClipboard(csvText);
}

38
web/pgadmin/static/js/selection/range_boundary_navigator.js
View File

@@ -57,7 +57,7 @@ function (RangeSelectionHelper) {
}.bind(this));
},
rangesToCsv: function (data, columnDefinitions, selectedRanges) {
rangesToCsv: function (data, columnDefinitions, selectedRanges, CSVOptions) {
var rowRangeBounds = selectedRanges.map(function (range) {
return [range.fromRow, range.toRow];
@@ -70,8 +70,9 @@ function (RangeSelectionHelper) {
colRangeBounds = this.removeFirstColumn(colRangeBounds);
}
var csvRows = this.mapOver2DArray(rowRangeBounds, colRangeBounds, this.csvCell.bind(this, data, columnDefinitions), function (rowData) {
return rowData.join(',');
var csvRows = this.mapOver2DArray(rowRangeBounds, colRangeBounds, this.csvCell.bind(this, data, columnDefinitions, CSVOptions), function (rowData) {
var field_separator = CSVOptions.field_separator || '\t';
return rowData.join(field_separator);
});
return csvRows.join('\n');
@@ -102,17 +103,30 @@ function (RangeSelectionHelper) {
return unionedColRanges;
},
csvCell: function (data, columnDefinitions, rowId, colId) {
var val = data[rowId][columnDefinitions[colId].field];
csvCell: function (data, columnDefinitions, CSVOptions, rowId, colId) {
var val = data[rowId][columnDefinitions[colId].field],
quoting = CSVOptions.quoting || 'strings',
quote_char = CSVOptions.quote_char || '"';
if (val && _.isObject(val)) {
val = '\'' + JSON.stringify(val) + '\'';
} else if (val && typeof val != 'number' && typeof val != 'boolean') {
val = '\'' + val.toString() + '\'';
} else if (_.isNull(val) || _.isUndefined(val)) {
val = '';
if (quoting == 'all') {
if (val && _.isObject(val)) {
val = quote_char + JSON.stringify(val) + quote_char;
} else if (val) {
val = quote_char + val.toString() + quote_char;
} else if (_.isNull(val) || _.isUndefined(val)) {
val = '';
}
}
else if(quoting == 'strings') {
if (val && _.isObject(val)) {
val = quote_char + JSON.stringify(val) + quote_char;
} else if (val && typeof val != 'number' && typeof val != 'boolean') {
val = quote_char + val.toString() + quote_char;
} else if (_.isNull(val) || _.isUndefined(val)) {
val = '';
}
}
return val;
},
};
});
});