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

Merge pull request #8539 from ArtemDzhereleiko/AD/bug-fix/control-widget-title

Browse Source 
Fixed control widgets setting change
This commit is contained in:
Igor Kulikov 2023-05-22 17:48:56 +03:00 committed by GitHub
commit 6dab35d451
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui-ngx/src/app/modules/home/components/widget/lib/settings/control/round-switch-widget-settings.component.ts
View File

@ -72,8 +72,8 @@ export class RoundSwitchWidgetSettingsComponent extends WidgetSettingsComponent
protected prepareOutputSettings(settings: any): WidgetSettings { protected prepareOutputSettings(settings: any): WidgetSettings {
return { return {
title: settings.title, ...settings.switchRpcSettings,
...settings.switchRpcSettings title: settings.title
}; };
} }
} }

4
ui-ngx/src/app/modules/home/components/widget/lib/settings/control/slide-toggle-widget-settings.component.ts
View File

@ -78,10 +78,10 @@ export class SlideToggleWidgetSettingsComponent extends WidgetSettingsComponent
protected prepareOutputSettings(settings: any): WidgetSettings { protected prepareOutputSettings(settings: any): WidgetSettings {
return { return {
...settings.switchRpcSettings,
title: settings.title, title: settings.title,
labelPosition: settings.labelPosition, labelPosition: settings.labelPosition,
sliderColor: settings.sliderColor, sliderColor: settings.sliderColor
...settings.switchRpcSettings
}; };
} }
} }

4
ui-ngx/src/app/modules/home/components/widget/lib/settings/control/switch-control-widget-settings.component.ts
View File

@ -75,9 +75,9 @@ export class SwitchControlWidgetSettingsComponent extends WidgetSettingsComponen
protected prepareOutputSettings(settings: any): WidgetSettings { protected prepareOutputSettings(settings: any): WidgetSettings {
return { return {
...settings.switchRpcSettings,
title: settings.title, title: settings.title,
showOnOffLabels: settings.showOnOffLabels, showOnOffLabels: settings.showOnOffLabels
...settings.switchRpcSettings
}; };
} }
} }