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

UI: Minor fixes

Browse Source
This commit is contained in:
Igor Kulikov 2023-11-09 16:28:20 +02:00
parent 303e8678ea
commit c0c649b2d8
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,7 @@ import {
doughnutLayoutImages, doughnutLayoutImages,
doughnutLayouts, doughnutLayouts,
doughnutLayoutTranslations, doughnutLayoutTranslations,
DoughnutLegendPosition, doughnutLegendPositions,
doughnutLegendPositionTranslations, doughnutLegendPositionTranslations,
DoughnutTooltipValueType, DoughnutTooltipValueType,
doughnutTooltipValueTypes, doughnutTooltipValueTypes,
@ -83,7 +83,7 @@ export class DoughnutBasicConfigComponent extends BasicWidgetConfigComponent {
doughnutLayoutImageMap: Map<DoughnutLayout, string>; doughnutLayoutImageMap: Map<DoughnutLayout, string>;
doughnutLegendPositions: DoughnutLegendPosition[]; doughnutLegendPositions = doughnutLegendPositions;
doughnutLegendPositionTranslationMap = doughnutLegendPositionTranslations; doughnutLegendPositionTranslationMap = doughnutLegendPositionTranslations;
@ -116,8 +116,6 @@ export class DoughnutBasicConfigComponent extends BasicWidgetConfigComponent {
const params = widgetConfig.typeParameters as any; const params = widgetConfig.typeParameters as any;
this.horizontal = isDefinedAndNotNull(params.horizontal) ? params.horizontal : false; this.horizontal = isDefinedAndNotNull(params.horizontal) ? params.horizontal : false;
this.doughnutLayoutImageMap = this.horizontal ? horizontalDoughnutLayoutImages : doughnutLayoutImages; this.doughnutLayoutImageMap = this.horizontal ? horizontalDoughnutLayoutImages : doughnutLayoutImages;
this.doughnutLegendPositions = this.horizontal ? [DoughnutLegendPosition.left, DoughnutLegendPosition.right] :
[DoughnutLegendPosition.top, DoughnutLegendPosition.bottom];
super.setupConfig(widgetConfig); super.setupConfig(widgetConfig);
} }

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

@ -264,7 +264,7 @@ export class DoughnutWidgetComponent implements OnInit, OnDestroy, AfterViewInit
if (tsValue && isDefinedAndNotNull(tsValue[1]) && isNumeric(tsValue[1])) { if (tsValue && isDefinedAndNotNull(tsValue[1]) && isNumeric(tsValue[1])) {
value = tsValue[1]; value = tsValue[1];
dataItem.hasValue = true; dataItem.hasValue = true;
dataItem.value = value; dataItem.value = Number(value);
} else { } else {
dataItem.hasValue = false; dataItem.hasValue = false;
dataItem.value = 0; dataItem.value = 0;

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

@ -57,6 +57,8 @@ export enum DoughnutLegendPosition {
right = 'right' right = 'right'
} }
export const doughnutLegendPositions = Object.keys(DoughnutLegendPosition) as DoughnutLegendPosition[];
export const doughnutLegendPositionTranslations = new Map<DoughnutLegendPosition, string>( export const doughnutLegendPositionTranslations = new Map<DoughnutLegendPosition, string>(
[ [
[DoughnutLegendPosition.top, 'widgets.doughnut.legend-position-top'], [DoughnutLegendPosition.top, 'widgets.doughnut.legend-position-top'],

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

@ -14,20 +14,19 @@
/// limitations under the License. /// limitations under the License.
/// ///
import { Component, Injector } from '@angular/core'; import { Component } from '@angular/core';
import { WidgetSettings, WidgetSettingsComponent } from '@shared/models/widget.models'; import { WidgetSettings, WidgetSettingsComponent } from '@shared/models/widget.models';
import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { AppState } from '@core/core.state'; import { AppState } from '@core/core.state';
import { formatValue, isDefinedAndNotNull } from '@core/utils'; import { formatValue, isDefinedAndNotNull } from '@core/utils';
import { getDataKey } from '@shared/models/widget-settings.models';
import { import {
doughnutDefaultSettings, doughnutDefaultSettings,
DoughnutLayout, DoughnutLayout,
doughnutLayoutImages, doughnutLayoutImages,
doughnutLayouts, doughnutLayouts,
doughnutLayoutTranslations, doughnutLayoutTranslations,
DoughnutLegendPosition, doughnutLegendPositions,
doughnutLegendPositionTranslations, doughnutLegendPositionTranslations,
DoughnutTooltipValueType, DoughnutTooltipValueType,
doughnutTooltipValueTypes, doughnutTooltipValueTypes,
@ -56,7 +55,7 @@ export class DoughnutWidgetSettingsComponent extends WidgetSettingsComponent {
doughnutLayoutImageMap: Map<DoughnutLayout, string>; doughnutLayoutImageMap: Map<DoughnutLayout, string>;
doughnutLegendPositions: DoughnutLegendPosition[]; doughnutLegendPositions = doughnutLegendPositions;
doughnutLegendPositionTranslationMap = doughnutLegendPositionTranslations; doughnutLegendPositionTranslationMap = doughnutLegendPositionTranslations;
@ -71,7 +70,6 @@ export class DoughnutWidgetSettingsComponent extends WidgetSettingsComponent {
tooltipValuePreviewFn = this._tooltipValuePreviewFn.bind(this); tooltipValuePreviewFn = this._tooltipValuePreviewFn.bind(this);
constructor(protected store: Store<AppState>, constructor(protected store: Store<AppState>,
private $injector: Injector,
private fb: UntypedFormBuilder) { private fb: UntypedFormBuilder) {
super(store); super(store);
} }
@ -84,8 +82,6 @@ export class DoughnutWidgetSettingsComponent extends WidgetSettingsComponent {
const params = widgetConfig.typeParameters as any; const params = widgetConfig.typeParameters as any;
this.horizontal = isDefinedAndNotNull(params.horizontal) ? params.horizontal : false; this.horizontal = isDefinedAndNotNull(params.horizontal) ? params.horizontal : false;
this.doughnutLayoutImageMap = this.horizontal ? horizontalDoughnutLayoutImages : doughnutLayoutImages; this.doughnutLayoutImageMap = this.horizontal ? horizontalDoughnutLayoutImages : doughnutLayoutImages;
this.doughnutLegendPositions = this.horizontal ? [DoughnutLegendPosition.left, DoughnutLegendPosition.right] :
[DoughnutLegendPosition.top, DoughnutLegendPosition.bottom];
} }
protected defaultSettings(): WidgetSettings { protected defaultSettings(): WidgetSettings {