@flexem/fc-gui 3.0.0-alpha.71 → 3.0.0-alpha.73

package/CHANGELOG.md

@@ -309,4 +309,14 @@
 ## 3.0.0-alpha.71(2023-03-10)
 ### Web端
 #### Bug Fix
-    1. FLEXCLOUD-2525 告警表恢复第一页的告警，第二页的告警未更新到第一页
+    1. FLEXCLOUD-2525 告警表恢复第一页的告警，第二页的告警未更新到第一页
+
+## 3.0.0-alpha.72(2023-03-13)
+### Web端
+#### Bug Fix
+    1. 修改设备告警的订阅事件
+
+## 3.0.0-alpha.73(2023-03-13)
+### Web端
+#### Bug Fix
+    1. 解决当前告警当第二页的报警恢复后，无告警时，翻页未自动翻到第一页的问题

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

@@ -40032,7 +40032,6 @@ C140,111.8,99.2,158.4,78,178.6z M78,40.4c-17.8,0-32.4,14.4-32.4,32.2s14.5,32.2,3
 
 
 
-
 class alarm_element_AlarmElement extends conditional_display_element_ConditionalDisplayElement {
     constructor(element, injector, permissionChecker, variableCommunicator, variableStore, alarmsStore, signalRAppId) {
         var _a;
@@ -40074,15 +40073,13 @@ class alarm_element_AlarmElement extends conditional_display_element_Conditional
                 }, this.model.filterSetting.refreshCycle * 60 * 1000);
             }
             else {
-                variableCommunicator.subscribeUserDeviceAlarms(signalRAppId).subscribe(alarmWithAppId => {
-                    if (alarmWithAppId.appId !== this.signalRAppId) {
-                        return;
-                    }
-                    const alarm = alarmWithAppId.alarm;
-                    if (!Object(lodash["find"])(this.alarmNames, itemName => itemName === alarm.name)) {
-                        return;
-                    }
-                    this.init();
+                variableCommunicator.subscribeUserDeviceAlarms(signalRAppId).subscribe(alarms => {
+                    alarms.forEach(alarm => {
+                        if (this.alarmNames.indexOf(alarm.name) !== -1) {
+                            this.init();
+                            return;
+                        }
+                    });
                 });
             }
             this.init();
@@ -40136,6 +40133,11 @@ class alarm_element_AlarmElement extends conditional_display_element_Conditional
                     if (!result.error) {
                         this.totalCount = result.totalCount;
                         this.currentAlarmList = result.items;
+                        if (!result.items.length && result.totalCount) {
+                            this.page = 0;
+                            this.init();
+                            return;
+                        }
                         this.alarmList = this.currentAlarmList.map(item => [
                             item.name,
                             item.message,
@@ -63173,9 +63175,9 @@ class remote_variable_communicator_RemoteVariableCommunicator {
         if (this.alarmChangedSubscription !== undefined) {
             this.alarmChangedSubscription.unsubscribe();
         }
-        this.alarmChangedSubscription = this.remoteVariableProtocol.historyAlarmChanged.subscribe((alarmWithAppId) => {
+        this.alarmChangedSubscription = this.remoteVariableProtocol.virtualDeviceAlarmsChanged.subscribe((alarms) => {
             Object(lodash["each"])(this.alarmObservers, ob => {
-                ob.next(alarmWithAppId);
+                ob.next(alarms);
             });
         });
     }
@@ -63361,9 +63363,9 @@ class remote_variable_communicator_RemoteVariableCommunicator {
     subscribeUserDeviceAlarms(appId = '') {
         return new Observable["a" /* Observable */](observer => {
             this.alarmObservers.push(observer);
-            this.remoteVariableProtocol.subscribeUserDeviceAlarms(appId);
+            this.remoteVariableProtocol.subscribeVirtualDeviceAlarms(appId);
             return () => {
-                this.remoteVariableProtocol.unSubscribeUserDeviceAlarms(appId);
+                this.remoteVariableProtocol.unsubscribeVirtualDeviceAlarms(appId);
             };
         });
     }