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

Fix sending double request by enter press and saving required input

Browse Source
This commit is contained in:
ArtemDzhereleiko 2021-09-20 16:53:31 +03:00
parent 75817a16f4
commit 8f377ff367
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.html
View File

@ -108,7 +108,7 @@
</div> </div>
</fieldset> </fieldset>
<div class="mat-padding" fxLayout="row" fxLayoutAlign="end center" <div class="mat-padding" fxLayout="row" fxLayoutAlign="end center"
*ngIf="entityDetected && settings.showActionButtons"> [fxShow]="entityDetected && settings.showActionButtons">
<button mat-button color="primary" type="button" <button mat-button color="primary" type="button"
(click)="discardAll()" style="max-height: 50px; margin-right:20px;" (click)="discardAll()" style="max-height: 50px; margin-right:20px;"
[disabled]="!multipleInputFormGroup.dirty"> [disabled]="!multipleInputFormGroup.dirty">

10
ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.ts
View File

@ -121,6 +121,8 @@ export class MultipleInputWidgetComponent extends PageComponent implements OnIni
multipleInputFormGroup: FormGroup; multipleInputFormGroup: FormGroup;
isSavingInProgress: boolean = false;
toastTargetId = 'multiple-input-widget' + this.utils.guid(); toastTargetId = 'multiple-input-widget' + this.utils.guid();
constructor(protected store: Store<AppState>, constructor(protected store: Store<AppState>,
@ -466,7 +468,8 @@ export class MultipleInputWidgetComponent extends PageComponent implements OnIni
} }
public inputChanged(source: MultipleInputWidgetSource, key: MultipleInputWidgetDataKey) { public inputChanged(source: MultipleInputWidgetSource, key: MultipleInputWidgetDataKey) {
if (!this.settings.showActionButtons) { if (!this.settings.showActionButtons && !this.isSavingInProgress) {
this.isSavingInProgress = true;
const currentValue = this.multipleInputFormGroup.get(key.formId).value; const currentValue = this.multipleInputFormGroup.get(key.formId).value;
if (!key.settings.required || (key.settings.required && isDefined(currentValue))) { if (!key.settings.required || (key.settings.required && isDefined(currentValue))) {
const dataToSave: MultipleInputWidgetSource = { const dataToSave: MultipleInputWidgetSource = {
@ -479,7 +482,8 @@ export class MultipleInputWidgetComponent extends PageComponent implements OnIni
} }
public save(dataToSave?: MultipleInputWidgetSource) { public save(dataToSave?: MultipleInputWidgetSource) {
if (document && document.activeElement) { if (document?.activeElement && !this.isSavingInProgress) {
this.isSavingInProgress = true;
(document.activeElement as HTMLElement).blur(); (document.activeElement as HTMLElement).blur();
} }
const config: RequestConfig = { const config: RequestConfig = {
@ -569,6 +573,7 @@ export class MultipleInputWidgetComponent extends PageComponent implements OnIni
() => { () => {
this.multipleInputFormGroup.markAsPristine(); this.multipleInputFormGroup.markAsPristine();
this.ctx.detectChanges(); this.ctx.detectChanges();
this.isSavingInProgress = false;
if (this.settings.showResultMessage) { if (this.settings.showResultMessage) {
this.ctx.showSuccessToast(this.translate.instant('widgets.input-widgets.update-successful'), this.ctx.showSuccessToast(this.translate.instant('widgets.input-widgets.update-successful'),
1000, 'bottom', 'left', this.toastTargetId); 1000, 'bottom', 'left', this.toastTargetId);
@ -583,6 +588,7 @@ export class MultipleInputWidgetComponent extends PageComponent implements OnIni
} else { } else {
this.multipleInputFormGroup.markAsPristine(); this.multipleInputFormGroup.markAsPristine();
this.ctx.detectChanges(); this.ctx.detectChanges();
this.isSavingInProgress = false;
} }
} }