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

Merge pull request #10117 from iraznatovskyi/fix-connector-rpc-table

Browse Source 
Fixed RPC connectors table collapsing also fixed JSON field height when this widget looks as a column
This commit is contained in:
Igor Kulikov 2024-02-12 13:53:08 +02:00 committed by GitHub
commit ed70ca3f9a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 10 additions and 1 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/gateway/gateway-connectors.component.html
View File

@ -80,7 +80,7 @@
</ng-container> </ng-container>
<ng-container matColumnDef="actions" stickyEnd> <ng-container matColumnDef="actions" stickyEnd>
<mat-header-cell *matHeaderCellDef <mat-header-cell *matHeaderCellDef
[ngStyle.gt-md]="{ minWidth: '144px', maxWidth: '144px', width: '144px'}"> [ngStyle.gt-md]="{ minWidth: '144px', maxWidth: '144px', width: '144px', textAlign: 'center'}">
{{ 'gateway.connectors-table-actions' | translate }} {{ 'gateway.connectors-table-actions' | translate }}
</mat-header-cell> </mat-header-cell>
<mat-cell *matCellDef="let attribute" <mat-cell *matCellDef="let attribute"

7
ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.scss
View File

@ -30,6 +30,13 @@
flex-direction: column; flex-direction: column;
} }
& > section:not(.table-section) {
max-width: unset;
@media #{$mat-gt-md} {
max-width: 50%;
}
}
.table-section { .table-section {
min-height: 35vh; min-height: 35vh;
overflow: hidden; overflow: hidden;

1
ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts
View File

@ -381,6 +381,7 @@ export class GatewayConnectorComponent extends PageComponent implements AfterVie
if ($event) { if ($event) {
$event.stopPropagation(); $event.stopPropagation();
} }
this.initialConnector = attribute.value;
const title = `Delete connector ${attribute.key}?`; const title = `Delete connector ${attribute.key}?`;
const content = `All connector data will be deleted.`; const content = `All connector data will be deleted.`;
this.dialogService.confirm(title, content, 'Cancel', 'Delete').subscribe(result => { this.dialogService.confirm(title, content, 'Cancel', 'Delete').subscribe(result => {

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

@ -52,6 +52,7 @@
width: 100%; width: 100%;
min-width: 200px; min-width: 200px;
height: 100%; height: 100%;
min-height: 300px;
&:not(.fill-height) { &:not(.fill-height) {
min-height: 200px; min-height: 200px;