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

UI: added validation qr code text

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2021-07-23 16:26:22 +03:00
parent 73c4f51e04
commit e02d4196f0
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui-ngx/src/app/modules/home/components/widget/lib/qrcode-widget.component.ts
View File

@ -29,7 +29,7 @@ import {
import { FormattedData } from '@home/components/widget/lib/maps/map-models'; import { FormattedData } from '@home/components/widget/lib/maps/map-models';
import { DatasourceData } from '@shared/models/widget.models'; import { DatasourceData } from '@shared/models/widget.models';
import { DataKeyType } from '@shared/models/telemetry/telemetry.models'; import { DataKeyType } from '@shared/models/telemetry/telemetry.models';
import { isString } from '@core/utils'; import { isNumber, isObject } from '@core/utils';
interface QrCodeWidgetSettings { interface QrCodeWidgetSettings {
qrCodeTextPattern: string; qrCodeTextPattern: string;
@ -110,12 +110,11 @@ export class QrCodeWidgetComponent extends PageComponent implements OnInit, Afte
private updateQrCodeText(newQrCodeText: string): void { private updateQrCodeText(newQrCodeText: string): void {
if (this.qrCodeText !== newQrCodeText) { if (this.qrCodeText !== newQrCodeText) {
this.qrCodeText = newQrCodeText; this.qrCodeText = newQrCodeText;
if (isString(newQrCodeText)) { if (!(isObject(newQrCodeText) || isNumber(newQrCodeText))) {
this.invalidQrCodeText = false; this.invalidQrCodeText = false;
if (this.qrCodeText) { if (this.qrCodeText) {
this.updateCanvas(); this.updateCanvas();
} }
this.cd.detectChanges();
} else { } else {
this.invalidQrCodeText = true; this.invalidQrCodeText = true;
} }