@datarailsshared/dr_renderer 1.2.146 → 1.2.148-dragons
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 +59 -20
package/package.json
CHANGED
|
@@ -1525,8 +1525,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
1525
1525
|
|
|
1526
1526
|
chartOptions.yAxis = [chartOptions.yAxis];
|
|
1527
1527
|
chartOptions.yAxis[1] = {
|
|
1528
|
-
min:
|
|
1529
|
-
max:
|
|
1528
|
+
min: null,
|
|
1529
|
+
max: null,
|
|
1530
1530
|
title: {
|
|
1531
1531
|
text: highchartsRenderer.encodeHTMLBrackets(opts.comboOptions.secondaryAxisSettings.name),
|
|
1532
1532
|
style: {
|
|
@@ -1541,6 +1541,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
1541
1541
|
},
|
|
1542
1542
|
opposite: true
|
|
1543
1543
|
}
|
|
1544
|
+
highchartsRenderer.setYAxisMinMax(chartOptions.yAxis[1], opts.comboOptions.secondaryAxisSettings);
|
|
1544
1545
|
};
|
|
1545
1546
|
|
|
1546
1547
|
highchartsRenderer.ptRenderBasicPie = function (pivotData, opts) {
|
|
@@ -2132,8 +2133,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
2132
2133
|
highchartsRenderer.setTitleAndSubTitle(chartOptions, opts, additionOptions);
|
|
2133
2134
|
|
|
2134
2135
|
chartOptions.yAxis = {
|
|
2135
|
-
min:
|
|
2136
|
-
max:
|
|
2136
|
+
min: null,
|
|
2137
|
+
max: null,
|
|
2137
2138
|
title: {
|
|
2138
2139
|
text: additionOptions && additionOptions.axisY ? additionOptions.axisY.name : '',
|
|
2139
2140
|
|
|
@@ -2147,6 +2148,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
2147
2148
|
formatter: highchartsRenderer.defaultValueLabelsFormatter(pivotData, opts)
|
|
2148
2149
|
}
|
|
2149
2150
|
};
|
|
2151
|
+
if (additionOptions) {
|
|
2152
|
+
highchartsRenderer.setYAxisMinMax(chartOptions.yAxis, additionOptions.axisY);
|
|
2153
|
+
}
|
|
2150
2154
|
|
|
2151
2155
|
chartOptions.legend = highchartsRenderer.getOptionsForLegends(additionOptions, rowAttrs.length, true);
|
|
2152
2156
|
|
|
@@ -2208,8 +2212,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
2208
2212
|
}
|
|
2209
2213
|
highchartsRenderer.setTitleAndSubTitle(chartOptions, opts, additionOptions);
|
|
2210
2214
|
chartOptions.yAxis = {
|
|
2211
|
-
min:
|
|
2212
|
-
max:
|
|
2215
|
+
min: null,
|
|
2216
|
+
max: null,
|
|
2213
2217
|
title: {
|
|
2214
2218
|
text: additionOptions && additionOptions.axisY ? additionOptions.axisY.name : ''
|
|
2215
2219
|
},
|
|
@@ -2222,6 +2226,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
2222
2226
|
formatter: highchartsRenderer.defaultValueLabelsFormatter(pivotData, opts)
|
|
2223
2227
|
}
|
|
2224
2228
|
};
|
|
2229
|
+
if (additionOptions) {
|
|
2230
|
+
highchartsRenderer.setYAxisMinMax(chartOptions.yAxis, additionOptions.axisY);
|
|
2231
|
+
}
|
|
2225
2232
|
|
|
2226
2233
|
chartOptions.legend = highchartsRenderer.getOptionsForLegends(additionOptions, rowAttrs.length, true);
|
|
2227
2234
|
|
|
@@ -2302,8 +2309,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
2302
2309
|
}
|
|
2303
2310
|
highchartsRenderer.setTitleAndSubTitle(chartOptions, opts, additionOptions);
|
|
2304
2311
|
chartOptions.yAxis = {
|
|
2305
|
-
min:
|
|
2306
|
-
max:
|
|
2312
|
+
min: null,
|
|
2313
|
+
max: null,
|
|
2307
2314
|
title: {
|
|
2308
2315
|
text: additionOptions && additionOptions.axisY ? additionOptions.axisY.name : ''
|
|
2309
2316
|
},
|
|
@@ -2316,6 +2323,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
2316
2323
|
formatter: highchartsRenderer.defaultValueLabelsFormatter(pivotData, opts)
|
|
2317
2324
|
}
|
|
2318
2325
|
};
|
|
2326
|
+
if (additionOptions) {
|
|
2327
|
+
highchartsRenderer.setYAxisMinMax(chartOptions.yAxis, additionOptions.axisY);
|
|
2328
|
+
}
|
|
2319
2329
|
|
|
2320
2330
|
chartOptions.legend = highchartsRenderer.getOptionsForLegends(additionOptions, rowAttrs.length, true);
|
|
2321
2331
|
|
|
@@ -2377,8 +2387,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
2377
2387
|
}
|
|
2378
2388
|
highchartsRenderer.setTitleAndSubTitle(chartOptions, opts, additionOptions);
|
|
2379
2389
|
chartOptions.yAxis = {
|
|
2380
|
-
min:
|
|
2381
|
-
max:
|
|
2390
|
+
min: null,
|
|
2391
|
+
max: null,
|
|
2382
2392
|
title: {
|
|
2383
2393
|
text: additionOptions && additionOptions.axisY ? additionOptions.axisY.name : ''
|
|
2384
2394
|
},
|
|
@@ -2386,6 +2396,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
2386
2396
|
formatter: highchartsRenderer.defaultValueLabelsFormatter(pivotData, opts)
|
|
2387
2397
|
}
|
|
2388
2398
|
};
|
|
2399
|
+
if (additionOptions) {
|
|
2400
|
+
highchartsRenderer.setYAxisMinMax(chartOptions.yAxis, additionOptions.axisY);
|
|
2401
|
+
}
|
|
2389
2402
|
|
|
2390
2403
|
chartOptions.tooltip = {
|
|
2391
2404
|
formatter: highchartsRenderer.defaultFormatterToTooltip(pivotData, opts),
|
|
@@ -2559,8 +2572,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
2559
2572
|
highchartsRenderer.setTitleAndSubTitle(chartOptions, opts, additionOptions);
|
|
2560
2573
|
|
|
2561
2574
|
chartOptions.yAxis = {
|
|
2562
|
-
min:
|
|
2563
|
-
max:
|
|
2575
|
+
min: null,
|
|
2576
|
+
max: null,
|
|
2564
2577
|
title: {
|
|
2565
2578
|
text: additionOptions && additionOptions.axisY ? additionOptions.axisY.name : '',
|
|
2566
2579
|
autoylabel: additionOptions && additionOptions.axisY ? additionOptions.axisY.autoylabel : ''
|
|
@@ -2569,6 +2582,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
2569
2582
|
formatter: highchartsRenderer.defaultValueLabelsFormatter(pivotData, opts)
|
|
2570
2583
|
}
|
|
2571
2584
|
};
|
|
2585
|
+
if (additionOptions) {
|
|
2586
|
+
highchartsRenderer.setYAxisMinMax(chartOptions.yAxis, additionOptions.axisY);
|
|
2587
|
+
}
|
|
2572
2588
|
|
|
2573
2589
|
chartOptions.tooltip = {
|
|
2574
2590
|
formatter: highchartsRenderer.defaultFormatterToTooltip(pivotData, opts),
|
|
@@ -2647,8 +2663,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
2647
2663
|
}
|
|
2648
2664
|
highchartsRenderer.setTitleAndSubTitle(chartOptions, opts, additionOptions);
|
|
2649
2665
|
chartOptions.yAxis = {
|
|
2650
|
-
min:
|
|
2651
|
-
max:
|
|
2666
|
+
min: null,
|
|
2667
|
+
max: null,
|
|
2652
2668
|
title: {
|
|
2653
2669
|
text: additionOptions && additionOptions.axisY ? additionOptions.axisY.name : ''
|
|
2654
2670
|
},
|
|
@@ -2696,6 +2712,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
2696
2712
|
formatter: highchartsRenderer.defaultValueLabelsFormatter(pivotData, opts)
|
|
2697
2713
|
}
|
|
2698
2714
|
};
|
|
2715
|
+
if (additionOptions) {
|
|
2716
|
+
highchartsRenderer.setYAxisMinMax(chartOptions.yAxis, additionOptions.axisY);
|
|
2717
|
+
}
|
|
2699
2718
|
|
|
2700
2719
|
chartOptions.yAxis.stackLabels = lodash.merge(highchartsRenderer.getDataLabelsOptions(additionOptions, { dataLabels: {} }).dataLabels, chartOptions.yAxis.stackLabels);
|
|
2701
2720
|
chartOptions.yAxis.stackLabels.style.color = chartOptions.yAxis.stackLabels.color;
|
|
@@ -2793,8 +2812,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
2793
2812
|
highchartsRenderer.setTitleAndSubTitle(chartOptions, opts, additionOptions);
|
|
2794
2813
|
|
|
2795
2814
|
chartOptions.yAxis = {
|
|
2796
|
-
min:
|
|
2797
|
-
max:
|
|
2815
|
+
min: null,
|
|
2816
|
+
max: null,
|
|
2798
2817
|
title: {
|
|
2799
2818
|
text: additionOptions && additionOptions.axisY ? additionOptions.axisY.name : ''
|
|
2800
2819
|
},
|
|
@@ -2802,6 +2821,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
2802
2821
|
formatter: highchartsRenderer.defaultValueLabelsFormatter(pivotData, opts)
|
|
2803
2822
|
}
|
|
2804
2823
|
};
|
|
2824
|
+
if (additionOptions) {
|
|
2825
|
+
highchartsRenderer.setYAxisMinMax(chartOptions.yAxis, additionOptions.axisY);
|
|
2826
|
+
}
|
|
2805
2827
|
|
|
2806
2828
|
chartOptions.legend = {enabled: false};
|
|
2807
2829
|
|
|
@@ -2860,8 +2882,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
2860
2882
|
}
|
|
2861
2883
|
highchartsRenderer.setTitleAndSubTitle(chartOptions, opts, additionOptions);
|
|
2862
2884
|
chartOptions.yAxis = {
|
|
2863
|
-
min:
|
|
2864
|
-
max:
|
|
2885
|
+
min: null,
|
|
2886
|
+
max: null,
|
|
2865
2887
|
title: {
|
|
2866
2888
|
text: additionOptions && additionOptions.axisY ? additionOptions.axisY.name : ''
|
|
2867
2889
|
},
|
|
@@ -2869,6 +2891,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
2869
2891
|
formatter: highchartsRenderer.defaultValueLabelsFormatter(pivotData, opts)
|
|
2870
2892
|
}
|
|
2871
2893
|
};
|
|
2894
|
+
if (additionOptions) {
|
|
2895
|
+
highchartsRenderer.setYAxisMinMax(chartOptions.yAxis, additionOptions.axisY);
|
|
2896
|
+
}
|
|
2872
2897
|
chartOptions.tooltip = {
|
|
2873
2898
|
formatter: highchartsRenderer.defaultFormatterToTooltip(pivotData, opts),
|
|
2874
2899
|
valueDecimals: 2,
|
|
@@ -2936,8 +2961,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
2936
2961
|
}
|
|
2937
2962
|
highchartsRenderer.setTitleAndSubTitle(chartOptions, opts, additionOptions);
|
|
2938
2963
|
chartOptions.yAxis = {
|
|
2939
|
-
min:
|
|
2940
|
-
max:
|
|
2964
|
+
min: null,
|
|
2965
|
+
max: null,
|
|
2941
2966
|
title: {
|
|
2942
2967
|
text: additionOptions && additionOptions.axisY ? additionOptions.axisY.name : ''
|
|
2943
2968
|
},
|
|
@@ -2964,6 +2989,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
2964
2989
|
formatter: highchartsRenderer.defaultValueLabelsFormatter(pivotData, opts)
|
|
2965
2990
|
}
|
|
2966
2991
|
};
|
|
2992
|
+
if (additionOptions) {
|
|
2993
|
+
highchartsRenderer.setYAxisMinMax(chartOptions.yAxis, additionOptions.axisY);
|
|
2994
|
+
}
|
|
2967
2995
|
|
|
2968
2996
|
chartOptions.legend = highchartsRenderer.getOptionsForLegends(additionOptions, rowAttrs.length, false);
|
|
2969
2997
|
chartOptions.legend.reversed = true;
|
|
@@ -8168,6 +8196,17 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
8168
8196
|
return useNewUx ? topPosition : bottomPosition;
|
|
8169
8197
|
}
|
|
8170
8198
|
|
|
8199
|
+
highchartsRenderer.setYAxisMinMax = function (yAxis, axisYOptions) {
|
|
8200
|
+
if (!axisYOptions) {
|
|
8201
|
+
return;
|
|
8202
|
+
}
|
|
8203
|
+
|
|
8204
|
+
const minNumber = parseInt(axisYOptions.min);
|
|
8205
|
+
const maxNumber = parseInt(axisYOptions.max);
|
|
8206
|
+
yAxis.min = !isNaN(minNumber) ? minNumber : null;
|
|
8207
|
+
yAxis.max = !isNaN(maxNumber) ? maxNumber : null;
|
|
8208
|
+
}
|
|
8209
|
+
|
|
8171
8210
|
return highchartsRenderer;
|
|
8172
8211
|
};
|
|
8173
8212
|
|