Skip to content

Commit 61acf80

Browse files
committed
* fixed issue with missing widget title after drilldown and back button (#450)
* fixed issue with missing chart titles (#455)
1 parent 544b0b5 commit 61acf80

File tree

5 files changed

+17
-3
lines changed

5 files changed

+17
-3
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "deep-see-web",
3-
"version": "4.0.20",
3+
"version": "4.0.21",
44
"scripts": {
55
"ng": "ng",
66
"start": "ng serve --proxy-config=proxy.conf.samples-bi.js",

src/app/components/widgets/base-widget.class.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -714,6 +714,9 @@ export class BaseWidget implements OnInit, OnDestroy {
714714
this.drills.pop();
715715
}
716716
this.widget.backButton = this.drills.length !== 0;
717+
if (!this.widget.baseTitle) {
718+
this.widget.baseTitle = this.widget.title || '';
719+
}
717720
this.widget.title = this.getDrillTitle(this.drills[this.drills.length - 1]);
718721
// this.wid
719722
this.broadcastDependents(mdx);
@@ -846,6 +849,9 @@ export class BaseWidget implements OnInit, OnDestroy {
846849
this.drills.pop();
847850
}
848851
this.widget.backButton = this.drills.length !== 0;
852+
if (!this.widget.baseTitle) {
853+
this.widget.baseTitle = this.widget.title || '';
854+
}
849855
this.widget.title = this.getDrillTitle(this.drills[this.drills.length - 1]);
850856
// this.wid
851857
this.broadcastDependents(mdx);

src/app/components/widgets/base/widget/widget.component.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,10 @@ export class WidgetComponent implements OnInit, OnDestroy, AfterViewInit {
447447
if (t) {
448448
this.widget.isSupported = true;
449449
this.cd.detectChanges();
450+
setTimeout(()=> {
451+
// @ts-ignore
452+
this.component = this.ngComponentOutlet?._componentRef?.instance;
453+
});
450454
} else {
451455
this.widget.isSupported = false;
452456
this.showError(this.i18n.get('errWidgetNotSupported') + ': ' + this.widget.type);

src/app/components/widgets/charts/base-chart.class.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1260,7 +1260,7 @@ export class BaseChartClass extends BaseWidget implements OnInit, AfterViewInit,
12601260
yAxis: {
12611261
events: {},
12621262
title: {
1263-
text: ''
1263+
text: this.widget?.overrides?.[0]?.xAxis?.title || ''
12641264
},
12651265
labels: {
12661266
style: {
@@ -1277,7 +1277,7 @@ export class BaseChartClass extends BaseWidget implements OnInit, AfterViewInit,
12771277
xAxis: {
12781278
events: {},
12791279
title: {
1280-
text: ''
1280+
text: this.widget?.overrides?.[0]?.yAxisList?.[0]?.title || ''
12811281
},
12821282
labels: {
12831283
// formatter: axisFormatter,

src/changelog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
#### 4.0.21
2+
* fixed issue with missing widget title after drilldown and back button (#450)
3+
* fixed issue with missing chart titles (#455)
4+
15
#### 4.0.20
26
* added data property `geojsonKeyField` for linking data with geojson polygon
37
* fixed geojson loading with extension ".geojson" (#350)

0 commit comments

Comments
 (0)