Skip to content

Commit a5ea257

Browse files
committed
feat: add settings for update unchanged value of input control
1 parent 1a15c85 commit a5ea257

File tree

9 files changed

+14
-7
lines changed

9 files changed

+14
-7
lines changed

client/dist/assets/i18n/en.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,6 +1015,7 @@
10151015
"gauges.property-input-convertion-string": "String",
10161016

10171017
"gauges.property-update-enabled": "Enable update",
1018+
"gauges.property-update-esc": "ESC update",
10181019
"gauges.property-numeric-enabled": "Only number",
10191020
"gauges.property-format-digits": "Format digits",
10201021
"gauges.property-actions": "Actions",

client/dist/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@
4545
</div>
4646
</div>
4747
</app-root>
48-
<script src="runtime.8ef63094e52a66ba.js" type="module"></script><script src="polyfills.df504f67f09f2fbb.js" type="module"></script><script src="scripts.a58f5e48421f8dfe.js" defer></script><script src="main.31c1a59234bccc85.js" type="module"></script>
48+
<script src="runtime.8ef63094e52a66ba.js" type="module"></script><script src="polyfills.df504f67f09f2fbb.js" type="module"></script><script src="scripts.a58f5e48421f8dfe.js" defer></script><script src="main.d6332707faffb399.js" type="module"></script>
4949

5050
</body></html>

client/dist/main.31c1a59234bccc85.js renamed to client/dist/main.d6332707faffb399.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "fuxa",
3-
"version": "1.2.0-1813",
3+
"version": "1.2.0-1814",
44
"keywords": [],
55
"author": "frangoteam <[email protected]>",
66
"description": "Web-based Process Visualization (SCADA/HMI/Dashboard) software",

client/src/app/_models/hmi.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ export interface InputOptionsProperty {
212212
type?: InputOptionType;
213213
timeformat?: InputTimeFormatType;
214214
convertion?: InputConvertionType;
215+
updatedEsc?: boolean;
215216
}
216217

217218
export enum InputOptionType {

client/src/app/fuxa-view/fuxa-view.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ export class FuxaViewComponent implements OnInit, AfterViewInit, OnDestroy {
599599
}
600600

601601
private checkRestoreValue(htmlevent: Event) {
602-
if (htmlevent.ga?.property?.options?.updated) {
602+
if (htmlevent.ga?.property?.options?.updated && htmlevent.ga.property.options.updatedEsc) {
603603
//ToDo there is definitely a better way
604604
setTimeout(() => {
605605
const gaugeStatus = this.getGaugeStatus(htmlevent.ga);

client/src/app/gauges/gauge-property/flex-input/flex-input.component.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,10 @@
105105
<span>{{'gauges.property-update-enabled' | translate}}</span>
106106
<mat-slide-toggle color="primary" [(ngModel)]="property.options.updated" class="ml20"></mat-slide-toggle>
107107
</div>
108+
<div class="my-form-field ml20">
109+
<span>{{'gauges.property-update-esc' | translate}}</span>
110+
<mat-slide-toggle color="primary" [(ngModel)]="property.options.updatedEsc" [disabled]="!property.options.updated" class="ml20"></mat-slide-toggle>
111+
</div>
108112
<div class="my-form-field ml30" style="width: 140px;">
109113
<span>{{'gauges.property-input-type' | translate}}</span>
110114
<mat-select [(ngModel)]="property.options.type" (selectionChange)="onTypeChange($event)">

client/src/assets/i18n/en.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,6 +1015,7 @@
10151015
"gauges.property-input-convertion-string": "String",
10161016

10171017
"gauges.property-update-enabled": "Enable update",
1018+
"gauges.property-update-esc": "ESC update",
10181019
"gauges.property-numeric-enabled": "Only number",
10191020
"gauges.property-format-digits": "Format digits",
10201021
"gauges.property-actions": "Actions",

server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "fuxa-server",
3-
"version": "1.2.0-1813",
3+
"version": "1.2.0-1814",
44
"description": "Web-based Process Visualization (SCADA/HMI/Dashboard) software",
55
"main": "main.js",
66
"scripts": {

0 commit comments

Comments
 (0)