@datarailsshared/dr_renderer 1.2.59 → 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.
- package/package.json +1 -1
- package/src/highcharts_renderer.js +11 -4
package/package.json
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 =
|
|
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,7 +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.includes('combo')) {
|
|
1184
|
+
if (has_delta) {
|
|
1185
|
+
totalSeries.type = 'column';
|
|
1186
|
+
} else {
|
|
1187
|
+
totalSeries.type = 'line';
|
|
1188
|
+
}
|
|
1183
1189
|
}
|
|
1190
|
+
|
|
1184
1191
|
totalSeries.name = 'Total';
|
|
1185
1192
|
totalSeries.data = [];
|
|
1186
1193
|
col_n_keys.forEach(columnKey => {
|
|
@@ -1196,7 +1203,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
1196
1203
|
chart_series.push(totalSeries);
|
|
1197
1204
|
}
|
|
1198
1205
|
|
|
1199
|
-
chart_series =
|
|
1206
|
+
chart_series = chart_series.concat(trendSerieses);
|
|
1200
1207
|
|
|
1201
1208
|
highchartsRenderer.moveSeriesToSecondYAxisIfNeeded(chart_series, pivotData, chartOptions, additionOptions, opts, opts.total && opts.totalSeriesSettings && opts.totalSeriesSettings.secondaryAxis);
|
|
1202
1209
|
|
|
@@ -5001,7 +5008,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
5001
5008
|
return valToReturn;
|
|
5002
5009
|
};
|
|
5003
5010
|
|
|
5004
|
-
highchartsRenderer.widgetPlaceholders =
|
|
5011
|
+
highchartsRenderer.widgetPlaceholders = lodash.assign({}, $.pivotUtilities.errorHandling.placeholders);
|
|
5005
5012
|
|
|
5006
5013
|
highchartsRenderer.suboptions = {
|
|
5007
5014
|
'default_show': {
|
|
@@ -7145,7 +7152,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
7145
7152
|
return data_row[field_with_variant.name] == variance_config.name && data_row[field_for_sorting.name] != undefined;
|
|
7146
7153
|
});
|
|
7147
7154
|
|
|
7148
|
-
const sorting_variance = widget.options.total_value_options.sorting_variance === '' ? 'asc' : 'desc';
|
|
7155
|
+
const sorting_variance = widget.options.total_value_options && widget.options.total_value_options.sorting_variance === '' ? 'asc' : 'desc';
|
|
7149
7156
|
|
|
7150
7157
|
if (widget.options.chartOptions.delta_column.sort_by_absolute_variance) {
|
|
7151
7158
|
data_sorted = lodash.sortBy(data_sorted, function (o) {
|