Browse Source

UI: Add grid settings to time series charts.

pull/10580/head
Igor Kulikov 2 years ago
parent
commit
9c383be12a
  1. 3
      ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-with-labels-basic-config.component.html
  2. 9
      ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-with-labels-basic-config.component.ts
  3. 3
      ui-ngx/src/app/modules/home/components/widget/config/basic/chart/range-chart-basic-config.component.html
  4. 9
      ui-ngx/src/app/modules/home/components/widget/config/basic/chart/range-chart-basic-config.component.ts
  5. 3
      ui-ngx/src/app/modules/home/components/widget/config/basic/chart/time-series-chart-basic-config.component.html
  6. 4
      ui-ngx/src/app/modules/home/components/widget/config/basic/chart/time-series-chart-basic-config.component.ts
  7. 6
      ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.models.ts
  8. 6
      ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.models.ts
  9. 17
      ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.models.ts
  10. 4
      ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.ts
  11. 3
      ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/bar-chart-with-labels-widget-settings.component.html
  12. 8
      ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/bar-chart-with-labels-widget-settings.component.ts
  13. 3
      ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/range-chart-widget-settings.component.html
  14. 20
      ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/range-chart-widget-settings.component.ts
  15. 3
      ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-widget-settings.component.html
  16. 7
      ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-widget-settings.component.ts
  17. 54
      ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-grid-settings.component.html
  18. 115
      ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-grid-settings.component.ts
  19. 5
      ui-ngx/src/app/modules/home/components/widget/lib/settings/common/widget-settings-common.module.ts
  20. 5
      ui-ngx/src/assets/locale/locale.constant-en_US.json

3
ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-with-labels-basic-config.component.html

@ -91,6 +91,9 @@
{{ 'widgets.time-series-chart.data-zoom' | translate }} {{ 'widgets.time-series-chart.data-zoom' | translate }}
</mat-slide-toggle> </mat-slide-toggle>
</div> </div>
<tb-time-series-chart-grid-settings
formControlName="grid">
</tb-time-series-chart-grid-settings>
</div> </div>
<div class="tb-form-panel"> <div class="tb-form-panel">
<div class="tb-form-panel-title" translate>widgets.bar-chart.bar-appearance</div> <div class="tb-form-panel-title" translate>widgets.bar-chart.bar-appearance</div>

9
ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-with-labels-basic-config.component.ts

