-
- {{ echartsShapeTranslations.get(shape) | translate }}
+
+ {{ chartShapeTranslations.get(shape) | translate }}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings-panel.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings-panel.component.ts
index 766b8b7ccf..e868e1f2e9 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings-panel.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings-panel.component.ts
@@ -25,15 +25,11 @@ import {
timeSeriesThresholdLabelPositions,
timeSeriesThresholdLabelPositionTranslations
} from '@home/components/widget/lib/chart/time-series-chart.models';
-import {
- EChartsShape,
- echartsShapes,
- echartsShapeTranslations
-} from '@home/components/widget/lib/chart/echarts-widget.models';
import { merge } from 'rxjs';
import { WidgetConfig } from '@shared/models/widget.models';
import { formatValue, isDefinedAndNotNull } from '@core/utils';
import { coerceBoolean } from '@shared/decorators/coercion';
+import { ChartShape, chartShapes, chartShapeTranslations } from '@home/components/widget/lib/chart/chart.models';
@Component({
selector: 'tb-time-series-chart-threshold-settings-panel',
@@ -48,9 +44,9 @@ export class TimeSeriesChartThresholdSettingsPanelComponent implements OnInit {
timeSeriesLineTypeTranslations = timeSeriesLineTypeTranslations;
- echartsShapes = echartsShapes;
+ chartShapes = chartShapes;
- echartsShapeTranslations = echartsShapeTranslations;
+ chartShapeTranslations = chartShapeTranslations;
timeSeriesThresholdLabelPositions = timeSeriesThresholdLabelPositions;
@@ -127,8 +123,8 @@ export class TimeSeriesChartThresholdSettingsPanelComponent implements OnInit {
private updateValidators() {
const showLabel: boolean = this.thresholdSettingsFormGroup.get('showLabel').value;
const enableLabelBackground: boolean = this.thresholdSettingsFormGroup.get('enableLabelBackground').value;
- const startSymbol: EChartsShape = this.thresholdSettingsFormGroup.get('startSymbol').value;
- const endSymbol: EChartsShape = this.thresholdSettingsFormGroup.get('endSymbol').value;
+ const startSymbol: ChartShape = this.thresholdSettingsFormGroup.get('startSymbol').value;
+ const endSymbol: ChartShape = this.thresholdSettingsFormGroup.get('endSymbol').value;
if (showLabel) {
this.thresholdSettingsFormGroup.get('labelPosition').enable({emitEvent: false});
this.thresholdSettingsFormGroup.get('labelFont').enable({emitEvent: false});
@@ -146,12 +142,12 @@ export class TimeSeriesChartThresholdSettingsPanelComponent implements OnInit {
this.thresholdSettingsFormGroup.get('enableLabelBackground').disable({emitEvent: false});
this.thresholdSettingsFormGroup.get('labelBackground').disable({emitEvent: false});
}
- if (startSymbol === EChartsShape.none) {
+ if (startSymbol === ChartShape.none) {
this.thresholdSettingsFormGroup.get('startSymbolSize').disable({emitEvent: false});
} else {
this.thresholdSettingsFormGroup.get('startSymbolSize').enable({emitEvent: false});
}
- if (endSymbol === EChartsShape.none) {
+ if (endSymbol === ChartShape.none) {
this.thresholdSettingsFormGroup.get('endSymbolSize').disable({emitEvent: false});
} else {
this.thresholdSettingsFormGroup.get('endSymbolSize').enable({emitEvent: false});
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-row.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-row.component.html
index 0b1907033f..7291a2d4f7 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-row.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-row.component.html
@@ -32,12 +32,12 @@
-
+
-
+
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/widget-settings-common.module.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/widget-settings-common.module.ts
index 31c8f60c12..bbe3dfb20c 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/widget-settings-common.module.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/widget-settings-common.module.ts
@@ -119,8 +119,8 @@ import {
TimeSeriesChartAxisSettingsPanelComponent
} from '@home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings-panel.component';
import {
- EchartsAnimationSettingsComponent
-} from '@home/components/widget/lib/settings/common/chart/echarts-animation-settings.component';
+ ChartAnimationSettingsComponent
+} from '@home/components/widget/lib/settings/common/chart/chart-animation-settings.component';
import {
AutoDateFormatSettingsPanelComponent
} from '@home/components/widget/lib/settings/common/auto-date-format-settings-panel.component';
@@ -128,8 +128,8 @@ import {
AutoDateFormatSettingsComponent
} from '@home/components/widget/lib/settings/common/auto-date-format-settings.component';
import {
- TimeSeriesChartFillSettingsComponent
-} from '@home/components/widget/lib/settings/common/chart/time-series-chart-fill-settings.component';
+ ChartFillSettingsComponent
+} from '@home/components/widget/lib/settings/common/chart/chart-fill-settings.component';
import {
TimeSeriesChartThresholdSettingsComponent
} from '@home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings.component';
@@ -148,6 +148,7 @@ import {
import {
StatusWidgetStateSettingsComponent
} from '@home/components/widget/lib/settings/common/indicator/status-widget-state-settings.component';
+import { ChartBarSettingsComponent } from '@home/components/widget/lib/settings/common/chart/chart-bar-settings.component';
@NgModule({
declarations: [
@@ -195,8 +196,9 @@ import {
TimeSeriesChartYAxisRowComponent,
TimeSeriesChartAxisSettingsPanelComponent,
TimeSeriesChartAxisSettingsButtonComponent,
- EchartsAnimationSettingsComponent,
- TimeSeriesChartFillSettingsComponent,
+ ChartAnimationSettingsComponent,
+ ChartFillSettingsComponent,
+ ChartBarSettingsComponent,
TimeSeriesChartThresholdSettingsComponent,
TimeSeriesChartStatesPanelComponent,
TimeSeriesChartStateRowComponent,
@@ -255,8 +257,9 @@ import {
TimeSeriesChartYAxisRowComponent,
TimeSeriesChartAxisSettingsPanelComponent,
TimeSeriesChartAxisSettingsButtonComponent,
- EchartsAnimationSettingsComponent,
- TimeSeriesChartFillSettingsComponent,
+ ChartAnimationSettingsComponent,
+ ChartFillSettingsComponent,
+ ChartBarSettingsComponent,
TimeSeriesChartThresholdSettingsComponent,
TimeSeriesChartStatesPanelComponent,
TimeSeriesChartStateRowComponent,
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/widget-settings.module.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/widget-settings.module.ts
index fa34b2c358..db0973a5bc 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/widget-settings.module.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/widget-settings.module.ts
@@ -336,9 +336,6 @@ import {
import {
TimeSeriesChartLineSettingsComponent
} from '@home/components/widget/lib/settings/chart/time-series-chart-line-settings.component';
-import {
- TimeSeriesChartBarSettingsComponent
-} from '@home/components/widget/lib/settings/chart/time-series-chart-bar-settings.component';
import {
TimeSeriesChartWidgetSettingsComponent
} from '@home/components/widget/lib/settings/chart/time-series-chart-widget-settings.component';
@@ -348,6 +345,12 @@ import {
import {
PieChartWidgetSettingsComponent
} from '@home/components/widget/lib/settings/chart/pie-chart-widget-settings.component';
+import {
+ BarChartWidgetSettingsComponent
+} from '@home/components/widget/lib/settings/chart/bar-chart-widget-settings.component';
+import {
+ PolarAreaChartWidgetSettingsComponent
+} from '@home/components/widget/lib/settings/chart/polar-area-chart-widget-settings.component';
@NgModule({
declarations: [
@@ -469,10 +472,11 @@ import {
ToggleButtonWidgetSettingsComponent,
TimeSeriesChartKeySettingsComponent,
TimeSeriesChartLineSettingsComponent,
- TimeSeriesChartBarSettingsComponent,
TimeSeriesChartWidgetSettingsComponent,
StatusWidgetSettingsComponent,
- PieChartWidgetSettingsComponent
+ PieChartWidgetSettingsComponent,
+ BarChartWidgetSettingsComponent,
+ PolarAreaChartWidgetSettingsComponent
],
imports: [
CommonModule,
@@ -599,10 +603,11 @@ import {
ToggleButtonWidgetSettingsComponent,
TimeSeriesChartKeySettingsComponent,
TimeSeriesChartLineSettingsComponent,
- TimeSeriesChartBarSettingsComponent,
TimeSeriesChartWidgetSettingsComponent,
StatusWidgetSettingsComponent,
- PieChartWidgetSettingsComponent
+ PieChartWidgetSettingsComponent,
+ BarChartWidgetSettingsComponent,
+ PolarAreaChartWidgetSettingsComponent
]
})
export class WidgetSettingsModule {
@@ -697,5 +702,7 @@ export const widgetSettingsComponentsMap: {[key: string]: Type