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

package/bundles/@flexem/fc-gui.umd.js

@@ -21868,13 +21868,14 @@ var variable_communicator = __webpack_require__(262);
 
 // CONCATENATED MODULE: ./.tmp/communication/variable/variable-value.ts
 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;
     }
 }
 
@@ -35318,14 +35319,14 @@ class readable_element_ReadableElement extends conditional_enable_element_Condit
     reportValueChanged(value) {
         var _a, _b, _c, _d;
         Object(lodash["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 === _tmp_model["State"].Normal || this.state === _tmp_model["State"].Disable
+        if (value.systemName !== '设备状态' && (this.state === _tmp_model["State"].Normal || this.state === _tmp_model["State"].Disable
             || value.variableName === this.minVariableName
-            || value.variableName === this.maxVariableName) {
+            || value.variableName === this.maxVariableName)) {
             this.updateVariableValue(value.value, value.variableName);
         }
         if (value.systemName === '设备状态') {
@@ -41590,15 +41591,39 @@ class main_element_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();
         Object(lodash["each"])(values, value => {
             Object(lodash["each"])(this.elements, e => {
+                var _a;
                 if (e instanceof readable_element_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);
+                        }
+                    }
                 }
             });
         });