@datarailsshared/dr_renderer 1.2.399 → 1.2.400
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
CHANGED
|
@@ -1471,7 +1471,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
1471
1471
|
}
|
|
1472
1472
|
}
|
|
1473
1473
|
|
|
1474
|
-
let weights = { line: 2,spline: 3 ,area:-2, areaspline: -1, scatter:4, column: 1 };
|
|
1475
1474
|
if (opts.comboOptions && lodash.includes(chartType,'combo') && !lodash.isEqual(row_n_keys, EMPTY_ROW_N_KEYS)) {
|
|
1476
1475
|
chart_series.forEach((series, seriesIndex) => {
|
|
1477
1476
|
const savedSeriesOption = lodash.find(opts.comboOptions.seriesOptions, {series: series.name});
|
|
@@ -1538,10 +1537,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
1538
1537
|
|
|
1539
1538
|
highchartsRenderer.moveSeriesToSecondYAxisIfNeeded(chart_series, pivotData, chartOptions, additionOptions, opts, opts.total && opts.totalSeriesSettings && opts.totalSeriesSettings.secondaryAxis);
|
|
1540
1539
|
|
|
1541
|
-
chart_series.sort((a,b) => {
|
|
1542
|
-
return (weights[a.type] || 0) > (weights[b.type] || 0) ? 1 : (weights[a.type] || 0) < (weights[b.type] || 0) ? -1 : 0
|
|
1543
|
-
});
|
|
1544
|
-
|
|
1545
1540
|
return chart_series;
|
|
1546
1541
|
}
|
|
1547
1542
|
|
|
@@ -6475,24 +6475,24 @@ describe('highcharts_renderer', () => {
|
|
|
6475
6475
|
{
|
|
6476
6476
|
initialName: 'col 1',
|
|
6477
6477
|
name: 'col 1',
|
|
6478
|
-
y:
|
|
6478
|
+
y: 12345,
|
|
6479
6479
|
drilldown: true
|
|
6480
6480
|
},
|
|
6481
6481
|
{
|
|
6482
6482
|
initialName: 'col 2',
|
|
6483
6483
|
name: 'col 2',
|
|
6484
|
-
y:
|
|
6484
|
+
y: 54321,
|
|
6485
6485
|
drilldown: true
|
|
6486
6486
|
},
|
|
6487
6487
|
{
|
|
6488
6488
|
initialName: 'Others',
|
|
6489
6489
|
name: 'Others',
|
|
6490
|
-
y:
|
|
6490
|
+
y: 99999,
|
|
6491
6491
|
drilldown: true
|
|
6492
6492
|
}
|
|
6493
6493
|
],
|
|
6494
|
-
initialName: 'row
|
|
6495
|
-
name: 'row
|
|
6494
|
+
initialName: 'row 1',
|
|
6495
|
+
name: 'row 1',
|
|
6496
6496
|
dataLabels: {
|
|
6497
6497
|
style: {
|
|
6498
6498
|
fontSize: '11',
|
|
@@ -6504,31 +6504,36 @@ describe('highcharts_renderer', () => {
|
|
|
6504
6504
|
enabled: true,
|
|
6505
6505
|
formatter: expect.any(Function)
|
|
6506
6506
|
},
|
|
6507
|
-
color: '#
|
|
6507
|
+
color: '#5ecfb9',
|
|
6508
|
+
type: 'line',
|
|
6509
|
+
lineColor: '#5ecfb9',
|
|
6510
|
+
marker: {
|
|
6511
|
+
lineColor: '#5ecfb9'
|
|
6512
|
+
}
|
|
6508
6513
|
},
|
|
6509
6514
|
{
|
|
6510
6515
|
data: [
|
|
6511
6516
|
{
|
|
6512
6517
|
initialName: 'col 1',
|
|
6513
6518
|
name: 'col 1',
|
|
6514
|
-
y:
|
|
6519
|
+
y: 123450,
|
|
6515
6520
|
drilldown: true
|
|
6516
6521
|
},
|
|
6517
6522
|
{
|
|
6518
6523
|
initialName: 'col 2',
|
|
6519
6524
|
name: 'col 2',
|
|
6520
|
-
y:
|
|
6525
|
+
y: 11111,
|
|
6521
6526
|
drilldown: true
|
|
6522
6527
|
},
|
|
6523
6528
|
{
|
|
6524
6529
|
initialName: 'Others',
|
|
6525
6530
|
name: 'Others',
|
|
6526
|
-
y:
|
|
6531
|
+
y: 99991,
|
|
6527
6532
|
drilldown: true
|
|
6528
6533
|
}
|
|
6529
6534
|
],
|
|
6530
|
-
initialName: 'row
|
|
6531
|
-
name: 'row
|
|
6535
|
+
initialName: 'row 2',
|
|
6536
|
+
name: 'row 2',
|
|
6532
6537
|
dataLabels: {
|
|
6533
6538
|
style: {
|
|
6534
6539
|
fontSize: '11',
|
|
@@ -6540,13 +6545,8 @@ describe('highcharts_renderer', () => {
|
|
|
6540
6545
|
enabled: true,
|
|
6541
6546
|
formatter: expect.any(Function)
|
|
6542
6547
|
},
|
|
6543
|
-
color: '#
|
|
6544
|
-
|
|
6545
|
-
lineColor: '#5ecfb9',
|
|
6546
|
-
marker: {
|
|
6547
|
-
lineColor: '#5ecfb9'
|
|
6548
|
-
}
|
|
6549
|
-
}
|
|
6548
|
+
color: '#b3060e'
|
|
6549
|
+
},
|
|
6550
6550
|
]);
|
|
6551
6551
|
});
|
|
6552
6552
|
it('should prepare appropriate chart series, when additional options have delta column \'only variant\'', ()=> {
|