From c77788be1293fa204dd5eaa94fa0b40ed7072e1f Mon Sep 17 00:00:00 2001 From: Artem Dzhereleiko Date: Wed, 20 Dec 2023 15:55:38 +0200 Subject: [PATCH] UI: Fixed legend on update --- .../widget/lib/flot-widget.component.scss | 24 +++++++++++++++++++ .../widget/lib/flot-widget.component.ts | 2 +- .../home/components/widget/lib/flot-widget.ts | 4 +++- 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.component.scss diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.component.scss new file mode 100644 index 0000000000..a0ac9df2e0 --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.component.scss @@ -0,0 +1,24 @@ +/** + * Copyright © 2016-2023 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. + */ + + +:host ::ng-deep { + .flot-base, .flot-overlay { + width: 100% !important; + height: 100% !important; + } +} + diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.component.ts index 1494e987ce..e313c0b313 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.component.ts @@ -30,7 +30,7 @@ import { isDefinedAndNotNull } from '@core/utils'; @Component({ selector: 'tb-flot-widget', templateUrl: './flot-widget.component.html', - styleUrls: [] + styleUrls: ['./flot-widget.component.scss'] }) export class FlotWidgetComponent implements OnInit { diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.ts b/ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.ts index 9f5209b5e3..9f131e5c15 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.ts @@ -1058,7 +1058,9 @@ export class TbFlot { const series = this.subscription.data[i] as TbFlotSeries; this.substituteLabelPatterns(series, i); } - this.updateData(); + if (this.plot) { + this.updateData(); + } this.ctx.detectChanges(); }