@flexem/fc-gui 3.0.0-alpha.90 → 3.0.0-alpha.92

package/CHANGELOG.md

@@ -409,3 +409,8 @@
     1. 安卓和鸿蒙系统上，组态横屏时不再显示状态栏
     2. 修复在鸿蒙系统的手机上，视频元件的控制按钮显示异常的问题
     3. 修复ios系统中视频放大缩小后，画面会变形的问题
+
+## 3.0.0-alpha.92(2023-07-18)
+### Web端
+#### Features
+    1. FLEXCLOUD-2710 【氚云20230621000600】组态历史曲线表：历史曲线增加点位标记，便于直观看到曲线采样点的变化

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

@@ -36357,6 +36357,7 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
             operationButtonMargin: 4
         };
         this.elementStatus = HistoricalCurveElementStatus.Loading;
+        this.data = [];
         this.logger = injector.get(logger["b" /* LOGGER_SERVICE_TOKEN */]);
         this.localization = injector.get(_tmp_localization["b" /* LOCALIZATION */]);
         this.timePeriods = this.getValidTimePeriods();
@@ -36468,6 +36469,7 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
             Object(lodash["each"])(result, v => values.push({ x: moment(v.time).local().toDate().valueOf(), y: v.values[key] }));
             data.push({ key: channel.name, area: channel.projectEnabled, values: values });
         });
+        this.data = data;
         nv_d3["addGraph"](() => {
             if (this.model.displaySetting.curveType === CurveType.BarGroup || this.model.displaySetting.curveType === CurveType.BarStack) {
                 return this.getMultiBarWithFocusChart(chartWidth, chartHeight, data);
@@ -36477,6 +36479,44 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
             }
         });
     }
+    initPoint() {
+        try {
+            this.rootElement
+                .selectAll('.nv-scatterWrap')
+                .selectAll('.nv-point')
+                .style('stroke-opacity', 0)
+                .style('stroke-width', 0);
+            const legendList = this.rootElement
+                .selectAll('.nv-legend')
+                .selectAll('.nv-series');
+            let hiddenCount = 0;
+            for (let i = 0; i < this.data.length; i++) {
+                const channel = this.model.dataSetting.channels[i];
+                const pointStyle = `stroke-opacity: 1;stroke-width: 8px;stroke :${channel.pointColor}`;
+                if (legendList._groups[0][i].firstChild.style.fillOpacity === '1') {
+                    const pointList = this.rootElement
+                        .selectAll('.nv-scatterWrap')
+                        .selectAll('.nv-series-' + (i - hiddenCount)).selectAll('.nv-point')._groups[0];
+                    if (pointList && pointList.length) {
+                        for (let j = 0; j < pointList.length; j++) {
+                            if (j && $(pointList[j]).attr('transform').split(',')[1] !== $(pointList[j - 1]).attr('transform').split(',')[1]) {
+                                if (channel.enablePoint && channel.pointColor) {
+                                    pointList[j].setAttribute('style', pointStyle);
+                                    pointList[j - 1].setAttribute('style', pointStyle);
+                                }
+                            }
+                        }
+                    }
+                }
+                else {
+                    hiddenCount++;
+                }
+            }
+        }
+        catch (e) {
+            console.log(e);
+        }
+    }
     getLineChart(chartWidth, chartHeight, data) {
         const chart = nv_d3["models"].lineChart().showLegend(true)
             .margin({ top: 0, bottom: 0, left: this.displayOption.marginLeft, right: this.displayOption.marginRight })
@@ -36492,6 +36532,12 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
         }
         this.renderCommonProperty(chart, chartWidth, chartHeight, data);
         this.renderOperationArea(chartWidth, chartHeight);
+        this.initPoint();
+        chart.legend.dispatch.on('legendClick', () => {
+            setTimeout(() => {
+                this.initPoint();
+            }, 1);
+        });
         return chart;
     }
     getMultiBarWithFocusChart(chartWidth, chartHeight, data) {
@@ -36535,6 +36581,11 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
         chart.tooltip.headerFormatter(d => this.timeFormat(d, '%x %X'));
         if (this.model.displaySetting.showAxis) {
             chart.xAxis.showMaxMin(true).tickFormat(d => {
+                clearTimeout(this.timer);
+                this.timer = undefined;
+                this.timer = setTimeout(() => {
+                    this.initPoint();
+                }, 1);
                 if (this.currentTimePeriod === 3 || this.currentTimePeriod === 4 || this.currentTimePeriod === 5) {
                     return this.timeFormat(d, '%y-%m-%d');
                 }