@flexem/fc-gui 3.0.0-alpha.98 → 3.0.0-alpha.99

package/CHANGELOG.md

@@ -439,4 +439,9 @@
 ## 3.0.0-alpha.98(2023-09-26)
 ### Web端
 #### Bug Fix
-    1. FLEXCLOUD-2864 2018年创建的模板组态写值失败（在开发分支上使用）
+    1. FLEXCLOUD-2864 2018年创建的模板组态写值失败（在开发分支上使用）
+
+## 3.0.0-alpha.99(2023-11-27)
+### Web端
+#### Features
+    1. FLEXCLOUD-2885 设备模板—组态设计—告警表/历史曲线表，分页、时间选择背景为透明

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

@@ -36740,27 +36740,31 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
             .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');
         const selectElement = operationArea.append('select').style('margin-left', this.displayOption.marginLeft + 'px')
+            .style('background-color', 'inherit')
             .style('font-size', this.displayOption.operationSelectFontSize).on('change', () => {
             const displayTimePeriod = this.rootElement.select('select').property('value');
             this.updateTimeRange(displayTimePeriod);
             this.reRenderElement(this.startTime, this.endTime, this.displayOption.dataLimit, HistoricalCurveTimeRange.BeginOpenEndOpen);
         });
+        const rect = this.$element.parent().parent().find('rect');
+        const fillColor = rect.attr('fill');
         const options = selectElement.selectAll('option').data(this.timePeriods).enter().append('option');
-        options.text(d => d.name).attr('value', d => d.key).property('selected', d => d.key === Number(this.currentTimePeriod));
+        options.text(d => d.name).attr('value', d => d.key).property('selected', d => d.key === Number(this.currentTimePeriod))
+            .style('background-color', fillColor);
         const buttonWidth = this.displayOption.operationButtonWidth + 'px', buttonHeight = this.displayOption.operationButtonHeight + 'px';
         operationArea.append('button').style('width', buttonWidth).style('height', buttonHeight).style('border', 'none')
-            .style('float', 'right').style('background', 'white').style('background-image', 'url(assets/img/last_page.svg)')
+            .style('float', 'right').style('background-image', 'url(assets/img/last_page.svg)')
             .on('click', () => { this.loadLastPage(); });
         operationArea.append('button').style('width', buttonWidth).style('height', buttonHeight).style('border', 'none')
-            .style('float', 'right').style('background', 'white').style('background-image', 'url(assets/img/next_page.svg)')
+            .style('float', 'right').style('background-image', 'url(assets/img/next_page.svg)')
             .style('margin', `0 ${this.displayOption.operationButtonMargin}px 0 0`)
             .on('click', () => { this.loadNextPage(); });
         operationArea.append('button').style('width', buttonWidth).style('height', buttonHeight).style('border', 'none')
-            .style('float', 'right').style('background', 'white').style('background-image', 'url(assets/img/previous_page.svg)')
+            .style('float', 'right').style('background-image', 'url(assets/img/previous_page.svg)')
             .style('margin', `0 ${this.displayOption.operationButtonMargin}px 0 0`)
             .on('click', () => { this.loadPreviousPage(); });
         operationArea.append('button').style('width', buttonWidth).style('height', buttonHeight).style('border', 'none')
-            .style('float', 'right').style('background', 'white').style('background-image', 'url(assets/img/first_page.svg)')
+            .style('float', 'right').style('background-image', 'url(assets/img/first_page.svg)')
             .style('margin', `0 ${this.displayOption.operationButtonMargin}px 0 0`)
             .on('click', () => { this.loadFirstPage(); });
     }
@@ -40336,7 +40340,6 @@ class alarm_element_AlarmElement extends conditional_display_element_Conditional
         }
         fontString += this.model.generalSetting.headerFont.fontSize + ' ' + this.model.generalSetting.headerFont.fontFamily;
         tr.style.cssText = `height: ${this.model.heights[0]}px;
-            background: ${this.model.generalSetting.headerFillColor};
             color: ${this.model.generalSetting.headerFont.color};
             font: ${fontString};
             text-align: ${this.model.generalSetting.headerFont.textAlign};
@@ -40356,7 +40359,6 @@ class alarm_element_AlarmElement extends conditional_display_element_Conditional
         for (let row = 0; row < this.pageSize; row++) {
             tr = document.createElement('tr');
             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};
@@ -40436,18 +40438,18 @@ class alarm_element_AlarmElement extends conditional_display_element_Conditional
         }
         const buttonWidth = this.displayOption.operationButtonWidth + 'px', buttonHeight = this.displayOption.operationButtonHeight + 'px';
         operationArea.append('button').style('width', buttonWidth).style('height', buttonHeight).style('border', 'none')
-            .style('float', 'right').style('background', 'white').style('background-image', 'url(assets/img/last_page.svg)')
+            .style('float', 'right').style('background-image', 'url(assets/img/last_page.svg)')
             .on('click', () => { this.loadLastPage(); });
         operationArea.append('button').style('width', buttonWidth).style('height', buttonHeight).style('border', 'none')
-            .style('float', 'right').style('background', 'white').style('background-image', 'url(assets/img/next_page.svg)')
+            .style('float', 'right').style('background-image', 'url(assets/img/next_page.svg)')
             .style('margin', `0 ${this.displayOption.operationButtonMargin}px 0 0`)
             .on('click', () => { this.loadNextPage(); });
         operationArea.append('button').style('width', buttonWidth).style('height', buttonHeight).style('border', 'none')
-            .style('float', 'right').style('background', 'white').style('background-image', 'url(assets/img/previous_page.svg)')
+            .style('float', 'right').style('background-image', 'url(assets/img/previous_page.svg)')
             .style('margin', `0 ${this.displayOption.operationButtonMargin}px 0 0`)
             .on('click', () => { this.loadPreviousPage(); });
         operationArea.append('button').style('width', buttonWidth).style('height', buttonHeight).style('border', 'none')
-            .style('float', 'right').style('background', 'white').style('background-image', 'url(assets/img/first_page.svg)')
+            .style('float', 'right').style('background-image', 'url(assets/img/first_page.svg)')
             .style('margin', `0 ${this.displayOption.operationButtonMargin}px 0 0`)
             .on('click', () => { this.loadFirstPage(); });
         this.setStatusAsNormal();