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

package/CHANGELOG.md

@@ -314,4 +314,14 @@
 ## 3.0.0-alpha.72(2023-03-13)
 ### Web端
 #### Bug Fix
-    1. 修改设备告警的订阅事件
+    1. 修改设备告警的订阅事件
+
+## 3.0.0-alpha.73(2023-03-13)
+### Web端
+#### Bug Fix
+    1. 解决当前告警当第二页的报警恢复后，无告警时，翻页未自动翻到第一页的问题
+
+## 3.0.0-alpha.74(2023-03-17)
+### Web端
+#### Bug Fix
+    1. FLEXCLOUD-2535 【app】分页器与表格分离

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

@@ -40133,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,
@@ -40171,41 +40176,41 @@ class alarm_element_AlarmElement extends conditional_display_element_Conditional
             text-align: ${this.model.generalSetting.headerFont.textAlign};
             ${this.model.generalSetting.headerFont.isUnderline ? 'text-decoration: underline' : ''};
             vertical-align: middle;`;
-        for (let i = 0; i < 4; i++) {
+        for (let row = 0; row < 4; row++) {
             const th = document.createElement('th');
-            th.innerHTML = this.model.columLabels[i];
-            th.style.cssText = `width: ${this.model.widths[i] / this.model.size.width * 100}%;
+            th.innerHTML = this.model.columLabels[row];
+            th.style.cssText = `width: ${this.model.widths[row] / this.model.size.width * 100}%;
                 border-style: solid;
                 border-color: ${this.model.generalSetting.splitLine};
-                border-left-width: ${!i || this.model.generalSetting.isHiddenColumnSplitLine ? 0 : 1}px;`;
+                border-left-width: ${!row || this.model.generalSetting.isHiddenColumnSplitLine ? 0 : 1}px;`;
             tr.appendChild(th);
         }
         table.appendChild(tr);
         const levelColors = ['#3695FF', '#FFE900', '#FFA800', '#E84F4F'];
-        for (let i = 0; i < this.pageSize; i++) {
+        for (let row = 0; row < this.pageSize; row++) {
             tr = document.createElement('tr');
-            tr.style.cssText = `height: ${this.model.heights[i + 1]}px;
+            tr.style.cssText = `height: ${this.model.heights[row + 1]}px;
                     background: ${this.model.generalSetting.tableFillColor};
                     font: ${this.model.generalSetting.fontStyle};
                     color: ${this.model.generalSetting.fontColor};
                     text-align: ${this.model.generalSetting.textAlign};
                     vertical-align: middle;`;
-            for (let j = 0; j < 4; j++) {
+            for (let col = 0; col < 4; col++) {
                 const td = document.createElement('td');
                 td.style.cssText = `border-style: solid;
                 border-color: ${this.model.generalSetting.splitLine};
                 border-top-width: ${this.model.generalSetting.isHiddenColumnSplitLine ? 0 : 1}px;
-                border-left-width: ${!j || this.model.generalSetting.isHiddenColumnSplitLine ? 0 : 1}px;`;
-                if (this.alarmList[i]) {
-                    if (j !== 2) {
-                        td.innerHTML = this.alarmList[i][j];
+                border-left-width: ${!col || this.model.generalSetting.isHiddenColumnSplitLine ? 0 : 1}px;`;
+                if (this.alarmList[row]) {
+                    if (col !== 2) {
+                        td.innerHTML = this.alarmList[row][col];
                         td.style.cssText += `${this.model.generalSetting.isUnderline ? 'text-decoration: underline' : ''};`;
                     }
                     else {
                         const alarmLevel = document.createElement('div');
                         let alarmHeight = parseInt(this.model.generalSetting.fontSize) + 15;
-                        if (alarmHeight > this.model.heights[i + 1])
-                            alarmHeight = this.model.heights[i + 1];
+                        if (alarmHeight > this.model.heights[row + 1])
+                            alarmHeight = this.model.heights[row + 1];
                         let margin = '0 15px';
                         if (this.model.generalSetting.textAlign === 'left') {
                             margin = '0 30px 0 0';
@@ -40215,19 +40220,32 @@ class alarm_element_AlarmElement extends conditional_display_element_Conditional
                         }
                         alarmLevel.style.cssText = `margin: ${margin};
                             border-radius: 5px;
-                            background: ${levelColors[this.alarmList[i][j]]};
+                            background: ${levelColors[this.alarmList[row][col]]};
                             color: #ffffff;
-                            width: ${this.model.widths[j] - 30}px;
+                            width: ${this.model.widths[col] - 30}px;
                             height: ${alarmHeight}px;
-                            max-height: ${this.model.heights[i + 1]}px;
+                            max-height: ${this.model.heights[row + 1]}px;
                             display: flex;
                             justify-content: center;
                             align-items: center;
                             ${this.model.generalSetting.isUnderline ? 'text-decoration: underline' : ''};`;
-                        alarmLevel.innerHTML = this.model.levelText[this.alarmList[i][j]];
+                        alarmLevel.innerHTML = this.model.levelText[this.alarmList[row][col]];
                         td.appendChild(alarmLevel);
                     }
                 }
+                else if (col === 2) {
+                    const alarmLevel = document.createElement('div');
+                    let margin = '0 15px';
+                    if (this.model.generalSetting.textAlign === 'left') {
+                        margin = '0 30px 0 0';
+                    }
+                    else if (this.model.generalSetting.textAlign === 'right') {
+                        margin = '0 0 0 30px';
+                    }
+                    alarmLevel.style.cssText = `margin: ${margin};
+                            width: ${this.model.widths[col] - 30}px;`;
+                    td.appendChild(alarmLevel);
+                }
                 tr.appendChild(td);
             }
             table.appendChild(tr);