@flexem/fc-gui 3.0.0-alpha.118 → 3.0.0-alpha.119

package/communication/variable/variable-value.d.ts

@@ -6,5 +6,6 @@ export declare class VariableValue {
     readonly timeStamp?: string;
     systemName?: string;
     customStatus?: string;
-    constructor(variableName: string, state: VariableStateEnum, value?: any, timeStamp?: string, systemName?: string, customStatus?: string);
+    virtualDeviceId?: number;
+    constructor(variableName: string, state: VariableStateEnum, value?: any, timeStamp?: string, systemName?: string, customStatus?: string, virtualDeviceId?: number);
 }

package/communication/variable/variable-value.js

@@ -1,10 +1,11 @@
 export class VariableValue {
-    constructor(variableName, state, value, timeStamp, systemName, customStatus) {
+    constructor(variableName, state, value, timeStamp, systemName, customStatus, virtualDeviceId) {
         this.variableName = variableName;
         this.state = state;
         this.value = value;
         this.timeStamp = timeStamp;
         this.systemName = systemName;
         this.customStatus = customStatus;
+        this.virtualDeviceId = virtualDeviceId;
     }
 }

package/communication/variable/variable-value.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"VariableValue":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"./variable-state-enum","name":"VariableStateEnum","line":3,"character":68},{"__symbolic":"reference","name":"any"},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","name":"string"}]}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"VariableValue":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"./variable-state-enum","name":"VariableStateEnum","line":3,"character":68},{"__symbolic":"reference","name":"any"},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","name":"number"}]}]}}}}]

package/elements/base/readable-element.js

@@ -74,14 +74,14 @@ export class ReadableElement extends ConditionalEnableElement {
     reportValueChanged(value) {
         var _a, _b, _c, _d;
         forEach(this.elementStates, elementState => {
-            if (elementState.variableName === value.variableName || elementState.variableName === value.systemName) {
+            if (elementState.variableName === value.variableName) {
                 elementState.state = value.state;
                 this.changeStates();
             }
         });
-        if (this.state === State.Normal || this.state === State.Disable
+        if (value.systemName !== '设备状态' && (this.state === State.Normal || this.state === State.Disable
             || value.variableName === this.minVariableName
-            || value.variableName === this.maxVariableName) {
+            || value.variableName === this.maxVariableName)) {
             this.updateVariableValue(value.value, value.variableName);
         }
         if (value.systemName === '设备状态') {

package/elements/base/state-control-element.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="jquery" />
+/// <reference types="jqueryui" />
 import { PermissionChecker } from '../../service';
 import { Localization } from '../../localization';
 import { VariableCommunicator, VariableState } from '../../communication';
@@ -9,7 +11,7 @@ export declare abstract class StateControlElement extends ConditionalDynamicDisp
     isEnable: boolean;
     elementStates: VariableState[];
     state: State;
-    private currentRect;
+    currentRect: JQuery;
     preState: State;
     constructor(element: HTMLElement, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, localization: Localization, signalRAppId: string);
     initState(): void;

package/elements/main-element.d.ts

@@ -37,6 +37,7 @@ export declare class MainElement {
     initElementState(): void;
     getVariableNames(): Array<string>;
     reportVariableStates(states: VariableState[]): void;
+    getVirtualDeviceIdFromRect(rectElement: any): any;
     reportVariableValues(values: VariableValue[]): void;
     dispose(): void;
     private checkIsLoaded;

package/elements/main-element.js

@@ -257,15 +257,39 @@ export class MainElement {
             });
         });
     }
+    getVirtualDeviceIdFromRect(rectElement) {
+        let current = rectElement;
+        while (current) {
+            if (current.tagName === 'FC-GUI') {
+                const virtualDeviceId = current.getAttribute('data-virtual-device-id');
+                return virtualDeviceId || null;
+            }
+            current = current.parentElement;
+        }
+        return null;
+    }
     reportVariableValues(values) {
         this.checkIsLoaded();
         each(values, value => {
             each(this.elements, e => {
+                var _a;
                 if (e instanceof ReadableElement) {
                     if ((value.variableName && (e.readVariableName === value.variableName ||
-                        e.minVariableName === value.variableName || e.maxVariableName === value.variableName)) || e.readVariableName === value.systemName) {
+                        e.minVariableName === value.variableName || e.maxVariableName === value.variableName))) {
                         e.reportValueChanged(value);
                     }
+                    if (e.readVariableName === value.systemName) {
+                        const rect = (_a = e.currentRect) === null || _a === void 0 ? void 0 : _a[0];
+                        const deviceId = this.getVirtualDeviceIdFromRect(rect);
+                        if (deviceId) {
+                            if (+deviceId === value.virtualDeviceId) {
+                                e.reportValueChanged(value);
+                            }
+                        }
+                        else {
+                            e.reportValueChanged(value);
+                        }
+                    }
                 }
             });
         });

package/elements/main-element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"MainElement":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":55,"character":43},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":56,"character":41},{"__symbolic":"reference","module":"../gui/gui-context","name":"GuiContext","line":57,"character":34},{"__symbolic":"reference","module":"../communication","name":"VariableCommunicator","line":58,"character":47},{"__symbolic":"reference","module":"../view/popup-view.service","name":"PopupViewService","line":59,"character":43},null]}],"load":[{"__symbolic":"method"}],"uniformStretch":[{"__symbolic":"method"}],"changeVideoStyle":[{"__symbolic":"method"}],"horizontalStretch":[{"__symbolic":"method"}],"initElementState":[{"__symbolic":"method"}],"getVariableNames":[{"__symbolic":"method"}],"reportVariableStates":[{"__symbolic":"method"}],"reportVariableValues":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}],"checkIsLoaded":[{"__symbolic":"method"}],"initBackground":[{"__symbolic":"method"}],"getImageEl":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"MainElement":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":55,"character":43},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":56,"character":41},{"__symbolic":"reference","module":"../gui/gui-context","name":"GuiContext","line":57,"character":34},{"__symbolic":"reference","module":"../communication","name":"VariableCommunicator","line":58,"character":47},{"__symbolic":"reference","module":"../view/popup-view.service","name":"PopupViewService","line":59,"character":43},null]}],"load":[{"__symbolic":"method"}],"uniformStretch":[{"__symbolic":"method"}],"changeVideoStyle":[{"__symbolic":"method"}],"horizontalStretch":[{"__symbolic":"method"}],"initElementState":[{"__symbolic":"method"}],"getVariableNames":[{"__symbolic":"method"}],"reportVariableStates":[{"__symbolic":"method"}],"getVirtualDeviceIdFromRect":[{"__symbolic":"method"}],"reportVariableValues":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}],"checkIsLoaded":[{"__symbolic":"method"}],"initBackground":[{"__symbolic":"method"}],"getImageEl":[{"__symbolic":"method"}]}}}}]

package/package.json

@@ -1,6 +1,6 @@
 {
 	"main": "bundles/fc-gui.umd.js",
-	"version": "3.0.0-alpha.118",
+	"version": "3.0.0-alpha.119",
 	"module": "public_api.js",
 	"typings": "public_api.d.ts",
 	"license": "UNLICENSED",