@datarailsshared/dr_renderer 1.2.395 → 1.2.396

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datarailsshared/dr_renderer",
-  "version": "1.2.395",
+  "version": "1.2.396",
   "description": "DataRails charts and tables renderer",
   "keywords": [
     "datarails",

package/src/highcharts_renderer.js

@@ -728,7 +728,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         destroyWhenHiding: true,
         formatter: function () {
             const rowKey = pivotData.rowAttrs.length ? lodash.get(this.point, 'series.name') || "" : "";
-            const colKey = lodash.get(this.point, 'name') || this.x.name[0] || "";
+            const colKey = lodash.get(this.point, 'initialName') || lodash.get(this.point, 'name') || this.x.name[0] || "";
+
             const insight = pivotData.getInsight(colKey, rowKey) || {};
             setTimeout(() => {
                 var aggr = highchartsRenderer.defaultFormatterToTooltip(pivotData, opts);
@@ -1520,10 +1521,14 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 let totalKey = columnKey;
                 if (lodash.isArray(columnKey)) {
                     key = columnKey[0];
-                    totalKey = totalKey.join(' , ');
+                    totalKey = totalKey.join(highchartsRenderer.delimer);
                 }
+
+                const initialKey = lodash.unescape(key);
+                const formattedKey = highchartsRenderer.getFormattedColKey(initialKey, pivotData);
                 const value = pivotData.colTotals[totalKey] ? pivotData.colTotals[totalKey].value() : 0;
-                totalSeries.data.push({name: lodash.unescape(key), y: value});
+
+                totalSeries.data.push({name: lodash.unescape(formattedKey), initialName: initialKey, y: value});
             });
 
             chart_series.push(totalSeries);
@@ -8927,6 +8932,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                                 value,
                                 highchartsRenderer.getDateFieldFormat(widget, widget.cols[0])
                             );
+                        } else if (!isNaN(value)) {
+                            value = +value;
                         }
                         break;
                     case 'Integer':
@@ -9765,11 +9772,11 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     const isDate = formatInfo.type === 'Date';
                     const isDateFormatting = isDate && highchartsRenderer.isFormattingDatesAsOtherAxisTypes();
                     const isNumberFormatting = !isDate && formatInfo.format && highchartsRenderer.isFormattingNumberAxis(pivotData);
-                    const isApplyingFormat = !isNaN(valueToFloat) && (isNumberFormatting || isDateFormatting);
-                    if (isApplyingFormat) {
+
+                    if (isNumberFormatting || isDateFormatting) {
                         values[key] = highchartsRenderer.returnRawDataValue(
                             formatInfo.type,
-                            valueToFloat,
+                            !isNaN(valueToFloat) ? valueToFloat : value,
                             formatInfo.format,
                             formatInfo.name,
                             formatInfo.val_not_convert,