@flexem/fc-gui 3.0.0-alpha.66 → 3.0.0-alpha.67

package/CHANGELOG.md

@@ -274,4 +274,18 @@
 ### Web端
 #### Bug Fix
     1. FLEXCLOUD-2487: 【线上问题】数据库连接池占满导致无响应的问题
-    - 去掉没有位置信息时的定时器
+    - 去掉没有位置信息时的定时器
+
+## 3.0.0-alpha.67(2023-03-06)
+### Web端
+#### Bug Fix
+    1. FLEXCLOUD-2484 告警等级提示应汉化
+    2. FLEXCLOUD-2493 首次打开模板，字体属性下拉框字被填充框遮挡
+    3. FLEXCLOUD-2495 模板中添加未关联告警的告警表元件，导致不显示组态中配置的画面
+    4. FLEXCLOUD-2497 报警表表头、表格内容向右对齐后格式错误，不显示表格内容
+    5. FLEXCLOUD-2498 告警表线框中线条颜色较浅，可参考表格中颜色配置
+    6. FLEXCLOUD-2500 告警表配置当前报警，无数据时点击切换分页按钮，报错“您的请求无效!”
+    7. FLEXCLOUD-2501 模拟组态画面、刷新组态不应闪烁原型画面
+    8. FLEXCLOUD-2502 编辑告警表时，应保留上一次告警组与告警等级的选择
+    9. FLEXCLOUD-2503 切换告警类型报警勾选框应重置，让客户手动勾选告警监控点
+    10. FLEXCLOUD-2505 组态元件有a控制权限，用户有a组态权限，设备仪表盘中不显示告警元件

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

@@ -40043,6 +40043,7 @@ var AlarmState;
 
 class alarm_element_AlarmElement extends conditional_display_element_ConditionalDisplayElement {
     constructor(element, injector, permissionChecker, variableCommunicator, variableStore, alarmsStore, signalRAppId) {
+        var _a, _b;
         super(element, permissionChecker, variableCommunicator, variableStore, signalRAppId);
         this.alarmsStore = alarmsStore;
         this.displayOption = {
@@ -40067,54 +40068,61 @@ class alarm_element_AlarmElement extends conditional_display_element_Conditional
         this.localization = injector.get(_tmp_localization["b" /* LOCALIZATION */]);
         this.variableCommunicator = variableCommunicator;
         this.timePeriods = this.getValidTimePeriods();
-        this.currentTimePeriod = this.model.filterSetting.refreshCycle;
         this.pageSize = this.model.generalSetting.pageSize;
-        this.currentTimePeriod = this.model.filterSetting.displayPeriod;
-        this.updateQueryTimeRange();
-        if (this.model.filterSetting.alarmType) {
-            this.refreshIntervalId = setInterval(() => {
-                this.loadFirstPage();
-                this.logger.debug(`[GUI]Refresh Alarm Table:${d3["time"].format('%x %X')(new Date())}`);
-            }, 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.model.filterSetting.detailsData, alarmName => alarmName === alarm.name)) {
-                    return;
-                }
-                const currentAlarm = this.currentAlarmList.find(re => re.name === alarm.name);
-                if (alarm.state === AlarmState.AlarmStateTriggered.valueOf()) {
-                    if (!Object(lodash["isNil"])(currentAlarm)) {
+        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.updateQueryTimeRange();
+            if (this.model.filterSetting.alarmType) {
+                this.refreshIntervalId = setInterval(() => {
+                    this.loadFirstPage();
+                    this.logger.debug(`[GUI]Refresh Alarm Table:${d3["time"].format('%x %X')(new Date())}`);
+                }, this.model.filterSetting.refreshCycle * 60 * 1000);
+            }
+            else {
+                variableCommunicator.subscribeUserDeviceAlarms(signalRAppId).subscribe(alarmWithAppId => {
+                    if (alarmWithAppId.appId !== this.signalRAppId) {
                         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)) {
+                    const alarm = alarmWithAppId.alarm;
+                    if (!Object(lodash["find"])(this.model.filterSetting.detailsData, alarmName => alarmName === alarm.name)) {
                         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')
-                    ]);
+                    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)) {
+                            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.renderElement();
-            });
+            }
+            this.init();
+        }
+        else {
+            this.totalCount = 0;
+            this.alarmList = [];
+            this.renderElement();
         }
-        this.init();
     }
     dispose() {
         clearInterval(this.refreshIntervalId);
@@ -40135,40 +40143,45 @@ class alarm_element_AlarmElement extends conditional_display_element_Conditional
         return timePeriods;
     }
     init() {
+        this.rootElement.selectAll('*').remove();
         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.alarmsStore.getHistoryAlarms(input).subscribe(result => {
-                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();
+                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.model.filterSetting.detailsData, undefined, undefined, this.pageSize, this.page * this.pageSize);
             this.alarmsStore.getCurrentAlarms(input).subscribe(result => {
-                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();
+                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();
+                }
             });
         }
     }
     renderElement() {
-        this.rootElement.selectAll('*').remove();
         const elementHeight = this.model.size.height;
         this.element = document.createElementNS('http://www.w3.org/2000/svg', 'foreignObject');
         this.element.setAttribute('width', this.model.size.width.toString());
         this.element.setAttribute('height', elementHeight.toString());
+        this.$element.append(this.element);
         const table = document.createElement('table');
         table.style.cssText = `border: 2px solid ${this.model.generalSetting.stroke};
             height: ${elementHeight - 39}`;
@@ -40250,14 +40263,14 @@ class alarm_element_AlarmElement extends conditional_display_element_Conditional
             table.appendChild(tr);
         }
         this.element.appendChild(table);
-        this.$element.append(this.element);
         this.renderOperationArea(this.model.size.width, elementHeight - 39);
     }
     renderOperationArea(chartWidth, chartHeight) {
+        var _a;
         const operationArea = this.rootElement.append('g').attr('transform', `translate(0,${chartHeight + this.displayOption.operationAreaMarginTop})`)
             .append('foreignObject').attr('width', chartWidth).attr('height', this.displayOption.operationAreaHeight).attr('fill', 'none')
             .append('xhtml:div').style('height', (this.displayOption.operationAreaHeight - 4) + 'px').style('overflow', 'hidden').style('margin-top', '4px');
-        if (this.model.filterSetting.alarmType) {
+        if ((_a = this.model.filterSetting) === null || _a === void 0 ? void 0 : _a.alarmType) {
             const selectElement = operationArea.append('select').style('margin-left', this.displayOption.marginLeft + 'px')
                 .style('font-size', this.displayOption.operationSelectFontSize).on('change', () => {
                 const displayTimePeriod = this.rootElement.select('select').property('value');
@@ -40318,7 +40331,9 @@ class alarm_element_AlarmElement extends conditional_display_element_Conditional
         this.init();
     }
     loadNextPage() {
-        const last_page = Math.ceil(this.totalCount / this.pageSize) - 1;
+        let last_page = Math.ceil(this.totalCount / this.pageSize);
+        if (last_page)
+            last_page--;
         if (this.page < last_page) {
             this.page++;
         }
@@ -40331,7 +40346,10 @@ class alarm_element_AlarmElement extends conditional_display_element_Conditional
         this.init();
     }
     loadLastPage() {
-        this.page = Math.ceil(this.totalCount / this.pageSize) - 1;
+        let last_page = Math.ceil(this.totalCount / this.pageSize);
+        if (last_page)
+            last_page--;
+        this.page = last_page;
         this.init();
     }
 }