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

Changed UI of timeWindow

Browse Source
This commit is contained in:
mpetrov 2025-01-31 18:01:28 +02:00
parent ff8a9309f4
commit 14feedbfa0
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ui-ngx/src/app/modules/home/components/calculated-fields/components/panel/calculated-field-argument-panel.component.html
View File

@ -168,22 +168,20 @@
</div> </div>
</div> </div>
} @else { } @else {
<div class="tb-form-row"> <div class="tb-form-panel stroked">
<div class="fixed-title-width">{{ 'calculated-fields.time-window' | translate }}</div> <div class="tb-form-panel-title">{{ 'calculated-fields.time-window' | translate }}</div>
<div class="tb-flex no-gap"> <div class="tb-form-row no-border">
<mat-form-field class="tb-flex no-gap" appearance="outline" subscriptSizing="dynamic"> <tb-timeinterval
<input matInput type="number" min="0" name="value" formControlName="timeWindow" placeholder="{{ 'action.set' | translate }}"/> subscriptSizing="dynamic"
<span class="block pr-2" matSuffix>{{ 'common.suffix.ms' | translate }}</span> appearance="outline"
</mat-form-field> class="w-full"
formControlName="timeWindow"
/>
</div> </div>
</div> </div>
<div class="tb-form-row"> <div class="tb-form-row">
<div class="fixed-title-width">{{ 'calculated-fields.limit' | translate }}</div> <div class="fixed-title-width">{{ 'calculated-fields.limit' | translate }}</div>
<div class="tb-flex no-gap"> <tb-datapoints-limit class="w-full" formControlName="limit"/>
<mat-form-field class="tb-flex no-gap" appearance="outline" subscriptSizing="dynamic">
<input matInput type="number" min="0" name="value" formControlName="limit" placeholder="{{ 'action.set' | translate }}"/>
</mat-form-field>
</div>
</div> </div>
} }
</div> </div>

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

@ -36,6 +36,7 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { EntityFilter } from '@shared/models/query/query.models'; import { EntityFilter } from '@shared/models/query/query.models';
import { AliasFilterType } from '@shared/models/alias.models'; import { AliasFilterType } from '@shared/models/alias.models';
import { merge } from 'rxjs'; import { merge } from 'rxjs';
import { MINUTE } from '@shared/models/time/time.models';
@Component({ @Component({
selector: 'tb-calculated-field-argument-panel', selector: 'tb-calculated-field-argument-panel',
@ -68,8 +69,8 @@ export class CalculatedFieldArgumentPanelComponent extends PageComponent impleme
scope: [{ value: AttributeScope.SERVER_SCOPE, disabled: true }], scope: [{ value: AttributeScope.SERVER_SCOPE, disabled: true }],
}), }),
defaultValue: ['', [Validators.pattern(noLeadTrailSpacesRegex)]], defaultValue: ['', [Validators.pattern(noLeadTrailSpacesRegex)]],
limit: [null], limit: [10],
timeWindow: [null], timeWindow: [MINUTE * 15],
}); });
argumentTypes: ArgumentType[]; argumentTypes: ArgumentType[];

2
ui-ngx/src/assets/locale/locale.constant-en_US.json
View File

@ -1037,7 +1037,7 @@
"shared-attributes": "Shared attributes", "shared-attributes": "Shared attributes",
"attribute-key": "Attribute key", "attribute-key": "Attribute key",
"default-value": "Default value", "default-value": "Default value",
"limit": "Limit", "limit": "Max values",
"time-window": "Time window", "time-window": "Time window",
"customer-name": "Customer name", "customer-name": "Customer name",
"timeseries": "Time series", "timeseries": "Time series",