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

package/CHANGELOG.md

@@ -295,7 +295,13 @@
     1. FLEXCLOUD-2495 模板中添加未关联告警的告警表元件，导致不显示组态中配置的画面
     2. FLEXCLOUD-2500 告警表配置当前报警，无数据时点击切换分页按钮，报错“您的请求无效!”
 
-## 3.0.0-alpha.69(2023-03-08)
+## 3.0.0-alpha.69(2023-03-09)
 ### Web端
 #### Bug Fix
-    1. FLEXCLOUD-2517 告警表配置历史告警、历史告警无法切换时间段
+    1. FLEXCLOUD-2517 告警表配置历史告警、历史告警无法切换时间段
+
+## 3.0.0-alpha.70(2023-03-10)
+### Web端
+#### Bug Fix
+    1. FLEXCLOUD-2520 刷新周期未生效
+    2. FLEXCLOUD-2521【云组态】告警表修改告警名称、告警分组、删除告警后，再次配置告警表时，应提示用户“至少选择一个告警”

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

@@ -40043,7 +40043,7 @@ var AlarmState;
 
 class alarm_element_AlarmElement extends conditional_display_element_ConditionalDisplayElement {
     constructor(element, injector, permissionChecker, variableCommunicator, variableStore, alarmsStore, signalRAppId) {
-        var _a, _b;
+        var _a;
         super(element, permissionChecker, variableCommunicator, variableStore, signalRAppId);
         this.alarmsStore = alarmsStore;
         this.displayOption = {
@@ -40059,6 +40059,7 @@ class alarm_element_AlarmElement extends conditional_display_element_Conditional
             operationButtonHeight: 24,
             operationButtonMargin: 4
         };
+        this.alarmNames = [];
         this.alarmList = [];
         this.currentAlarmList = [];
         this.page = 0;
@@ -40071,8 +40072,8 @@ class alarm_element_AlarmElement extends conditional_display_element_Conditional
         this.timePeriods = this.getValidTimePeriods();
         this.pageSize = this.model.generalSetting.pageSize;
         if (this.model.filterSetting) {
-            this.currentTimePeriod = (_a = this.model.filterSetting) === null || _a === void 0 ? void 0 : _a.refreshCycle;
-            this.currentTimePeriod = (_b = this.model.filterSetting) === null || _b === void 0 ? void 0 : _b.displayPeriod;
+            this.alarmNames = this.model.filterSetting.detailsData.map(item => item.name);
+            this.currentTimePeriod = (_a = this.model.filterSetting) === null || _a === void 0 ? void 0 : _a.displayPeriod;
             this.updateQueryTimeRange();
             if (this.model.filterSetting.alarmType) {
                 this.refreshIntervalId = setInterval(() => {
@@ -40086,7 +40087,7 @@ class alarm_element_AlarmElement extends conditional_display_element_Conditional
                         return;
                     }
                     const alarm = alarmWithAppId.alarm;
-                    if (!Object(lodash["find"])(this.model.filterSetting.detailsData, alarmName => alarmName === alarm.name)) {
+                    if (!Object(lodash["find"])(this.alarmNames, itemName => itemName === alarm.name)) {
                         return;
                     }
                     const currentAlarm = this.currentAlarmList.find(re => re.name === alarm.name);
@@ -40145,7 +40146,8 @@ class alarm_element_AlarmElement extends conditional_display_element_Conditional
     }
     init() {
         if (this.model.filterSetting.alarmType) {
-            const input = new _tmp_config["c" /* GetAlarmsArgs */](this.model.filterSetting.detailsData, this.startTime, this.endTime, this.pageSize, this.page * this.pageSize);
+            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;
@@ -40160,7 +40162,7 @@ class alarm_element_AlarmElement extends conditional_display_element_Conditional
             });
         }
         else {
-            const input = new _tmp_config["c" /* GetAlarmsArgs */](this.model.filterSetting.detailsData, undefined, undefined, this.pageSize, this.page * this.pageSize);
+            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;