@datarailsshared/dr_renderer 1.2.329 → 1.2.331
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 +12 -9
package/package.json
CHANGED
@@ -3448,10 +3448,13 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
3448
3448
|
}
|
3449
3449
|
return "";
|
3450
3450
|
},
|
3451
|
-
style:
|
3452
|
-
|
3453
|
-
|
3454
|
-
|
3451
|
+
style: lodash.merge(
|
3452
|
+
highchartsRenderer.getDataLabelsStyle(additionOptions),
|
3453
|
+
{
|
3454
|
+
fontWeight: 'normal',
|
3455
|
+
color: (highchartsRenderer.highcharts_theme && highchartsRenderer.highcharts_theme.textColor) || 'gray'
|
3456
|
+
}
|
3457
|
+
),
|
3455
3458
|
},
|
3456
3459
|
labels: {
|
3457
3460
|
formatter: highchartsRenderer.defaultValueLabelsFormatter(pivotData, opts)
|
@@ -4503,8 +4506,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
4503
4506
|
const varianceConfig = widget.options.chartOptions.delta_column;
|
4504
4507
|
const data = pivotData.input;
|
4505
4508
|
const varianceField = varianceConfig.field === 'category' ? widget.cols[0] : widget.rows[0];
|
4506
|
-
const varianceRowsForCurrentKey = lodash.filter(data, row =>
|
4507
|
-
row[varianceField.name] === varianceConfig.name
|
4509
|
+
const varianceRowsForCurrentKey = lodash.filter(data, row =>
|
4510
|
+
row[varianceField.name] === varianceConfig.name
|
4508
4511
|
&& lodash.every(secondArray, (item, index) => row[attrs[index]] === item)
|
4509
4512
|
);
|
4510
4513
|
|
@@ -4515,7 +4518,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
4515
4518
|
if (lodash.includes(pivotData.rowAttrs, attrs[fieldIndex])) {
|
4516
4519
|
getAggregatorParams = lodash.reverse(getAggregatorParams);
|
4517
4520
|
}
|
4518
|
-
|
4521
|
+
|
4519
4522
|
let aggregator_subtotal = pivotData.getAggregator(...getAggregatorParams);
|
4520
4523
|
|
4521
4524
|
if (aggregator_subtotal) {
|
@@ -8594,7 +8597,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
8594
8597
|
}
|
8595
8598
|
|
8596
8599
|
if (widget.chart_type === highchartsRenderer.CHART_TYPES.WATERFALL_BREAKDOWN) {
|
8597
|
-
let filter = lodash.find(filters,
|
8600
|
+
let filter = lodash.find(filters, (f) => f.name === widget.cols[0].name || f.field === widget.cols[0].id);
|
8598
8601
|
if (filter) {
|
8599
8602
|
filter.is_excluded = false;
|
8600
8603
|
} else {
|
@@ -8860,7 +8863,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
8860
8863
|
}
|
8861
8864
|
|
8862
8865
|
/****** END *******/
|
8863
|
-
|
8866
|
+
|
8864
8867
|
// TODO: Remove. sortingValues looks like lagacy which is not in use neither in webclient nor in renderer
|
8865
8868
|
if (widget.options && widget.options.sortingValues) {
|
8866
8869
|
var field = lodash.find(datesFields, {name: widget.options.sortingValues.field});
|