@datarailsshared/dr_renderer 1.2.62 → 1.2.63

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/src/highcharts_renderer.js +9 -4
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@datarailsshared/dr_renderer",
3
- "version": "1.2.62",
3
+ "version": "1.2.63",
4
4
  "description": "DataRails charts and tables renderer",
5
5
  "keywords": [
6
6
  "datarails",
package/src/highcharts_renderer.js CHANGED
@@ -1026,7 +1026,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
1026
1026
  chart_series.push(newSeries);
1027
1027
  }
1028
1028
 
1029
- chart_series = [...chart_series, ...trendSerieses]
1029
+ chart_series = chart_series.concat(trendSerieses);
1030
1030
 
1031
1031
  highchartsRenderer.moveSeriesToSecondYAxisIfNeeded(chart_series, pivotData, chartOptions, additionOptions, opts, opts.total && opts.totalSeriesSettings && opts.totalSeriesSettings.secondaryAxis);
1032
1032
 
@@ -1180,9 +1180,14 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
1180
1180
  }
1181
1181
 
1182
1182
  totalSeries.yAxis = opts.totalSeriesSettings.secondaryAxis ? 1 : undefined;
1183
- } else if (chartType === 'combo-column-chart' || chartType === 'combo-stacked-chart') {
1184
- totalSeries.type = 'column';
1183
+ } else if (chartType.includes('combo')) {
1184
+ if (has_delta) {
1185
+ totalSeries.type = 'column';
1186
+ } else {
1187
+ totalSeries.type = 'line';
1188
+ }
1185
1189
  }
1190
+
1186
1191
  totalSeries.name = 'Total';
1187
1192
  totalSeries.data = [];
1188
1193
  col_n_keys.forEach(columnKey => {
@@ -1198,7 +1203,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
1198
1203
  chart_series.push(totalSeries);
1199
1204
  }
1200
1205
 
1201
- chart_series = [...chart_series, ...trendSerieses];
1206
+ chart_series = chart_series.concat(trendSerieses);
1202
1207
 
1203
1208
  highchartsRenderer.moveSeriesToSecondYAxisIfNeeded(chart_series, pivotData, chartOptions, additionOptions, opts, opts.total && opts.totalSeriesSettings && opts.totalSeriesSettings.secondaryAxis);
1204
1209