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

Merge branch 'rc'

Browse Source
This commit is contained in:
Igor Kulikov 2025-10-03 13:45:27 +03:00
commit 86436b174e
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pom.xml
View File

@ -1929,9 +1929,6 @@
<name>Typesafe Repository</name> <name>Typesafe Repository</name>
<url>https://repo.typesafe.com/typesafe/releases/</url> <url>https://repo.typesafe.com/typesafe/releases/</url>
</repository> </repository>
<repository>
<id>sonatype</id>
<url>https://oss.sonatype.org/content/groups/public</url>
</repository>
</repositories> </repositories>
</project> </project>

2
ui-ngx/src/app/modules/home/components/widget/config/basic/chart/doughnut-basic-config.component.ts
View File

@ -86,9 +86,11 @@ export class DoughnutBasicConfigComponent extends LatestChartBasicConfigComponen
if (totalEnabled) { if (totalEnabled) {
latestChartWidgetConfigForm.get('totalValueFont').enable(); latestChartWidgetConfigForm.get('totalValueFont').enable();
latestChartWidgetConfigForm.get('totalValueColor').enable(); latestChartWidgetConfigForm.get('totalValueColor').enable();
latestChartWidgetConfigForm.get('legendShowTotal').disable();
} else { } else {
latestChartWidgetConfigForm.get('totalValueFont').disable(); latestChartWidgetConfigForm.get('totalValueFont').disable();
latestChartWidgetConfigForm.get('totalValueColor').disable(); latestChartWidgetConfigForm.get('totalValueColor').disable();
latestChartWidgetConfigForm.get('legendShowTotal').enable();
} }
} }
} }

2
ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/doughnut-widget-settings.component.ts
View File

@ -69,9 +69,11 @@ export class DoughnutWidgetSettingsComponent extends LatestChartWidgetSettingsCo
if (totalEnabled) { if (totalEnabled) {
latestChartWidgetSettingsForm.get('totalValueFont').enable(); latestChartWidgetSettingsForm.get('totalValueFont').enable();
latestChartWidgetSettingsForm.get('totalValueColor').enable(); latestChartWidgetSettingsForm.get('totalValueColor').enable();
latestChartWidgetSettingsForm.get('legendShowTotal').disable();
} else { } else {
latestChartWidgetSettingsForm.get('totalValueFont').disable(); latestChartWidgetSettingsForm.get('totalValueFont').disable();
latestChartWidgetSettingsForm.get('totalValueColor').disable(); latestChartWidgetSettingsForm.get('totalValueColor').disable();
latestChartWidgetSettingsForm.get('legendShowTotal').enable();
} }
} }
} }