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

changed dialog sizing

Browse Source
This commit is contained in:
mpetrov 2025-02-17 19:03:40 +02:00
parent cf815b39f4
commit 062fa3a4ed
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui-ngx/src/app/modules/home/components/calculated-fields/components/test-arguments/calculated-field-test-arguments.component.ts
View File

@ -122,12 +122,13 @@ export class CalculatedFieldTestArgumentsComponent extends PageComponent impleme
openEditJSONDialog(group: FormGroup): void { openEditJSONDialog(group: FormGroup): void {
this.dialog.open<JsonObjectEditDialogComponent, JsonObjectEditDialogData, CalculatedFieldArgumentEventValue>(JsonObjectEditDialogComponent, { this.dialog.open<JsonObjectEditDialogComponent, JsonObjectEditDialogData, CalculatedFieldArgumentEventValue>(JsonObjectEditDialogComponent, {
disableClose: true, disableClose: true,
height: '65vh', height: '760px',
minWidth: 'min(700px, 100%)', minWidth: 'min(700px, 100%)',
panelClass: ['tb-dialog', 'tb-fullscreen-dialog'], panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
data: { data: {
jsonValue: group.value, jsonValue: group.value,
required: true required: true,
fillHeight: true
} }
}).afterClosed() }).afterClosed()
.pipe(filter(Boolean)) .pipe(filter(Boolean))

2
ui-ngx/src/app/shared/components/dialog/json-object-edit-dialog.component.html
View File

@ -35,7 +35,7 @@
class="block h-full" class="block h-full"
label="{{ 'value.json-value' | translate }}" label="{{ 'value.json-value' | translate }}"
[jsonRequired]="required" [jsonRequired]="required"
[fillHeight]="false"> [fillHeight]="data.fillHeight">
</tb-json-object-edit> </tb-json-object-edit>
</fieldset> </fieldset>
</div> </div>

1
ui-ngx/src/app/shared/components/dialog/json-object-edit-dialog.component.ts
View File

@ -30,6 +30,7 @@ export interface JsonObjectEditDialogData {
title?: string; title?: string;
saveLabel?: string; saveLabel?: string;
cancelLabel?: string; cancelLabel?: string;
fillHeight?: boolean;
} }
@Component({ @Component({

2
ui-ngx/src/app/shared/components/json-object-edit.component.html
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
--> -->
<div class="flex h-full flex-col" style="background: #fff;" [class.fill-height]="fillHeight" <div class="flex flex-col" style="background: #fff;" [class.fill-height]="fillHeight"
tb-fullscreen tb-fullscreen
[fullscreen]="fullscreen" (fullscreenChanged)="onFullscreen()"> [fullscreen]="fullscreen" (fullscreenChanged)="onFullscreen()">
<div class="tb-json-object-toolbar flex flex-row items-center justify-start"> <div class="tb-json-object-toolbar flex flex-row items-center justify-start">