@datarailsshared/dr_renderer 1.2.117 → 1.2.120

package/package.json

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

package/src/highcharts_renderer.js

@@ -807,14 +807,18 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             };
             if (isNewAngular) {
                 const isPieChart = chartOptions.chart && chartOptions.chart.type === 'pie';
+                const x = isPieChart ? 0 :
+                    chartOptions.yAxis.title.text || chartOptions.yAxis.title.autoylabel ? -60 : -40;
+                const y = isPieChart ? 27 :
+                    chartOptions.xAxis.title.text || chartOptions.xAxis.title.autoxlabel ? 65 : 43;
                 chartOptions.drilldown.breadcrumbs = {
                     formatter: () => '< Back',
                     showFullPath: false,
                     position: {
                         align: 'left',
                         verticalAlign: 'bottom',
-                        x: isPieChart ? 0 : -80,
-                        y: isPieChart ? 27 : 60,
+                        x: x,
+                        y: y,
                     },
                     floating: true,
                     buttonTheme: {
@@ -823,7 +827,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         'stroke-width': 1,
                         stroke: '#85889c',
                         r: 3,
-                        padding: 7,
+                        padding: 3,
                         states: {
                             hover: {
                                 fill: '#eef3f6',
@@ -4296,7 +4300,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         filter.values[i] = highchartsRenderer.returnRawDataValue(filter.type, filter.values[i], filter.format, filter.name);
                     }
                 }
-                filter.value_to_show = filter.values.join(',');
+                filter.value_to_show = filter.values.join(', ');
             } else if (filter.values && filter.values.label) {
                 filter.value_to_show = filter.values.label;
             } else {
@@ -7581,6 +7585,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         for (let i = 0; i < rowKey.length; i++) {
             let filter = lodash.find(filters, {name: widget.rows[i].name});
             if (filter) {
+                filter.is_excluded = false;
                 filter.values = widget.rows[i].type === 'Date' ?
                     highchartsRenderer.createDateTypeFromValue(rowKey[i], widget.rows[i].format) :
                     [rowKey[i]];
@@ -7591,6 +7596,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         for (let i = 0; i < colKey.length; i++) {
             let filter = lodash.find(filters, {name: widget.cols[i].name});
             if (filter) {
+                filter.is_excluded = false;
                 filter.values = widget.cols[i].type === 'Date' ?
                     highchartsRenderer.createDateTypeFromValue(colKey[i], widget.cols[i].format) :
                     [colKey[i]];
@@ -7684,6 +7690,13 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     };
 
     highchartsRenderer.getWidgetDataSorters = function (res, widget, defaultDateFormat) {
+        if ($.pivotUtilities && !$.pivotUtilities.additionalFieldsList) {
+            $.pivotUtilities.additionalFieldsList = [
+                {key: 'DR_Average', name: 'DR_Average'},
+                {key: 'DR_Others', name: _.get(widget.options, "total_value_options.filter_options.filteredOutFieldName") || 'Others'}
+            ];
+        }
+
         var datesFields = [];
         datesFields = lodash.filter(widget.rows, element => element.type == 'Date');
         datesFields = datesFields.concat(lodash.filter(widget.cols, element => element.type == 'Date'));