@flexem/fc-gui 3.0.0-alpha.104 → 3.0.0-alpha.106

package/CHANGELOG.md

@@ -464,4 +464,14 @@
 ## 3.0.0-alpha.104(2024-03-13)
 ### Web端
 #### Features
-    1. FLEXCLOUD-2619 环形图配置常数后再配置变量导致刻度值间隔较大
+    1. FLEXCLOUD-2619 环形图配置常数后再配置变量导致刻度值间隔较大
+
+## 3.0.0-alpha.105(2024-03-15)
+### Web端
+#### Features
+    1. FLEXCLOUD-3086 历史曲线可以设置筛选的背景颜色
+
+## 3.0.0-alpha.106(2024-04-10)
+### Web端
+#### Features
+    1. FLEXCLOUD-3269 由于历史曲线使用d3绘制，数据量过多或者通道较多时导致安卓端操作较卡顿

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

@@ -35360,7 +35360,6 @@ class bar_graph_element_BarGraphElement extends readable_element_ReadableElement
         this.valueObj = {};
         this.isNeedUpdateScale = false;
         this.needAddNumber = 0;
-        this.needInitTransform = true;
         if ((this.model.minValueType === variable_value_type["a" /* VariableValueType */].Constant && this.model.maxValueType === variable_value_type["a" /* VariableValueType */].Variable)
             || this.model.maxValueType === variable_value_type["a" /* VariableValueType */].Constant && this.model.minValueType === variable_value_type["a" /* VariableValueType */].Variable) {
             this.isNeedUpdateScale = true;
@@ -35376,9 +35375,7 @@ class bar_graph_element_BarGraphElement extends readable_element_ReadableElement
             this.$barRect.attr('transform', this.defaultTransform);
         }
         setTimeout(() => {
-            if (this.model.maxValueType !== variable_value_type["a" /* VariableValueType */].Variable || this.model.minValueType !== variable_value_type["a" /* VariableValueType */].Variable) {
-                this.initFrameNode();
-            }
+            this.initFrameNode();
         });
     }
     get readVariableName() {
@@ -35400,8 +35397,10 @@ class bar_graph_element_BarGraphElement extends readable_element_ReadableElement
         if (this.needAddNumber <= 3)
             return;
         this.$element[0].childNodes.forEach((node, index) => {
-            const matrixE = node.transform.baseVal[0].matrix.e;
-            node.transform.baseVal[0].matrix.e = matrixE + (this.needAddNumber - 3) * 7;
+            // const matrixE = node.transform.baseVal[0].matrix.e;
+            // node.transform.baseVal[0].matrix.e = matrixE + (this.needAddNumber - 3) * 7;
+            if (!node.transform.baseVal[0])
+                return;
             if (node.nodeName === 'g') {
                 const nodeValue = node.attributes['clip-path'].value.replace('url(#', '').replace(')', '');
                 const rootNode = node.parentNode.parentNode.parentElement;
@@ -35413,8 +35412,8 @@ class bar_graph_element_BarGraphElement extends readable_element_ReadableElement
                     const values = [];
                     line.split(' ').forEach((item) => {
                         const nItem = Number(item);
-                        if (!isNaN(nItem) && item < 100) {
-                            item = nItem > 0 ? nItem + (this.needAddNumber - 3) * 7 : nItem - (this.needAddNumber - 3) * 7;
+                        if (nItem === -1) {
+                            item = nItem - (this.needAddNumber - 3) * 7;
                         }
                         values.push(item);
                     });
@@ -35430,8 +35429,7 @@ class bar_graph_element_BarGraphElement extends readable_element_ReadableElement
     initFrameNode() {
         const arcPath = Snap(this.$element[0]);
         const b = arcPath.getBBox(true);
-        const width = this.needAddNumber <= 3 ? b.width : b.width + (this.needAddNumber - 3) * 7;
-        this.rootElement.append('rect').attr('id', 'StateFrame').attr('width', width).attr('height', b.height).attr('fill', 'transparent');
+        this.rootElement.append('rect').attr('id', 'StateFrame').attr('width', b.width).attr('height', b.height).attr('fill', 'transparent');
     }
     updateValueObj(value, variableName) {
         var _a, _b, _c;
@@ -35461,13 +35459,9 @@ class bar_graph_element_BarGraphElement extends readable_element_ReadableElement
             min = bar_graph_element_BarGraphElement.DEFAULT_MIN_VALUE;
             max = bar_graph_element_BarGraphElement.DEFAULT_MAX_VALUE;
         }
-        if (this.model.maxValueType === variable_value_type["a" /* VariableValueType */].Variable && this.model.minValueType === variable_value_type["a" /* VariableValueType */].Variable) {
+        if (this.model.maxValueType === variable_value_type["a" /* VariableValueType */].Variable || this.model.minValueType === variable_value_type["a" /* VariableValueType */].Variable) {
             this.needAddNumber = max.toString().length > min.toString().length ? max.toString().length : min.toString().length;
-            if (this.needInitTransform) {
-                this.initTransform();
-                this.initFrameNode();
-                this.needInitTransform = false;
-            }
+            this.initTransform();
         }
         const avgSacle = ((max - min) / this.model.masterDivisionNumber).toFixed(5);
         for (let i = 0; i < textElements.length; i++) {
@@ -35502,6 +35496,10 @@ class bar_graph_element_BarGraphElement extends readable_element_ReadableElement
                             }
                             break;
                     }
+                    if (this.model.minValueType !== variable_value_type["a" /* VariableValueType */].Constant && this.model.maxValueType === variable_value_type["a" /* VariableValueType */].Constant) {
+                        const maxLen = this.model.max && this.model.max.toString().length;
+                        translateX += maxLen > 2 ? (maxLen - 3) * 7 : 0;
+                    }
                     text.transform.baseVal[0].matrix.e = translateX;
                 }
             }
@@ -36228,7 +36226,7 @@ class datetime_display_element_DatetimeDisplayElement extends conditional_displa
             this.getAndSetCurrentTime(format);
             setInterval(() => {
                 this.getAndSetCurrentTime(format);
-            }, 1000);
+            }, 100);
         }
     }
     getAndSetCurrentTime(format) {
@@ -36424,6 +36422,11 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
         };
         this.elementStatus = HistoricalCurveElementStatus.Loading;
         this.data = [];
