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

UI: Fixed advanced settings style in Save ts rule node config

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2025-01-23 17:01:21 +02:00
parent 80593f4b52
commit e8dbe56219
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui-ngx/src/app/modules/home/components/rule-node/action/timeseries-config.component.html
View File

@ -57,7 +57,7 @@
></tb-advanced-persistence-settings> ></tb-advanced-persistence-settings>
} }
</div> </div>
<section class="tb-form-panel stroked no-padding-bottom"> <section class="tb-form-panel stroked">
<mat-expansion-panel class="tb-settings"> <mat-expansion-panel class="tb-settings">
<mat-expansion-panel-header> <mat-expansion-panel-header>
<mat-panel-title translate>rule-node-config.advanced-settings</mat-panel-title> <mat-panel-title translate>rule-node-config.advanced-settings</mat-panel-title>
@ -71,6 +71,7 @@
</div> </div>
<tb-time-unit-input <tb-time-unit-input
required required
subscriptSizing="dynamic"
labelText="{{ 'rule-node-config.default-ttl' | translate }}" labelText="{{ 'rule-node-config.default-ttl' | translate }}"
requiredText="{{ 'rule-node-config.default-ttl-required' | translate }}" requiredText="{{ 'rule-node-config.default-ttl-required' | translate }}"
minErrorText="{{ 'rule-node-config.min-default-ttl-message' | translate }}" minErrorText="{{ 'rule-node-config.min-default-ttl-message' | translate }}"

4
ui-ngx/src/app/modules/home/components/rule-node/common/time-unit-input.component.html
View File

@ -22,7 +22,7 @@
<div matSuffix> <div matSuffix>
<ng-content select="[matSuffix]"></ng-content> <ng-content select="[matSuffix]"></ng-content>
</div> </div>
<mat-hint></mat-hint> <mat-hint *ngIf="subscriptSizing === 'fixed'"></mat-hint>
<mat-error *ngIf="timeInputForm.get('time').hasError('required') && requiredText"> <mat-error *ngIf="timeInputForm.get('time').hasError('required') && requiredText">
{{ requiredText }} {{ requiredText }}
</mat-error> </mat-error>
@ -33,7 +33,7 @@
{{ maxErrorText }} {{ maxErrorText }}
</mat-error> </mat-error>
</mat-form-field> </mat-form-field>
<mat-form-field class="h-fit max-w-33% flex-full"> <mat-form-field class="h-fit max-w-33% flex-full" [subscriptSizing]="subscriptSizing">
<mat-label translate>rule-node-config.units</mat-label> <mat-label translate>rule-node-config.units</mat-label>
<mat-select formControlName="timeUnit"> <mat-select formControlName="timeUnit">
@for (timeUnit of timeUnits; track timeUnit) { @for (timeUnit of timeUnits; track timeUnit) {

4
ui-ngx/src/app/modules/home/components/rule-node/common/time-unit-input.component.ts
View File

@ -30,6 +30,7 @@ import { isDefinedAndNotNull, isNumeric } from '@core/utils';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { coerceBoolean, coerceNumber } from '@shared/decorators/coercion'; import { coerceBoolean, coerceNumber } from '@shared/decorators/coercion';
import { DAY, HOUR, MINUTE, SECOND } from '@shared/models/time/time.models'; import { DAY, HOUR, MINUTE, SECOND } from '@shared/models/time/time.models';
import { SubscriptSizing } from '@angular/material/form-field';
interface TimeUnitInputModel { interface TimeUnitInputModel {
time: number; time: number;
@ -75,6 +76,9 @@ export class TimeUnitInputComponent implements ControlValueAccessor, Validator,
@Input() @Input()
maxErrorText: string; maxErrorText: string;
@Input()
subscriptSizing: SubscriptSizing = 'fixed';
timeUnits = Object.values(TimeUnit).filter(item => item !== TimeUnit.MILLISECONDS) as TimeUnit[]; timeUnits = Object.values(TimeUnit).filter(item => item !== TimeUnit.MILLISECONDS) as TimeUnit[];
timeUnitTranslations = timeUnitTranslations; timeUnitTranslations = timeUnitTranslations;