Merge pull request #4538 from ggrote/main

CSV Export numberFormatter
apexcharts · Jun 26, 2024 · 7d02a91 · 7d02a91
2 parents 4005cd3 + 017a185
commit 7d02a91
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/src/modules/Exports.js b/src/modules/Exports.js
@@ -304,16 +304,13 @@ class Exports {
               isTimeStamp(cat)
                 ? w.config.chart.toolbar.export.csv.dateFormatter(cat)
                 : Utils.isNumber(cat)
-                ? cat
+                ? w.config.chart.toolbar.export.csv.numberFormatter(cat)
                 : cat.split(columnDelimiter).join('')
             )
 
             for (let ci = 0; ci < w.globals.series.length; ci++) {
-              if (dataFormat.isFormatXY()) {
-                columns.push(series[ci].data[i]?.y)
-              } else {
-                columns.push(gSeries[ci][i])
-              }
+              const value = dataFormat.isFormatXY() ? series[ci].data[i]?.y : gSeries[ci][i];
+              columns.push(Utils.isNumber(value) ? w.config.chart.toolbar.export.csv.numberFormatter(value) : value)
             }
           }
 
@@ -372,7 +369,7 @@ class Exports {
           if (!data[cat]) {
             data[cat] = Array(series.length).fill('')
           }
-          data[cat][sI] = value
+          data[cat][sI] = Utils.isNumber(value) ? w.config.chart.toolbar.export.csv.numberFormatter(value) : value
           categories.add(cat)
         })
       })
@@ -388,7 +385,7 @@ class Exports {
             isTimeStamp(cat) && w.config.xaxis.type === 'datetime'
               ? w.config.chart.toolbar.export.csv.dateFormatter(cat)
               : Utils.isNumber(cat)
-              ? cat
+              ? w.config.chart.toolbar.export.csv.numberFormatter(cat)
               : cat.split(columnDelimiter).join(''),
             data[cat].join(columnDelimiter),
           ])
@@ -444,7 +441,7 @@ class Exports {
           columns = []
 
           columns.push(w.globals.labels[sI].split(columnDelimiter).join(''))
-          columns.push(gSeries[sI])
+          columns.push(gSeries[sI].map(x => Utils.isNumber(x) ? w.config.chart.toolbar.export.csv.numberFormatter(value) : value))
           rows.push(columns.join(columnDelimiter))
         }
       })

diff --git a/src/modules/settings/Options.js b/src/modules/settings/Options.js
@@ -372,6 +372,9 @@ export default class Options {
               dateFormatter(timestamp) {
                 return new Date(timestamp).toDateString()
               },
+              numberFormatter(value) {
+                return value;
+              }
             },
             png: {
               filename: undefined,

diff --git a/types/apexcharts.d.ts b/types/apexcharts.d.ts
@@ -192,6 +192,7 @@ type ApexChart = {
         headerCategory?: string
         headerValue?: string
         dateFormatter?(timestamp?: number): any
+        numberFormatter?(value?: number): any
       },
       svg?: {
         filename?: undefined | string