+        this.needResize = true;
+        this.setNeedResize = () => {
+            this.needResize = false;
+            setTimeout(() => this.needResize = true, 500);
+        };
         this.logger = injector.get(logger["b" /* LOGGER_SERVICE_TOKEN */]);
         this.localization = injector.get(_tmp_localization["b" /* LOCALIZATION */]);
         this.timePeriods = this.getValidTimePeriods();
@@ -36444,6 +36447,7 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
             }
         }
         this.loadFirstPage();
+        this.initKeyboardListener();
     }
     dispose() {
         clearInterval(this.refreshIntervalId);
@@ -36453,8 +36457,19 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
         if (this.resizeEventListener) {
             this.resizeEventListener.clear();
         }
+        if (this.isAndroid) {
+            window.removeEventListener('native.keyboardshow', this.setNeedResize);
+            window.removeEventListener('native.keyboardhide', this.setNeedResize);
+        }
         this.logger.debug(`[GUI]Dispose Histoical Curve Refresh Interval:${d3["time"].format('%x %X')(new Date())}`);
     }
+    initKeyboardListener() {
+        this.isAndroid = !!navigator.userAgent.match(/(Android)/i);
+        if (this.isAndroid) {
+            window.addEventListener('native.keyboardshow', this.setNeedResize);
+            window.addEventListener('native.keyboardhide', this.setNeedResize);
+        }
+    }
     getValidTimePeriods() {
         const timePeriods = new Array();
         timePeriods.push({ key: 6, name: this.localization.lastThirtyMinutes });
@@ -36701,6 +36716,8 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
         this.rootElement.append('g').datum(data).call(chart);
         this.rootElement.selectAll('.nv-noData').attr('x', chartWidth / 2).attr('y', chartHeight / 2 + this.displayOption.operationAreaHeight);
         this.resizeEventListener = nv_d3["utils"].windowResize(() => {
+            if (!this.needResize)
+                return;
             chart.update();
             this.rootElement.selectAll('.nv-noData').attr('x', chartWidth / 2).attr('y', chartHeight / 2 + this.displayOption.operationAreaHeight);
         });
@@ -36805,11 +36822,12 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
         }
     }
     renderOperationArea(chartWidth, chartHeight) {
+        const backgroundColor = this.model.displaySetting.axisSetting.filterBackgroudColor || 'inherit';
         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');
         const selectElement = operationArea.append('select').style('margin-left', this.displayOption.marginLeft + 'px')
-            .style('background-color', 'inherit')
+            .style('background-color', backgroundColor)
             .style('font-size', this.displayOption.operationSelectFontSize).on('change', () => {
             const displayTimePeriod = this.rootElement.select('select').property('value');
             this.updateTimeRange(displayTimePeriod);
@@ -36819,26 +36837,26 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
         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))
-            .style('background-color', fillColor);
+            .style('background-color', this.model.displaySetting.axisSetting.filterBackgroudColor || 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-image', 'url(assets/img/last_page.svg)')
-            .style('background-color', 'inherit')
+            .style('float', 'right').style('background-image', 'url(assets/img/black_last_page.png)')
+            .style('background-color', backgroundColor).style('background-size', 'cover')
             .on('click', () => { this.loadLastPage(); });
         operationArea.append('button').style('width', buttonWidth).style('height', buttonHeight).style('border', 'none')
-            .style('float', 'right').style('background-image', 'url(assets/img/next_page.svg)')
+            .style('float', 'right').style('background-image', 'url(assets/img/black_next_page.png)')
             .style('margin', `0 ${this.displayOption.operationButtonMargin}px 0 0`)
-            .style('background-color', 'inherit')
+            .style('background-color', backgroundColor).style('background-size', 'cover')
             .on('click', () => { this.loadNextPage(); });
         operationArea.append('button').style('width', buttonWidth).style('height', buttonHeight).style('border', 'none')
-            .style('float', 'right').style('background-image', 'url(assets/img/previous_page.svg)')
+            .style('float', 'right').style('background-image', 'url(assets/img/black_previous_page.png)')
             .style('margin', `0 ${this.displayOption.operationButtonMargin}px 0 0`)
-            .style('background-color', 'inherit')
+            .style('background-color', backgroundColor).style('background-size', 'cover')
             .on('click', () => { this.loadPreviousPage(); });
         operationArea.append('button').style('width', buttonWidth).style('height', buttonHeight).style('border', 'none')
-            .style('float', 'right').style('background-image', 'url(assets/img/first_page.svg)')
+            .style('float', 'right').style('background-image', 'url(assets/img/black_first_page.png)')
             .style('margin', `0 ${this.displayOption.operationButtonMargin}px 0 0`)
-            .style('background-color', 'inherit')
+            .style('background-color', backgroundColor).style('background-size', 'cover')
             .on('click', () => { this.loadFirstPage(); });
     }
     timeFormat(datetime, specifier) {