@flexem/fc-gui 3.0.0-alpha.114 → 3.0.0-alpha.115

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

@@ -21868,11 +21868,13 @@ var variable_communicator = __webpack_require__(262);
 
 // CONCATENATED MODULE: ./.tmp/communication/variable/variable-value.ts
 class VariableValue {
-    constructor(variableName, state, value, timeStamp) {
+    constructor(variableName, state, value, timeStamp, systemName, customStatus) {
         this.variableName = variableName;
         this.state = state;
         this.value = value;
         this.timeStamp = timeStamp;
+        this.systemName = systemName;
+        this.customStatus = customStatus;
     }
 }
 
@@ -35094,6 +35096,9 @@ class state_control_element_StateControlElement extends conditional_dynamic_disp
         if (!this.currentRect.length) {
             return;
         }
+        // 元件绑定设备状态时不需要在右上角显示状态
+        if (this.$element[0].dataset.model.includes('设备状态'))
+            return;
         const document = this.$element[0].ownerDocument;
         const imgObj = document.createElementNS('http://www.w3.org/2000/svg', 'image');
         if (imgObj) {
@@ -35312,7 +35317,7 @@ class readable_element_ReadableElement extends conditional_enable_element_Condit
     }
     reportValueChanged(value) {
         Object(lodash["forEach"])(this.elementStates, elementState => {
-            if (elementState.variableName === value.variableName) {
+            if (elementState.variableName === value.variableName || elementState.variableName === value.systemName) {
                 elementState.state = value.state;
                 this.changeStates();
             }
@@ -35322,6 +35327,9 @@ class readable_element_ReadableElement extends conditional_enable_element_Condit
             || value.variableName === this.maxVariableName) {
             this.updateVariableValue(value.value, value.variableName);
         }
+        if (value.systemName === '设备状态') {
+            this.updateVariableValue(value.customStatus, '设备状态');
+        }
     }
 }
 
@@ -41588,7 +41596,8 @@ class main_element_MainElement {
         Object(lodash["each"])(values, value => {
             Object(lodash["each"])(this.elements, e => {
                 if (e instanceof readable_element_ReadableElement) {
-                    if (e.readVariableName === value.variableName || e.minVariableName === value.variableName || e.maxVariableName === value.variableName) {
+                    if ((value.variableName && (e.readVariableName === value.variableName ||
+                        e.minVariableName === value.variableName || e.maxVariableName === value.variableName)) || e.readVariableName === value.systemName) {
                         e.reportValueChanged(value);
                     }
                 }
@@ -41689,6 +41698,9 @@ class per_view_variable_communicator_PerViewVariableCommunicator {
     writeWordByBit(variableName, index, value) {
         return this._rawVariableCommunicator.writeWordByBit(variableName, index, value);
     }
+    requestVirtualDeviceState() {
+        return this._rawVariableCommunicator.requestVirtualDeviceState();
+    }
     subscribeVariableState(variableName) {
         return this.subscribeVariableStates([variableName]).pipe(Object(operators_["map"])(values => values[0]));
     }
@@ -41787,22 +41799,57 @@ class gui_view_GuiView {
             this.openVariableStatesSubscription.unsubscribe();
         }
         this.openedVariableNames = this.mainElement.getVariableNames();
-        if (this.openedVariableNames.length === 0) {
-            return;
+        if (this.openedVariableNames.indexOf('设备状态') !== -1) {
+            if (this.requestVirtualDeviceState) {
+                this.requestVirtualDeviceState.unsubscribe();
+            }
+            if (this.requestVirtualDeviceState) {
+                this.requestVirtualDeviceState.unsubscribe();
+            }
+            if (this.openedVariableNames.length === 1) {
+                this.normalOpenedVariableNames(['设备状态']);
+                this.requestVirtualDeviceState =
+                    this.perViewVariableCommunicator.requestVirtualDeviceState().subscribe({
+                        complete: () => { }
+                    });
+            }
+            else {
+                this.openVariableStatesSubscription =
+                    this.perViewVariableCommunicator.subscribeVariableStates(this.openedVariableNames).subscribe((states) => {
+                        this.mainElement.reportVariableStates(states);
+                        const normalVariableNames = [];
+                        Object(lodash["each"])(states, v => {
+                            if (v.state === communication["d" /* VariableStateEnum */].Normal && normalVariableNames.indexOf(v.variableName) === -1) {
+                                normalVariableNames.push(v.variableName);
+                            }
+                        });
+                        normalVariableNames.push('设备状态');
+                        this.normalOpenedVariableNames(normalVariableNames);
+                        this.requestVirtualDeviceState =
+                            this.perViewVariableCommunicator.requestVirtualDeviceState().subscribe({
+                                complete: () => { }
+                            });
+                    });
+            }
         }
-        this.openVariableStatesSubscription =
-            this.perViewVariableCommunicator.subscribeVariableStates(this.openedVariableNames).subscribe((states) => {
-                this.mainElement.reportVariableStates(states);
-                const normalVariableNames = [];
-                Object(lodash["each"])(states, v => {
-                    if (v.state === communication["d" /* VariableStateEnum */].Normal && normalVariableNames.indexOf(v.variableName) === -1) {
-                        normalVariableNames.push(v.variableName);
+        else {
+            if (this.openedVariableNames.length === 0) {
+                return;
+            }
+            this.openVariableStatesSubscription =
+                this.perViewVariableCommunicator.subscribeVariableStates(this.openedVariableNames).subscribe((states) => {
+                    this.mainElement.reportVariableStates(states);
+                    const normalVariableNames = [];
+                    Object(lodash["each"])(states, v => {
+                        if (v.state === communication["d" /* VariableStateEnum */].Normal && normalVariableNames.indexOf(v.variableName) === -1) {
+                            normalVariableNames.push(v.variableName);
+                        }
+                    });
+                    if (normalVariableNames.length > 0) {
+                        this.normalOpenedVariableNames(normalVariableNames);
                     }
                 });
-                if (normalVariableNames.length > 0) {
-                    this.normalOpenedVariableNames(normalVariableNames);
-                }
-            });
+        }
     }
     popView(viewIndex, hostContainerId, el) {
         return this.context.configStore.viewStore.getViewConfig(viewIndex).pipe(Object(operators_["map"])(view => {
@@ -41896,6 +41943,12 @@ class gui_view_GuiView {
         if (this.openVariableStatesSubscription) {
             this.openVariableStatesSubscription.unsubscribe();
         }
+        if (this.requestVirtualDeviceState) {
+            this.requestVirtualDeviceState.unsubscribe();
+        }
+        if (this.virtualDeviceStatesChanged) {
+            this.virtualDeviceStatesChanged.unsubscribe();
+        }
         if (this.openVariablesSubscription) {
             this.openVariablesSubscription.unsubscribe();
         }
@@ -64214,6 +64267,7 @@ class remote_variable_communicator_RemoteVariableCommunicator {
         });
         this.doVariableStatesChanged();
         this.doVariableValuesChanged();
+        this.doVirtualDeviceStatesChanged();
         this.doAlarmChanged();
     }
     doAlarmChanged() {
@@ -64244,6 +64298,25 @@ class remote_variable_communicator_RemoteVariableCommunicator {
                 });
             });
     }
+    doVirtualDeviceStatesChanged() {
+        if (this.virtualDeviceStatesChangedSubscription !== undefined) {
+            this.virtualDeviceStatesChangedSubscription.unsubscribe();
+        }
+        this.virtualDeviceStatesChangedSubscription =
+            this.remoteVariableProtocol.virtualDeviceStatesChanged.subscribe((deviceStates) => {
+                Object(lodash["each"])(deviceStates, deviceState => {
+                    const variableName = '设备状态';
+                    this.variableValueCache.set(variableName, deviceState);
+                    const data = Object.assign(Object.assign({}, deviceState), { systemName: '设备状态' });
+                    if (this.observers.has(variableName)) {
+                        Object(lodash["each"])(this.observers.get(variableName), ob => {
+                            // TODO 同一个ob监听多个变量的情况，组合成数组一次推送。
+                            ob.next([data]);
+                        });
+                    }
+                });
+            });
+    }
     doVariableStatesChanged() {
         if (this.variableStatesChangedSubscription !== undefined) {
             this.variableStatesChangedSubscription.unsubscribe();
@@ -64317,6 +64390,9 @@ class remote_variable_communicator_RemoteVariableCommunicator {
     subscribeVariableState(variableName) {
         return this.subscribeVariableStates([variableName]).pipe(Object(operators_["map"])(values => values[0]));
     }
+    requestVirtualDeviceState() {
+        return this.remoteVariableProtocol.requestVirtualDeviceState();
+    }
     openVariables(variableNames, appId = '') {
         return new Observable["a" /* Observable */](observer => {
             let variablesToStart = [];
@@ -64419,6 +64495,7 @@ class remote_variable_communicator_RemoteVariableCommunicator {
         this.connectedSubscription.unsubscribe();
         this.variableStatesChangedSubscription.unsubscribe();
         this.variableValuesChangedSubscription.unsubscribe();
+        this.virtualDeviceStatesChangedSubscription.unsubscribe();
         this.alarmChangedSubscription.unsubscribe();
         if (this.logger && this.logger.isDebugEnabled()) {
             this.logger.debug('[VariableCommunicator] RemoteVariableCommunicator disposed.');