@ -33,7 +33,7 @@ import {
getTimewindowConfig, getTimewindowConfig,
setTimewindowConfig setTimewindowConfig
} from '@home/components/widget/config/timewindow-config-panel.component'; } from '@home/components/widget/config/timewindow-config-panel.component';
import { formatValue, isUndefined } from '@core/utils'; import { formatValue, isUndefined, mergeDeep } from '@core/utils';
import { import {
cssSizeToStrSize, cssSizeToStrSize,
DateFormatProcessor, DateFormatProcessor,
@ -88,7 +88,8 @@ export class BarChartWithLabelsBasicConfigComponent extends BasicWidgetConfigCom
} }
protected onConfigSet(configData: WidgetConfigComponentData) { protected onConfigSet(configData: WidgetConfigComponentData) {
const settings: BarChartWithLabelsWidgetSettings = {...barChartWithLabelsDefaultSettings, ...(configData.config.settings || {})}; const settings: BarChartWithLabelsWidgetSettings = mergeDeep<BarChartWithLabelsWidgetSettings>({} as BarChartWithLabelsWidgetSettings,
barChartWithLabelsDefaultSettings, configData.config.settings as BarChartWithLabelsWidgetSettings);
const iconSize = resolveCssSize(configData.config.iconSize); const iconSize = resolveCssSize(configData.config.iconSize);
this.barChartWidgetConfigForm = this.fb.group({ this.barChartWidgetConfigForm = this.fb.group({
timewindowConfig: [getTimewindowConfig(configData.config), []], timewindowConfig: [getTimewindowConfig(configData.config), []],
@ -123,6 +124,8 @@ export class BarChartWithLabelsBasicConfigComponent extends BasicWidgetConfigCom
units: [configData.config.units, []], units: [configData.config.units, []],
decimals: [configData.config.decimals, []], decimals: [configData.config.decimals, []],
grid: [settings.grid, []],
yAxis: [settings.yAxis, []], yAxis: [settings.yAxis, []],
xAxis: [settings.xAxis, []], xAxis: [settings.xAxis, []],
@ -192,6 +195,8 @@ export class BarChartWithLabelsBasicConfigComponent extends BasicWidgetConfigCom
this.widgetConfig.config.units = config.units; this.widgetConfig.config.units = config.units;
this.widgetConfig.config.decimals = config.decimals; this.widgetConfig.config.decimals = config.decimals;
this.widgetConfig.config.settings.grid = config.grid;
this.widgetConfig.config.settings.yAxis = config.yAxis; this.widgetConfig.config.settings.yAxis = config.yAxis;
this.widgetConfig.config.settings.xAxis = config.xAxis; this.widgetConfig.config.settings.xAxis = config.xAxis;

3
ui-ngx/src/app/modules/home/components/widget/config/basic/chart/range-chart-basic-config.component.html

@ -75,6 +75,9 @@
{{ 'widgets.range-chart.data-zoom' | translate }} {{ 'widgets.range-chart.data-zoom' | translate }}
</mat-slide-toggle> </mat-slide-toggle>
</div> </div>
<tb-time-series-chart-grid-settings
formControlName="grid">
</tb-time-series-chart-grid-settings>
</div> </div>
<div class="tb-form-panel"> <div class="tb-form-panel">
<div class="tb-form-panel-title" translate>widgets.range-chart.range-chart-appearance</div> <div class="tb-form-panel-title" translate>widgets.range-chart.range-chart-appearance</div>

9
ui-ngx/src/app/modules/home/components/widget/config/basic/chart/range-chart-basic-config.component.ts

@ -33,7 +33,7 @@ import {
getTimewindowConfig, getTimewindowConfig,
setTimewindowConfig setTimewindowConfig
} from '@home/components/widget/config/timewindow-config-panel.component'; } from '@home/components/widget/config/timewindow-config-panel.component';
import { formatValue, isUndefined } from '@core/utils'; import { formatValue, isUndefined, mergeDeep } from '@core/utils';
import { import {
cssSizeToStrSize, cssSizeToStrSize,
DateFormatProcessor, DateFormatProcessor,
@ -114,7 +114,8 @@ export class RangeChartBasicConfigComponent extends BasicWidgetConfigComponent {
} }
protected onConfigSet(configData: WidgetConfigComponentData) { protected onConfigSet(configData: WidgetConfigComponentData) {
const settings: RangeChartWidgetSettings = {...rangeChartDefaultSettings, ...(configData.config.settings || {})}; const settings: RangeChartWidgetSettings = mergeDeep<RangeChartWidgetSettings>({} as RangeChartWidgetSettings,
rangeChartDefaultSettings, configData.config.settings as RangeChartWidgetSettings);
const iconSize = resolveCssSize(configData.config.iconSize); const iconSize = resolveCssSize(configData.config.iconSize);
this.rangeChartWidgetConfigForm = this.fb.group({ this.rangeChartWidgetConfigForm = this.fb.group({
timewindowConfig: [getTimewindowConfig(configData.config), []], timewindowConfig: [getTimewindowConfig(configData.config), []],
@ -159,6 +160,8 @@ export class RangeChartBasicConfigComponent extends BasicWidgetConfigComponent {
pointShape: [settings.pointShape, []], pointShape: [settings.pointShape, []],
pointSize: [settings.pointSize, [Validators.min(0)]], pointSize: [settings.pointSize, [Validators.min(0)]],
grid: [settings.grid, []],
yAxis: [settings.yAxis, []], yAxis: [settings.yAxis, []],
xAxis: [settings.xAxis, []], xAxis: [settings.xAxis, []],
@ -239,6 +242,8 @@ export class RangeChartBasicConfigComponent extends BasicWidgetConfigComponent {
this.widgetConfig.config.settings.pointShape = config.pointShape; this.widgetConfig.config.settings.pointShape = config.pointShape;
this.widgetConfig.config.settings.pointSize = config.pointSize; this.widgetConfig.config.settings.pointSize = config.pointSize;
this.widgetConfig.config.settings.grid = config.grid;
this.widgetConfig.config.settings.yAxis = config.yAxis; this.widgetConfig.config.settings.yAxis = config.yAxis;
this.widgetConfig.config.settings.xAxis = config.xAxis; this.widgetConfig.config.settings.xAxis = config.xAxis;

3
ui-ngx/src/app/modules/home/components/widget/config/basic/chart/time-series-chart-basic-config.component.html

@ -161,6 +161,9 @@
{{ 'widgets.time-series-chart.data-zoom' | translate }} {{ 'widgets.time-series-chart.data-zoom' | translate }}
</mat-slide-toggle> </mat-slide-toggle>
</div> </div>
<tb-time-series-chart-grid-settings
formControlName="grid">
</tb-time-series-chart-grid-settings>
<div class="tb-form-row"> <div class="tb-form-row">
<mat-slide-toggle class="mat-slide" formControlName="stack"> <mat-slide-toggle class="mat-slide" formControlName="stack">
<div tb-hint-tooltip-icon="{{'widgets.time-series-chart.stack-mode-hint' | translate}}"> <div tb-hint-tooltip-icon="{{'widgets.time-series-chart.stack-mode-hint' | translate}}">

4
ui-ngx/src/app/modules/home/components/widget/config/basic/chart/time-series-chart-basic-config.component.ts

@ -161,6 +161,8 @@ export class TimeSeriesChartBasicConfigComponent extends BasicWidgetConfigCompon
dataZoom: [settings.dataZoom, []], dataZoom: [settings.dataZoom, []],
stack: [settings.stack, []], stack: [settings.stack, []],
grid: [settings.grid, []],
xAxis: [settings.xAxis, []], xAxis: [settings.xAxis, []],
noAggregationBarWidthSettings: [settings.noAggregationBarWidthSettings, []], noAggregationBarWidthSettings: [settings.noAggregationBarWidthSettings, []],
@ -226,6 +228,8 @@ export class TimeSeriesChartBasicConfigComponent extends BasicWidgetConfigCompon
this.widgetConfig.config.settings.dataZoom = config.dataZoom; this.widgetConfig.config.settings.dataZoom = config.dataZoom;
this.widgetConfig.config.settings.stack = config.stack; this.widgetConfig.config.settings.stack = config.stack;
this.widgetConfig.config.settings.grid = config.grid;
this.widgetConfig.config.settings.yAxes = config.yAxes; this.widgetConfig.config.settings.yAxes = config.yAxes;
this.widgetConfig.config.settings.xAxis = config.xAxis; this.widgetConfig.config.settings.xAxis = config.xAxis;

6
ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.models.ts

@ -32,6 +32,8 @@ import {
SeriesFillType, SeriesFillType,
timeSeriesChartAnimationDefaultSettings, timeSeriesChartAnimationDefaultSettings,
TimeSeriesChartAnimationSettings, TimeSeriesChartAnimationSettings,
timeSeriesChartGridDefaultSettings,
TimeSeriesChartGridSettings,
TimeSeriesChartKeySettings, TimeSeriesChartKeySettings,
timeSeriesChartNoAggregationBarWidthDefaultSettings, timeSeriesChartNoAggregationBarWidthDefaultSettings,
TimeSeriesChartNoAggregationBarWidthSettings, TimeSeriesChartNoAggregationBarWidthSettings,
@ -58,6 +60,7 @@ export interface BarChartWithLabelsWidgetSettings extends EChartsTooltipWidgetSe
barBorderRadius: number; barBorderRadius: number;
barBackgroundSettings: SeriesFillSettings; barBackgroundSettings: SeriesFillSettings;
noAggregationBarWidthSettings: TimeSeriesChartNoAggregationBarWidthSettings; noAggregationBarWidthSettings: TimeSeriesChartNoAggregationBarWidthSettings;
grid: TimeSeriesChartGridSettings;
yAxis: TimeSeriesChartYAxisSettings; yAxis: TimeSeriesChartYAxisSettings;
xAxis: TimeSeriesChartXAxisSettings; xAxis: TimeSeriesChartXAxisSettings;
animation: TimeSeriesChartAnimationSettings; animation: TimeSeriesChartAnimationSettings;
@ -105,6 +108,8 @@ export const barChartWithLabelsDefaultSettings: BarChartWithLabelsWidgetSettings
}, },
noAggregationBarWidthSettings: mergeDeep({} as TimeSeriesChartNoAggregationBarWidthSettings, noAggregationBarWidthSettings: mergeDeep({} as TimeSeriesChartNoAggregationBarWidthSettings,
timeSeriesChartNoAggregationBarWidthDefaultSettings), timeSeriesChartNoAggregationBarWidthDefaultSettings),
grid: mergeDeep({} as TimeSeriesChartGridSettings,
timeSeriesChartGridDefaultSettings),
yAxis: mergeDeep({} as TimeSeriesChartYAxisSettings, yAxis: mergeDeep({} as TimeSeriesChartYAxisSettings,
defaultTimeSeriesChartYAxisSettings, defaultTimeSeriesChartYAxisSettings,
{ id: 'default', order: 0, showLine: false, showTicks: false } as TimeSeriesChartYAxisSettings), { id: 'default', order: 0, showLine: false, showTicks: false } as TimeSeriesChartYAxisSettings),
@ -163,6 +168,7 @@ export const barChartWithLabelsDefaultSettings: BarChartWithLabelsWidgetSettings
export const barChartWithLabelsTimeSeriesSettings = (settings: BarChartWithLabelsWidgetSettings): DeepPartial<TimeSeriesChartSettings> => ({ export const barChartWithLabelsTimeSeriesSettings = (settings: BarChartWithLabelsWidgetSettings): DeepPartial<TimeSeriesChartSettings> => ({
dataZoom: settings.dataZoom, dataZoom: settings.dataZoom,
grid: settings.grid,
yAxes: { yAxes: {
default: settings.yAxis default: settings.yAxis
}, },

6
ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.models.ts

@ -33,7 +33,7 @@ import {
SeriesFillType, SeriesFillType,
SeriesLabelPosition, ThresholdLabelPosition, timeSeriesChartAnimationDefaultSettings, SeriesLabelPosition, ThresholdLabelPosition, timeSeriesChartAnimationDefaultSettings,
TimeSeriesChartAnimationSettings, TimeSeriesChartAnimationSettings,
timeSeriesChartColorScheme, timeSeriesChartColorScheme, timeSeriesChartGridDefaultSettings, TimeSeriesChartGridSettings,
TimeSeriesChartKeySettings, TimeSeriesChartKeySettings,
TimeSeriesChartLineType, TimeSeriesChartLineType,
TimeSeriesChartSeriesType, TimeSeriesChartSeriesType,
@ -81,6 +81,7 @@ export interface RangeChartWidgetSettings extends EChartsTooltipWidgetSettings {
pointLabelBackground: string; pointLabelBackground: string;
pointShape: EChartsShape; pointShape: EChartsShape;
pointSize: number; pointSize: number;
grid: TimeSeriesChartGridSettings;
yAxis: TimeSeriesChartYAxisSettings; yAxis: TimeSeriesChartYAxisSettings;
xAxis: TimeSeriesChartXAxisSettings; xAxis: TimeSeriesChartXAxisSettings;
animation: TimeSeriesChartAnimationSettings; animation: TimeSeriesChartAnimationSettings;
@ -141,6 +142,8 @@ export const rangeChartDefaultSettings: RangeChartWidgetSettings = {
pointLabelBackground: 'rgba(255,255,255,0.56)', pointLabelBackground: 'rgba(255,255,255,0.56)',
pointShape: EChartsShape.emptyCircle, pointShape: EChartsShape.emptyCircle,
pointSize: 4, pointSize: 4,
grid: mergeDeep({} as TimeSeriesChartGridSettings,
timeSeriesChartGridDefaultSettings),
yAxis: mergeDeep({} as TimeSeriesChartYAxisSettings, yAxis: mergeDeep({} as TimeSeriesChartYAxisSettings,
defaultTimeSeriesChartYAxisSettings, defaultTimeSeriesChartYAxisSettings,
{ id: 'default', order: 0, showLine: false, showTicks: false } as TimeSeriesChartYAxisSettings), { id: 'default', order: 0, showLine: false, showTicks: false } as TimeSeriesChartYAxisSettings),
@ -213,6 +216,7 @@ export const rangeChartTimeSeriesSettings = (settings: RangeChartWidgetSettings,
return { return {
dataZoom: settings.dataZoom, dataZoom: settings.dataZoom,
thresholds, thresholds,
grid: settings.grid,
yAxes: { yAxes: {
default: { default: {
...settings.yAxis, ...settings.yAxis,

17
ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.models.ts

@ -699,11 +699,26 @@ export interface TimeSeriesChartComparisonSettings extends WidgetComparisonSetti
comparisonXAxis?: TimeSeriesChartXAxisSettings; comparisonXAxis?: TimeSeriesChartXAxisSettings;
} }
export interface TimeSeriesChartGridSettings {
show: boolean;
backgroundColor: string;
borderWidth: number;
borderColor: string;
}
export const timeSeriesChartGridDefaultSettings: TimeSeriesChartGridSettings = {
show: false,
backgroundColor: null,
borderWidth: 1,
borderColor: '#ccc'
};
export interface TimeSeriesChartSettings extends EChartsTooltipWidgetSettings, TimeSeriesChartComparisonSettings { export interface TimeSeriesChartSettings extends EChartsTooltipWidgetSettings, TimeSeriesChartComparisonSettings {
thresholds: TimeSeriesChartThreshold[]; thresholds: TimeSeriesChartThreshold[];
darkMode: boolean; darkMode: boolean;
dataZoom: boolean; dataZoom: boolean;
stack: boolean; stack: boolean;
grid: TimeSeriesChartGridSettings;
yAxes: TimeSeriesChartYAxes; yAxes: TimeSeriesChartYAxes;
xAxis: TimeSeriesChartXAxisSettings; xAxis: TimeSeriesChartXAxisSettings;
animation: TimeSeriesChartAnimationSettings; animation: TimeSeriesChartAnimationSettings;
@ -718,6 +733,8 @@ export const timeSeriesChartDefaultSettings: TimeSeriesChartSettings = {
darkMode: false, darkMode: false,
dataZoom: true, dataZoom: true,
stack: false, stack: false,
grid: mergeDeep({} as TimeSeriesChartGridSettings,
timeSeriesChartGridDefaultSettings),
yAxes: { yAxes: {
default: mergeDeep({} as TimeSeriesChartYAxisSettings, default: mergeDeep({} as TimeSeriesChartYAxisSettings,
defaultTimeSeriesChartYAxisSettings, defaultTimeSeriesChartYAxisSettings,

4
ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.ts

@ -612,6 +612,10 @@ export class TbTimeSeriesChart {
extraCssText: `line-height: 1; backdrop-filter: blur(${this.settings.tooltipBackgroundBlur}px);` extraCssText: `line-height: 1; backdrop-filter: blur(${this.settings.tooltipBackgroundBlur}px);`
}], }],
grid: [{ grid: [{
show: this.settings.grid.show,
backgroundColor: this.settings.grid.backgroundColor,
borderWidth: this.settings.grid.borderWidth,
borderColor: this.settings.grid.borderColor,
top: this.minTopOffset(), top: this.minTopOffset(),
left: this.settings.dataZoom ? 5 : 0, left: this.settings.dataZoom ? 5 : 0,
right: this.settings.dataZoom ? 5 : 0, right: this.settings.dataZoom ? 5 : 0,

3
ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/bar-chart-with-labels-widget-settings.component.html

@ -23,6 +23,9 @@
{{ 'widgets.time-series-chart.data-zoom' | translate }} {{ 'widgets.time-series-chart.data-zoom' | translate }}
</mat-slide-toggle> </mat-slide-toggle>
</div> </div>
<tb-time-series-chart-grid-settings
formControlName="grid">
</tb-time-series-chart-grid-settings>
<div class="tb-form-panel"> <div class="tb-form-panel">
<div class="tb-form-panel-title" translate>widgets.bar-chart.bar-appearance</div> <div class="tb-form-panel-title" translate>widgets.bar-chart.bar-appearance</div>
<div class="tb-form-row space-between"> <div class="tb-form-row space-between">

8
ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/bar-chart-with-labels-widget-settings.component.ts

@ -25,10 +25,10 @@ import {
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 } from '@core/utils'; import { formatValue, mergeDeep } from '@core/utils';
import { DateFormatProcessor, DateFormatSettings } from '@shared/models/widget-settings.models'; import { DateFormatProcessor, DateFormatSettings } from '@shared/models/widget-settings.models';
import { import {
barChartWithLabelsDefaultSettings barChartWithLabelsDefaultSettings, BarChartWithLabelsWidgetSettings
} from '@home/components/widget/lib/chart/bar-chart-with-labels-widget.models'; } from '@home/components/widget/lib/chart/bar-chart-with-labels-widget.models';
@Component({ @Component({
@ -68,7 +68,7 @@ export class BarChartWithLabelsWidgetSettingsComponent extends WidgetSettingsCom
} }
protected defaultSettings(): WidgetSettings { protected defaultSettings(): WidgetSettings {
return {...barChartWithLabelsDefaultSettings}; return mergeDeep<BarChartWithLabelsWidgetSettings>({} as BarChartWithLabelsWidgetSettings, barChartWithLabelsDefaultSettings);
} }
protected onSettingsSet(settings: WidgetSettings) { protected onSettingsSet(settings: WidgetSettings) {
@ -88,6 +88,8 @@ export class BarChartWithLabelsWidgetSettingsComponent extends WidgetSettingsCom
barBackgroundSettings: [settings.barBackgroundSettings, []], barBackgroundSettings: [settings.barBackgroundSettings, []],
noAggregationBarWidthSettings: [settings.noAggregationBarWidthSettings, []], noAggregationBarWidthSettings: [settings.noAggregationBarWidthSettings, []],
grid: [settings.grid, []],
yAxis: [settings.yAxis, []], yAxis: [settings.yAxis, []],
xAxis: [settings.xAxis, []], xAxis: [settings.xAxis, []],

3
ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/range-chart-widget-settings.component.html

@ -23,6 +23,9 @@
{{ 'widgets.range-chart.data-zoom' | translate }} {{ 'widgets.range-chart.data-zoom' | translate }}
</mat-slide-toggle> </mat-slide-toggle>
</div> </div>
<tb-time-series-chart-grid-settings
formControlName="grid">
</tb-time-series-chart-grid-settings>
<div class="tb-form-panel"> <div class="tb-form-panel">
<div class="tb-form-panel-title" translate>widgets.range-chart.range-chart-appearance</div> <div class="tb-form-panel-title" translate>widgets.range-chart.range-chart-appearance</div>
<div class="tb-form-row space-between"> <div class="tb-form-row space-between">

20
ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/range-chart-widget-settings.component.ts

@ -25,13 +25,19 @@ import {
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { UntypedFormBuilder, UntypedFormGroup, Validators } 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 } from '@core/utils'; import { formatValue, mergeDeep } from '@core/utils';
import { rangeChartDefaultSettings } from '@home/components/widget/lib/chart/range-chart-widget.models'; import {
rangeChartDefaultSettings,
RangeChartWidgetSettings
} from '@home/components/widget/lib/chart/range-chart-widget.models';
import { DateFormatProcessor, DateFormatSettings } from '@shared/models/widget-settings.models'; import { DateFormatProcessor, DateFormatSettings } from '@shared/models/widget-settings.models';
import { import {
lineSeriesStepTypes, lineSeriesStepTypeTranslations, lineSeriesStepTypes,
seriesLabelPositions, seriesLabelPositionTranslations, lineSeriesStepTypeTranslations,
timeSeriesLineTypes, timeSeriesLineTypeTranslations seriesLabelPositions,
seriesLabelPositionTranslations,
timeSeriesLineTypes,
timeSeriesLineTypeTranslations
} from '@home/components/widget/lib/chart/time-series-chart.models'; } from '@home/components/widget/lib/chart/time-series-chart.models';
import { echartsShapes, echartsShapeTranslations } from '@home/components/widget/lib/chart/echarts-widget.models'; import { echartsShapes, echartsShapeTranslations } from '@home/components/widget/lib/chart/echarts-widget.models';
@ -90,7 +96,7 @@ export class RangeChartWidgetSettingsComponent extends WidgetSettingsComponent {
} }
protected defaultSettings(): WidgetSettings { protected defaultSettings(): WidgetSettings {
return {...rangeChartDefaultSettings}; return mergeDeep<RangeChartWidgetSettings>({} as RangeChartWidgetSettings, rangeChartDefaultSettings);
} }
protected onSettingsSet(settings: WidgetSettings) { protected onSettingsSet(settings: WidgetSettings) {
@ -120,6 +126,8 @@ export class RangeChartWidgetSettingsComponent extends WidgetSettingsComponent {
pointShape: [settings.pointShape, []], pointShape: [settings.pointShape, []],
pointSize: [settings.pointSize, [Validators.min(0)]], pointSize: [settings.pointSize, [Validators.min(0)]],
grid: [settings.grid, []],
yAxis: [settings.yAxis, []], yAxis: [settings.yAxis, []],
xAxis: [settings.xAxis, []], xAxis: [settings.xAxis, []],

3
ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-widget-settings.component.html

@ -80,6 +80,9 @@
{{ 'widgets.time-series-chart.data-zoom' | translate }} {{ 'widgets.time-series-chart.data-zoom' | translate }}
</mat-slide-toggle> </mat-slide-toggle>
</div> </div>
<tb-time-series-chart-grid-settings
formControlName="grid">
</tb-time-series-chart-grid-settings>
<div class="tb-form-row"> <div class="tb-form-row">
<mat-slide-toggle class="mat-slide" formControlName="stack"> <mat-slide-toggle class="mat-slide" formControlName="stack">
<div tb-hint-tooltip-icon="{{'widgets.time-series-chart.stack-mode-hint' | translate}}"> <div tb-hint-tooltip-icon="{{'widgets.time-series-chart.stack-mode-hint' | translate}}">

7
ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-widget-settings.component.ts

@ -35,7 +35,8 @@ import {
} from '@home/components/widget/lib/chart/time-series-chart-widget.models'; } from '@home/components/widget/lib/chart/time-series-chart-widget.models';
import { import {
TimeSeriesChartKeySettings, TimeSeriesChartKeySettings,
TimeSeriesChartType, TimeSeriesChartYAxes, TimeSeriesChartType,
TimeSeriesChartYAxes,
TimeSeriesChartYAxisId TimeSeriesChartYAxisId
} from '@home/components/widget/lib/chart/time-series-chart.models'; } from '@home/components/widget/lib/chart/time-series-chart.models';
import { WidgetConfigComponentData } from '@home/models/widget-component.models'; import { WidgetConfigComponentData } from '@home/models/widget-component.models';
@ -108,7 +109,7 @@ export class TimeSeriesChartWidgetSettingsComponent extends WidgetSettingsCompon
} }
protected defaultSettings(): WidgetSettings { protected defaultSettings(): WidgetSettings {
return mergeDeep({} as TimeSeriesChartWidgetSettings, timeSeriesChartWidgetDefaultSettings); return mergeDeep<TimeSeriesChartWidgetSettings>({} as TimeSeriesChartWidgetSettings, timeSeriesChartWidgetDefaultSettings);
} }
protected onSettingsSet(settings: WidgetSettings) { protected onSettingsSet(settings: WidgetSettings) {
@ -125,6 +126,8 @@ export class TimeSeriesChartWidgetSettingsComponent extends WidgetSettingsCompon
dataZoom: [settings.dataZoom, []], dataZoom: [settings.dataZoom, []],
stack: [settings.stack, []], stack: [settings.stack, []],
grid: [settings.grid, []],
xAxis: [settings.xAxis, []], xAxis: [settings.xAxis, []],
noAggregationBarWidthSettings: [settings.noAggregationBarWidthSettings, []], noAggregationBarWidthSettings: [settings.noAggregationBarWidthSettings, []],

54
ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-grid-settings.component.html

@ -0,0 +1,54 @@
<!--
Copyright © 2016-2024 The Thingsboard Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<ng-container [formGroup]="gridSettingsFormGroup">
<div class="tb-form-panel stroked tb-slide-toggle">
<mat-expansion-panel class="tb-settings" [(expanded)]="settingsExpanded"
[disabled]="!gridSettingsFormGroup.get('show').value">
<mat-expansion-panel-header fxLayout="row wrap">
<mat-panel-title>
<mat-slide-toggle class="mat-slide" formControlName="show" (click)="$event.stopPropagation()"
fxLayoutAlign="center">
{{ 'widgets.time-series-chart.grid.grid' | translate }}
</mat-slide-toggle>
</mat-panel-title>
</mat-expansion-panel-header>
<ng-template matExpansionPanelContent>
<div class="tb-form-row space-between">
<div>{{ 'widgets.time-series-chart.grid.background-color' | translate }}</div>
<tb-color-input asBoxInput
colorClearButton
formControlName="backgroundColor">
</tb-color-input>
</div>
<div class="tb-form-row space-between">
<div>{{ 'widgets.time-series-chart.grid.border' | translate }}</div>
<div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
<mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
<input matInput formControlName="borderWidth" type="number" min="0" placeholder="{{ 'widget-config.set' | translate }}">
<span matSuffix>px</span>
</mat-form-field>
<tb-color-input asBoxInput
colorClearButton
formControlName="borderColor">
</tb-color-input>
</div>
</div>
</ng-template>
</mat-expansion-panel>
</div>
</ng-container>

115
ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-grid-settings.component.ts

@ -0,0 +1,115 @@
///
/// Copyright © 2016-2024 The Thingsboard Authors
///
/// Licensed under the Apache License, Version 2.0 (the "License");
/// you may not use this file except in compliance with the License.
/// You may obtain a copy of the License at
///
/// http://www.apache.org/licenses/LICENSE-2.0
///
/// Unless required by applicable law or agreed to in writing, software
/// distributed under the License is distributed on an "AS IS" BASIS,
/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
/// See the License for the specific language governing permissions and
/// limitations under the License.
///
import { Component, forwardRef, Input, OnInit } from '@angular/core';
import {
ControlValueAccessor,
NG_VALUE_ACCESSOR,
UntypedFormBuilder,
UntypedFormGroup,
Validators
} from '@angular/forms';
import { TimeSeriesChartGridSettings } from '@home/components/widget/lib/chart/time-series-chart.models';
import { WidgetService } from '@core/http/widget.service';
@Component({
selector: 'tb-time-series-chart-grid-settings',
templateUrl: './time-series-chart-grid-settings.component.html',
styleUrls: ['./../../widget-settings.scss'],
providers: [
{
provide: NG_VALUE_ACCESSOR,
useExisting: forwardRef(() => TimeSeriesChartGridSettingsComponent),
multi: true
}
]
})
export class TimeSeriesChartGridSettingsComponent implements OnInit, ControlValueAccessor {
settingsExpanded = false;
@Input()
disabled: boolean;
private modelValue: TimeSeriesChartGridSettings;
private propagateChange = null;
public gridSettingsFormGroup: UntypedFormGroup;
constructor(private fb: UntypedFormBuilder,
private widgetService: WidgetService,) {
}
ngOnInit(): void {
this.gridSettingsFormGroup = this.fb.group({
show: [null, []],
backgroundColor: [null, []],
borderWidth: [null, [Validators.min(0)]],
borderColor: [null, []],
});
this.gridSettingsFormGroup.valueChanges.subscribe(() => {
this.updateModel();
});
this.gridSettingsFormGroup.get('show').valueChanges
.subscribe(() => {
this.updateValidators();
});
}
registerOnChange(fn: any): void {
this.propagateChange = fn;
}
registerOnTouched(_fn: any): void {
}
setDisabledState(isDisabled: boolean): void {
this.disabled = isDisabled;
if (isDisabled) {
this.gridSettingsFormGroup.disable({emitEvent: false});
} else {
this.gridSettingsFormGroup.enable({emitEvent: false});
this.updateValidators();
}
}
writeValue(value: TimeSeriesChartGridSettings): void {
this.modelValue = value;
this.gridSettingsFormGroup.patchValue(
value, {emitEvent: false}
);
this.updateValidators();
this.gridSettingsFormGroup.get('show').valueChanges.subscribe((show) => {
this.settingsExpanded = show;
});
}
private updateValidators() {
const show: boolean = this.gridSettingsFormGroup.get('show').value;
if (show) {
this.gridSettingsFormGroup.enable({emitEvent: false});
} else {
this.gridSettingsFormGroup.disable({emitEvent: false});
this.gridSettingsFormGroup.get('show').enable({emitEvent: false});
}
}
private updateModel() {
this.modelValue = this.gridSettingsFormGroup.getRawValue();
this.propagateChange(this.modelValue);
}
}

5
ui-ngx/src/app/modules/home/components/widget/lib/settings/common/widget-settings-common.module.ts

@ -142,6 +142,9 @@ import {
import { import {
TimeSeriesChartAxisSettingsButtonComponent TimeSeriesChartAxisSettingsButtonComponent
} from '@home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings-button.component'; } from '@home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings-button.component';
import {
TimeSeriesChartGridSettingsComponent
} from '@home/components/widget/lib/settings/common/chart/time-series-chart-grid-settings.component';
@NgModule({ @NgModule({
declarations: [ declarations: [
@ -194,6 +197,7 @@ import {
TimeSeriesChartThresholdSettingsComponent, TimeSeriesChartThresholdSettingsComponent,
TimeSeriesChartStatesPanelComponent, TimeSeriesChartStatesPanelComponent,
TimeSeriesChartStateRowComponent, TimeSeriesChartStateRowComponent,
TimeSeriesChartGridSettingsComponent,
DataKeyInputComponent, DataKeyInputComponent,
EntityAliasInputComponent EntityAliasInputComponent
], ],
@ -252,6 +256,7 @@ import {
TimeSeriesChartThresholdSettingsComponent, TimeSeriesChartThresholdSettingsComponent,
TimeSeriesChartStatesPanelComponent, TimeSeriesChartStatesPanelComponent,
TimeSeriesChartStateRowComponent, TimeSeriesChartStateRowComponent,
TimeSeriesChartGridSettingsComponent,
DataKeyInputComponent, DataKeyInputComponent,
EntityAliasInputComponent EntityAliasInputComponent
], ],

5
ui-ngx/src/assets/locale/locale.constant-en_US.json

@ -6806,6 +6806,11 @@
"to": "To", "to": "To",
"remove-state": "Remove state" "remove-state": "Remove state"
}, },
"grid": {
"grid": "Grid",
"background-color": "Background color",
"border": "Border"
},
"axis": { "axis": {
"axes": "Axes", "axes": "Axes",
"x-axis": "X axis", "x-axis": "X axis",

Loading…
Cancel
Save