@flexem/fc-gui 3.0.0-alpha.70 → 3.0.0-alpha.72

package/CHANGELOG.md

@@ -304,4 +304,14 @@
 ### Web端
 #### Bug Fix
     1. FLEXCLOUD-2520 刷新周期未生效
-    2. FLEXCLOUD-2521【云组态】告警表修改告警名称、告警分组、删除告警后，再次配置告警表时，应提示用户“至少选择一个告警”
+    2. FLEXCLOUD-2521【云组态】告警表修改告警名称、告警分组、删除告警后，再次配置告警表时，应提示用户“至少选择一个告警”
+
+## 3.0.0-alpha.71(2023-03-10)
+### Web端
+#### Bug Fix
+    1. FLEXCLOUD-2525 告警表恢复第一页的告警，第二页的告警未更新到第一页
+
+## 3.0.0-alpha.72(2023-03-13)
+### Web端
+#### Bug Fix
+    1. 修改设备告警的订阅事件

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

@@ -40025,13 +40025,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
     }
 }
 
-// CONCATENATED MODULE: ./.tmp/elements/alarm/alarm-state-enum.ts
-var AlarmState;
-(function (AlarmState) {
-    AlarmState[AlarmState["AlarmStateTriggered"] = 1] = "AlarmStateTriggered";
-    AlarmState[AlarmState["AlarmStateRecovered"] = 0] = "AlarmStateRecovered";
-})(AlarmState || (AlarmState = {}));
-
 // CONCATENATED MODULE: ./.tmp/elements/alarm/alarm-element.ts
 
 
@@ -40039,8 +40032,6 @@ var AlarmState;
 
 
 
-
-
 class alarm_element_AlarmElement extends conditional_display_element_ConditionalDisplayElement {
     constructor(element, injector, permissionChecker, variableCommunicator, variableStore, alarmsStore, signalRAppId) {
         var _a;
@@ -40082,40 +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;
-                    }
-                    const currentAlarm = this.currentAlarmList.find(re => re.name === alarm.name);
-                    if (alarm.state === AlarmState.AlarmStateTriggered.valueOf()) {
-                        if (!Object(lodash["isNil"])(currentAlarm)) {
-                            return;
-                        }
-                        Object(lodash["pull"])(this.currentAlarmList, this.currentAlarmList.find(record => alarm.name === record.name));
-                        this.currentAlarmList.unshift(alarm);
-                        this.totalCount += 1;
-                    }
-                    else {
-                        if (Object(lodash["isNil"])(currentAlarm)) {
+                variableCommunicator.subscribeUserDeviceAlarms(signalRAppId).subscribe(alarms => {
+                    alarms.forEach(alarm => {
+                        if (this.alarmNames.indexOf(alarm.name) !== -1) {
+                            this.init();
                             return;
                         }
-                        Object(lodash["remove"])(this.currentAlarmList, currentAlarm);
-                        this.totalCount -= 1;
-                    }
-                    this.alarmList = [];
-                    this.currentAlarmList.forEach(item => {
-                        this.alarmList.push([
-                            item.name,
-                            item.message,
-                            item.alarmLevel,
-                            moment(item.triggeredTime).format('YYYY-MM-DD HH:mm:ss')
-                        ]);
                     });
-                    this.renderElement();
                 });
             }
             this.init();
@@ -40145,38 +40109,41 @@ class alarm_element_AlarmElement extends conditional_display_element_Conditional
         return timePeriods;
     }
     init() {
-        if (this.model.filterSetting.alarmType) {
-            this.updateQueryTimeRange();
-            const input = new _tmp_config["c" /* GetAlarmsArgs */](this.alarmNames, this.startTime, this.endTime, this.pageSize, this.page * this.pageSize);
-            this.alarmsStore.getHistoryAlarms(input).subscribe(result => {
-                if (!result.error) {
-                    this.totalCount = result.totalCount;
-                    this.alarmList = result.items.map(item => [
-                        item.name,
-                        item.message,
-                        item.alarmLevel,
-                        item.triggeredTime.format('YYYY-MM-DD HH:mm:ss')
-                    ]);
-                    this.renderElement();
-                }
-            });
-        }
-        else {
-            const input = new _tmp_config["c" /* GetAlarmsArgs */](this.alarmNames, undefined, undefined, this.pageSize, this.page * this.pageSize);
-            this.alarmsStore.getCurrentAlarms(input).subscribe(result => {
-                if (!result.error) {
-                    this.totalCount = result.totalCount;
-                    this.currentAlarmList = result.items;
-                    this.alarmList = this.currentAlarmList.map(item => [
-                        item.name,
-                        item.message,
-                        item.alarmLevel,
-                        item.triggeredTime.format('YYYY-MM-DD HH:mm:ss')
-                    ]);
-                    this.renderElement();
-                }
-            });
-        }
+        clearTimeout(this.getAlarmDataId);
+        this.getAlarmDataId = setTimeout(() => {
+            if (this.model.filterSetting.alarmType) {
+                this.updateQueryTimeRange();
+                const input = new _tmp_config["c" /* GetAlarmsArgs */](this.alarmNames, this.startTime, this.endTime, this.pageSize, this.page * this.pageSize);
+                this.alarmsStore.getHistoryAlarms(input).subscribe(result => {
+                    if (!result.error) {
+                        this.totalCount = result.totalCount;
+                        this.alarmList = result.items.map(item => [
+                            item.name,
+                            item.message,
+                            item.alarmLevel,
+                            item.triggeredTime.format('YYYY-MM-DD HH:mm:ss')
+                        ]);
+                        this.renderElement();
+                    }
+                });
+            }
+            else {
+                const input = new _tmp_config["c" /* GetAlarmsArgs */](this.alarmNames, undefined, undefined, this.pageSize, this.page * this.pageSize);
+                this.alarmsStore.getCurrentAlarms(input).subscribe(result => {
+                    if (!result.error) {
+                        this.totalCount = result.totalCount;
+                        this.currentAlarmList = result.items;
+                        this.alarmList = this.currentAlarmList.map(item => [
+                            item.name,
+                            item.message,
+                            item.alarmLevel,
+                            item.triggeredTime.format('YYYY-MM-DD HH:mm:ss')
+                        ]);
+                        this.renderElement();
+                    }
+                });
+            }
+        }, 500);
     }
     renderElement() {
         this.rootElement.selectAll('*').remove();
@@ -41051,7 +41018,7 @@ var shared = __webpack_require__(5);
 // EXTERNAL MODULE: ./.tmp/view/view.service.ts
 var view_service = __webpack_require__(26);
 
-// EXTERNAL MODULE: ./.tmp/gui/gui-view.ts + 125 modules
+// EXTERNAL MODULE: ./.tmp/gui/gui-view.ts + 124 modules
 var gui_view = __webpack_require__(31);
 
 // EXTERNAL MODULE: external "rxjs/operators"
@@ -63203,9 +63170,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);
             });
         });
     }
@@ -63391,9 +63358,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);
             };
         });
     }