@c8y/ngx-components 1023.15.0 → 1023.16.3

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.
@@ -388,10 +388,15 @@ class EchartsOptionsService {
388
388
  forceMergeDatapoints: displayOptions.forceMergeDatapoints,
389
389
  showLabelAndUnit: displayOptions.showLabelAndUnit
390
390
  });
391
+ const AXIS_PADDING = 20;
391
392
  const leftAxis = Array.isArray(yAxis) ? yAxis.filter(yx => yx.position === 'left') : [];
392
- const gridLeft = leftAxis.length ? leftAxis.length * this.yAxisService.Y_AXIS_OFFSET : 32;
393
+ const gridLeft = leftAxis.length
394
+ ? leftAxis.length * (this.yAxisService.Y_AXIS_OFFSET - AXIS_PADDING)
395
+ : 32;
393
396
  const rightAxis = Array.isArray(yAxis) ? yAxis.filter(yx => yx.position === 'right') : [];
394
- const gridRight = rightAxis.length ? rightAxis.length * this.yAxisService.Y_AXIS_OFFSET : 16;
397
+ const gridRight = rightAxis.length
398
+ ? rightAxis.length * (this.yAxisService.Y_AXIS_OFFSET - AXIS_PADDING)
399
+ : 16;
395
400
  const selectedLanguage = this.translate.currentLang;
396
401
  let intervalInMs = this.calculateExtendedIntervalInMs(selectedTimeRange?.interval || timeRange.interval || 'hours', selectedTimeRange || timeRange);
397
402
  if (sliderZoomUsed) {
@@ -421,7 +426,7 @@ class EchartsOptionsService {
421
426
  left: gridLeft,
422
427
  top: 16,
423
428
  right: gridRight,
424
- bottom: 68
429
+ bottom: displayOptions.showSlider ? 68 : 8
425
430
  },
426
431
  dataZoom: [
427
432
  {
@@ -2291,7 +2296,7 @@ class ChartsComponent {
2291
2296
  }, this.events, this.alarms, {
2292
2297
  displayMarkedLine: this.config.displayMarkedLine || false,
2293
2298
  displayMarkedPoint: this.config.displayMarkedPoint || false,
2294
- mergeMatchingDatapoints: this.config.mergeMatchingDatapoints || false,
2299
+ mergeMatchingDatapoints: this.config.mergeMatchingDatapoints ?? true,
2295
2300
  forceMergeDatapoints: this.config.forceMergeDatapoints || false,
2296
2301
  showLabelAndUnit: this.config.showLabelAndUnit || false,
2297
2302
  showSlider: this.config.showSlider || false,
@@ -2329,7 +2334,7 @@ class ChartsComponent {
2329
2334
  }, this.events, this.alarms, {
2330
2335
  displayMarkedLine: this.config.displayMarkedLine || false,
2331
2336
  displayMarkedPoint: this.config.displayMarkedPoint || false,
2332
- mergeMatchingDatapoints: this.config.mergeMatchingDatapoints || false,
2337
+ mergeMatchingDatapoints: this.config.mergeMatchingDatapoints ?? true,
2333
2338
  forceMergeDatapoints: this.config.forceMergeDatapoints || false,
2334
2339
  showLabelAndUnit: this.config.showLabelAndUnit || false,
2335
2340
  showSlider: this.config.showSlider || false,