@datarailsshared/dr_renderer 1.5.54 → 1.5.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 +65 -54
package/package.json
CHANGED
|
@@ -54,6 +54,7 @@ const CHART_COLORS = {
|
|
|
54
54
|
const CHART_TYPES = {
|
|
55
55
|
LINE_CHART: 'line-chart',
|
|
56
56
|
LINE_CHART_SMOOTH: 'line-chart-smooth',
|
|
57
|
+
LINE_CHART_FORECAST: 'line-chart-forecast',
|
|
57
58
|
COLUMN_CHART: 'column-chart',
|
|
58
59
|
COLUMN_CHART_STACKED: 'column-chart-stacked',
|
|
59
60
|
COMBO_CHART: 'combo-chart',
|
|
@@ -436,22 +437,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
436
437
|
return {};
|
|
437
438
|
};
|
|
438
439
|
|
|
439
|
-
const isChartTypeSupportedForSmartQuery = (type) => {
|
|
440
|
-
if (!type) return null;
|
|
441
|
-
return lodash.includes([
|
|
442
|
-
'line',
|
|
443
|
-
'line-chart-forecast',
|
|
444
|
-
'spline',
|
|
445
|
-
'area',
|
|
446
|
-
'areaspline',
|
|
447
|
-
highchartsRenderer.CHART_TYPES.LINE_CHART,
|
|
448
|
-
highchartsRenderer.CHART_TYPES.LINE_CHART_SMOOTH,
|
|
449
|
-
highchartsRenderer.CHART_TYPES.AREA_CHART,
|
|
450
|
-
highchartsRenderer.CHART_TYPES.AREA_CHART_SMOOTH,
|
|
451
|
-
], type);
|
|
452
|
-
};
|
|
453
|
-
|
|
454
|
-
|
|
455
440
|
const chartHasVerticalDataLabelsOption = (type) => {
|
|
456
441
|
return ![
|
|
457
442
|
highchartsRenderer.CHART_TYPES.LINE_CHART,
|
|
@@ -899,12 +884,14 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
899
884
|
if (this.category) {
|
|
900
885
|
category_text = '';
|
|
901
886
|
}
|
|
887
|
+
|
|
902
888
|
var series_text = '<br/>' + '<span style="font-weight: bold; color: ' + this.series.color + ';">\u200E' + this.series.name + '</span>';
|
|
903
889
|
if (tooltipOptions.show_value) {
|
|
904
890
|
series_text += ': '
|
|
905
891
|
}
|
|
906
892
|
|
|
907
|
-
|
|
893
|
+
// Hide series label for TOTAL points (e.g., Walkthrough TOTAL column)
|
|
894
|
+
if (lodash.get(this, 'point.options.isTotal')) {
|
|
908
895
|
series_text = ': ';
|
|
909
896
|
}
|
|
910
897
|
|
|
@@ -1246,11 +1233,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
1246
1233
|
var chart_series = [],
|
|
1247
1234
|
row_n_keys = pivotData.getRowKeys(),
|
|
1248
1235
|
col_n_keys = pivotData.getColKeys();
|
|
1249
|
-
const chartType = chartOptions && chartOptions.chart && chartOptions.chart.type ? chartOptions.chart.type : null;
|
|
1250
1236
|
const indexOfScenarioCycleFilter = lodash.findIndex(pivotData.rowAttrs, (rowAttr) => rowAttr === 'Scenario Cycle');
|
|
1251
1237
|
const withExtraScenarioCycle = pivotData.rowAttrs && row_n_keys[0] && pivotData.rowAttrs.length < row_n_keys[0].length
|
|
1252
1238
|
|
|
1253
|
-
if (
|
|
1239
|
+
if (pivotData.isSmartQueriesEnabled && withExtraScenarioCycle && indexOfScenarioCycleFilter > -1) {
|
|
1254
1240
|
const indexOfScenarioFilter = row_n_keys[0].length - 1;
|
|
1255
1241
|
for (let i = 0; i < row_n_keys?.length; i++) {
|
|
1256
1242
|
row_n_keys[i].splice(indexOfScenarioFilter, 1);
|
|
@@ -6637,43 +6623,68 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
6637
6623
|
value_name: 'dislay_empty_values',
|
|
6638
6624
|
element_label: 'Display empty values',
|
|
6639
6625
|
default_value: false
|
|
6640
|
-
},
|
|
6641
|
-
{
|
|
6642
|
-
element_type: 'devider',
|
|
6643
|
-
element_label: 'Chart Patterns',
|
|
6644
|
-
showFn: isChartTypeSupportedForSmartQuery
|
|
6645
|
-
},
|
|
6646
|
-
{
|
|
6647
|
-
element_type: 'toggle',
|
|
6648
|
-
element_label: 'Forecast Chart',
|
|
6649
|
-
value_name: 'smart_query',
|
|
6650
|
-
default_value: true,
|
|
6651
|
-
showFn: isChartTypeSupportedForSmartQuery
|
|
6652
|
-
},
|
|
6653
|
-
{
|
|
6654
|
-
element_type: 'select',
|
|
6655
|
-
value_name: 'actuals',
|
|
6656
|
-
element_label: 'Actuals',
|
|
6657
|
-
element_options: [
|
|
6658
|
-
{label: 'Solid', value: 'solid'},
|
|
6659
|
-
{label: 'Dash', value: 'dash'},
|
|
6660
|
-
],
|
|
6661
|
-
default_value: 'Solid',
|
|
6662
|
-
showFn: isChartTypeSupportedForSmartQuery
|
|
6663
|
-
},
|
|
6664
|
-
{
|
|
6665
|
-
element_type: 'select',
|
|
6666
|
-
value_name: 'forecast',
|
|
6667
|
-
element_label: 'Forecast',
|
|
6668
|
-
element_options: [
|
|
6669
|
-
{label: 'Solid', value: 'solid'},
|
|
6670
|
-
{label: 'Dash', value: 'dash'},
|
|
6671
|
-
],
|
|
6672
|
-
default_value: 'Dash',
|
|
6673
|
-
showFn: isChartTypeSupportedForSmartQuery
|
|
6674
6626
|
}
|
|
6675
6627
|
]
|
|
6676
6628
|
},
|
|
6629
|
+
'chart_forecast': {
|
|
6630
|
+
category_class: 'google-visualization-charteditor-mini-more',
|
|
6631
|
+
category_label: 'Chart',
|
|
6632
|
+
category_type: 'chart',
|
|
6633
|
+
elements: [
|
|
6634
|
+
{
|
|
6635
|
+
element_type: 'input',
|
|
6636
|
+
value_name: 'colors_offset',
|
|
6637
|
+
element_label: 'Colors offset',
|
|
6638
|
+
default_value: 0
|
|
6639
|
+
}, {
|
|
6640
|
+
element_type: 'checkbox',
|
|
6641
|
+
value_name: 'show',
|
|
6642
|
+
element_label: 'Show grid',
|
|
6643
|
+
default_value: true
|
|
6644
|
+
}, {
|
|
6645
|
+
element_type: 'checkbox',
|
|
6646
|
+
value_name: 'showAllLegends',
|
|
6647
|
+
element_label: 'Show legends over 10',
|
|
6648
|
+
default_value: false
|
|
6649
|
+
},
|
|
6650
|
+
{
|
|
6651
|
+
element_type: 'checkbox',
|
|
6652
|
+
value_name: 'dislay_empty_values',
|
|
6653
|
+
element_label: 'Display empty values',
|
|
6654
|
+
default_value: false
|
|
6655
|
+
},
|
|
6656
|
+
{
|
|
6657
|
+
element_type: 'devider',
|
|
6658
|
+
element_label: 'Chart Patterns',
|
|
6659
|
+
},
|
|
6660
|
+
{
|
|
6661
|
+
element_type: 'text',
|
|
6662
|
+
element_label: 'Forecast Chart',
|
|
6663
|
+
value_name: 'smart_query',
|
|
6664
|
+
default_value: true,
|
|
6665
|
+
},
|
|
6666
|
+
{
|
|
6667
|
+
element_type: 'select',
|
|
6668
|
+
value_name: 'actuals',
|
|
6669
|
+
element_label: 'Actuals',
|
|
6670
|
+
element_options: [
|
|
6671
|
+
{label: 'Solid', value: 'solid'},
|
|
6672
|
+
{label: 'Dash', value: 'dash'},
|
|
6673
|
+
],
|
|
6674
|
+
default_value: 'Solid',
|
|
6675
|
+
},
|
|
6676
|
+
{
|
|
6677
|
+
element_type: 'select',
|
|
6678
|
+
value_name: 'forecast',
|
|
6679
|
+
element_label: 'Forecast',
|
|
6680
|
+
element_options: [
|
|
6681
|
+
{label: 'Solid', value: 'solid'},
|
|
6682
|
+
{label: 'Dash', value: 'dash'},
|
|
6683
|
+
],
|
|
6684
|
+
default_value: 'Dash',
|
|
6685
|
+
}
|
|
6686
|
+
]
|
|
6687
|
+
},
|
|
6677
6688
|
'total_value_label_donut': {
|
|
6678
6689
|
category_class: 'google-visualization-charteditor-mini-more',
|
|
6679
6690
|
category_label: 'Total Value Label',
|
|
@@ -7983,7 +7994,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
7983
7994
|
highchartsRenderer.suboptions["widget_library"],
|
|
7984
7995
|
highchartsRenderer.suboptions["table_options_transpose"],
|
|
7985
7996
|
highchartsRenderer.suboptions["table_design_options"],
|
|
7986
|
-
highchartsRenderer.suboptions["
|
|
7997
|
+
highchartsRenderer.suboptions["chart_forecast"],
|
|
7987
7998
|
highchartsRenderer.suboptions["negative_number_format"],
|
|
7988
7999
|
highchartsRenderer.suboptions["delta_column"],
|
|
7989
8000
|
highchartsRenderer.suboptions["advanced"],
|