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

Merge pull request #14113 from cinaglia/fix-csv-decimal-places

Browse Source 
Retain decimal precision when exporting CSV
This commit is contained in:
Torkel Ödegaard
2018-12-19 11:56:27 +01:00
committed by GitHub
parent cbeefcd376 4ed0a3d29a
commit 9e92609313
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/core/specs/file_export.test.ts
View File

@@ -73,6 +73,7 @@ describe('file_export', () => {
], ],
rows: [ rows: [
[123, 'some_string', 1.234, true], [123, 'some_string', 1.234, true],
[1000, 'some_string', 1.234567891, true],
[0o765, 'some string with " in the middle', 1e-2, false], [0o765, 'some string with " in the middle', 1e-2, false],
[0o765, 'some string with "" in the middle', 1e-2, false], [0o765, 'some string with "" in the middle', 1e-2, false],
[0o765, 'some string with """ in the middle', 1e-2, false], [0o765, 'some string with """ in the middle', 1e-2, false],
@@ -89,6 +90,7 @@ describe('file_export', () => {
const expectedText = const expectedText =
'"integer_value";"string_value";"float_value";"boolean_value"\r\n' + '"integer_value";"string_value";"float_value";"boolean_value"\r\n' +
'123;"some_string";1.234;true\r\n' + '123;"some_string";1.234;true\r\n' +
'1000;"some_string";1.234567891;true\r\n' +
'501;"some string with "" in the middle";0.01;false\r\n' + '501;"some string with "" in the middle";0.01;false\r\n' +
'501;"some string with """" in the middle";0.01;false\r\n' + '501;"some string with """" in the middle";0.01;false\r\n' +
'501;"some string with """""" in the middle";0.01;false\r\n' + '501;"some string with """""" in the middle";0.01;false\r\n' +

4
public/app/core/utils/file_export.ts
View File

@@ -41,10 +41,8 @@ function formatSpecialHeader(useExcelHeader) {
function formatRow(row, addEndRowDelimiter = true) { function formatRow(row, addEndRowDelimiter = true) {
let text = ''; let text = '';
for (let i = 0; i < row.length; i += 1) { for (let i = 0; i < row.length; i += 1) {
if (isBoolean(row[i]) || isNullOrUndefined(row[i])) { if (isBoolean(row[i]) || isNumber(row[i]) || isNullOrUndefined(row[i])) {
text += row[i]; text += row[i];
} else if (isNumber(row[i])) {
text += row[i].toLocaleString();
} else { } else {
text += `${QUOTE}${csvEscaped(htmlUnescaped(htmlDecoded(row[i])))}${QUOTE}`; text += `${QUOTE}${csvEscaped(htmlUnescaped(htmlDecoded(row[i])))}${QUOTE}`;
} }