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

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

@@ -35316,6 +35316,7 @@ 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) {
                 elementState.state = value.state;
@@ -35328,7 +35329,27 @@ class readable_element_ReadableElement extends conditional_enable_element_Condit
             this.updateVariableValue(value.value, value.variableName);
         }
         if (value.systemName === '设备状态') {
-            this.updateVariableValue(value.customStatus, '设备状态');
+            let name = value.customStatus;
+            const language = ((_b = (_a = window.abp.localization) === null || _a === void 0 ? void 0 : _a.currentCulture) === null || _b === void 0 ? void 0 : _b.name) || ((_d = (_c = this.localization.localizationService) === null || _c === void 0 ? void 0 : _c.translate) === null || _d === void 0 ? void 0 : _d.currentLang);
+            const isChinese = language === 'zh-Hans' || language === 'zh';
+            if (!name) {
+                switch (value.state) {
+                    case 1:
+                        name = isChinese ? '在线' : 'Online';
+                        break;
+                    case 3:
+                        name = isChinese ? '离线' : 'Offline';
+                        break;
+                    case 4:
+                        name = isChinese ? '告警' : 'Alarming';
+                        break;
+                    case 5:
+                        name = isChinese ? '未绑定' : 'Unbound';
+                        break;
+                    default:
+                }
+            }
+            this.updateVariableValue(name, '设备状态');
         }
     }
 }
@@ -41806,50 +41827,29 @@ class gui_view_GuiView {
             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.normalOpenedVariableNames(['设备状态']);
+            this.requestVirtualDeviceState =
+                this.perViewVariableCommunicator.requestVirtualDeviceState().subscribe({
+                    complete: () => { }
+                });
+            this.openedVariableNames = this.openedVariableNames.filter(name => name !== '设备状态');
         }
-        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 (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);
+                }
+            });
     }
     popView(viewIndex, hostContainerId, el) {
         return this.context.configStore.viewStore.getViewConfig(viewIndex).pipe(Object(operators_["map"])(view => {