dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5910 from ArtemDzhereleiko/bug-fix/widget-advanced-settings/show-title-icon

Browse Source 
[3.3.3] UI: Added additional condition to define showTitleIcon
This commit is contained in:
Igor Kulikov 2022-01-20 12:00:52 +02:00 committed by GitHub
commit 4c972ec59b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui-ngx/src/app/modules/home/components/widget/widget-config.component.ts
View File

@ -396,14 +396,15 @@ export class WidgetConfigComponent extends PageComponent implements OnInit, Cont
const layout = this.modelValue.layout; const layout = this.modelValue.layout;
if (config) { if (config) {
this.selectedTab = 0; this.selectedTab = 0;
const displayWidgetTitle = isDefined(config.showTitle) ? config.showTitle : false;
this.widgetSettings.patchValue({ this.widgetSettings.patchValue({
title: config.title, title: config.title,
showTitleIcon: isDefined(config.showTitleIcon) ? config.showTitleIcon : false, showTitleIcon: isDefined(config.showTitleIcon) && displayWidgetTitle ? config.showTitleIcon : false,
titleIcon: isDefined(config.titleIcon) ? config.titleIcon : '', titleIcon: isDefined(config.titleIcon) ? config.titleIcon : '',
iconColor: isDefined(config.iconColor) ? config.iconColor : 'rgba(0, 0, 0, 0.87)', iconColor: isDefined(config.iconColor) ? config.iconColor : 'rgba(0, 0, 0, 0.87)',
iconSize: isDefined(config.iconSize) ? config.iconSize : '24px', iconSize: isDefined(config.iconSize) ? config.iconSize : '24px',
titleTooltip: isDefined(config.titleTooltip) ? config.titleTooltip : '', titleTooltip: isDefined(config.titleTooltip) ? config.titleTooltip : '',
showTitle: isDefined(config.showTitle) ? config.showTitle : false, showTitle: displayWidgetTitle,
dropShadow: isDefined(config.dropShadow) ? config.dropShadow : true, dropShadow: isDefined(config.dropShadow) ? config.dropShadow : true,
enableFullscreen: isDefined(config.enableFullscreen) ? config.enableFullscreen : true, enableFullscreen: isDefined(config.enableFullscreen) ? config.enableFullscreen : true,
backgroundColor: config.backgroundColor, backgroundColor: config.backgroundColor,