Browse Source
Merge pull request #5910 from ArtemDzhereleiko/bug-fix/widget-advanced-settings/show-title-icon
[3.3.3] UI: Added additional condition to define showTitleIcon
pull/5933/head
Igor Kulikov
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
3 additions and
2 deletions
-
ui-ngx/src/app/modules/home/components/widget/widget-config.component.ts
|
|
|
@ -396,14 +396,15 @@ export class WidgetConfigComponent extends PageComponent implements OnInit, Cont |
|
|
|
const layout = this.modelValue.layout; |
|
|
|
if (config) { |
|
|
|
this.selectedTab = 0; |
|
|
|
const displayWidgetTitle = isDefined(config.showTitle) ? config.showTitle : false; |
|
|
|
this.widgetSettings.patchValue({ |
|
|
|
title: config.title, |
|
|
|
showTitleIcon: isDefined(config.showTitleIcon) ? config.showTitleIcon : false, |
|
|
|
showTitleIcon: isDefined(config.showTitleIcon) && displayWidgetTitle ? config.showTitleIcon : false, |
|
|
|
titleIcon: isDefined(config.titleIcon) ? config.titleIcon : '', |
|
|
|
iconColor: isDefined(config.iconColor) ? config.iconColor : 'rgba(0, 0, 0, 0.87)', |
|
|
|
iconSize: isDefined(config.iconSize) ? config.iconSize : '24px', |
|
|
|
titleTooltip: isDefined(config.titleTooltip) ? config.titleTooltip : '', |
|
|
|
showTitle: isDefined(config.showTitle) ? config.showTitle : false, |
|
|
|
showTitle: displayWidgetTitle, |
|
|
|
dropShadow: isDefined(config.dropShadow) ? config.dropShadow : true, |
|
|
|
enableFullscreen: isDefined(config.enableFullscreen) ? config.enableFullscreen : true, |
|
|
|
backgroundColor: config.backgroundColor, |
|
|
|
|
