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

package/CHANGELOG.md

@@ -410,7 +410,38 @@
     2. 修复在鸿蒙系统的手机上，视频元件的控制按钮显示异常的问题
     3. 修复ios系统中视频放大缩小后，画面会变形的问题
 
+## 3.0.0-alpha.92(2023-07-18)
+### Web端
+#### Features
+    1. FLEXCLOUD-2710 【氚云20230621000600】组态历史曲线表：历史曲线增加点位标记，便于直观看到曲线采样点的变化
+
+## 3.0.0-alpha.93(2023-07-21)
+### Web端
+#### Features
+    1. FLEXCLOUD-2741 【氚云20230714001409】模板的模拟功能，无法进行写值，一直提示提交中
+
+## 3.0.0-alpha.94(2023-07-21)
+### Web端
+#### Features
+    1. FLEXCLOUD-2710 【氚云20230621000600】组态历史曲线表：历史曲线增加点位标记，便于直观看到曲线采样点的变化
+    - 修改标记点大小
+
+## 3.0.0-alpha.96(2023-09-26)
+### Web端
+#### Bug Fix
+    1. FLEXCLOUD-2864 2018年创建的模板组态写值失败（在补丁包v2.22.0-Hotfix5中使用，其它分支不要用）
+	
 ## 3.0.0-alpha.97(2023-09-26)
 ### Web端
 #### Bug Fix
-    1. FLEXCLOUD-2864 2018年创建的模板组态写值失败（给APP补丁包v2.8.0中使用）
+    1. FLEXCLOUD-2864 2018年创建的模板组态写值失败（给APP补丁包v2.8.0中使用）
+
+## 3.0.0-alpha.98(2023-09-26)
+### Web端
+#### Bug Fix
+    1. FLEXCLOUD-2864 2018年创建的模板组态写值失败（在开发分支上使用）
+
+## 3.0.0-alpha.99(2023-11-27)
+### Web端
+#### Features
+    1. FLEXCLOUD-2885 设备模板—组态设计—告警表/历史曲线表，分页、时间选择背景为透明

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,50 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
             }
         });
     }
+    initPoint() {
+        try {
+            const legendList = this.$element
+                .find('.nv-legend')
+                .find('.nv-series');
+            let hiddenCount = 0;
+            for (let i = 0; i < this.data.length; i++) {
+                const channel = this.model.dataSetting.channels[i];
+                if (legendList.eq(i).children().eq(0).css('fill-opacity') === '1') {
+                    const pointList = this.$element
+                        .find('.nv-scatterWrap')
+                        .find('.nv-series-' + (i - hiddenCount))
+                        .find('.nv-point');
+                    if (pointList && pointList.length) {
+                        for (let j = 0; j < pointList.length; j++) {
+                            const point = pointList.eq(j);
+                            const previousPoint = pointList.eq(j - 1);
+                            if (j && point.attr('transform').split(',')[1] !== previousPoint.attr('transform').split(',')[1]) {
+                                if (channel.enablePoint && channel.pointColor) {
+                                    const pointStyle = {
+                                        'stroke-opacity': 1,
+                                        'stroke-width': '2px',
+                                        'stroke': channel.pointColor,
+                                        'fill-opacity': 1,
+                                        'fill': channel.pointColor
+                                    };
+                                    point.addClass('nv-mark-point');
+                                    point.css(pointStyle);
+                                    previousPoint.addClass('nv-mark-point');
+                                    previousPoint.css(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 +36538,19 @@ 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.$element.find('.nv-mark-point').css({
+                    'stroke-opacity': 0,
+                    'stroke-width': 0,
+                    'stroke': 'unset',
+                    'fill-opacity': 0,
+                    'fill': 'unset'
+                }).removeClass('nv-mark-point');
+                this.initPoint();
+            }, 1);
+        });
         return chart;
     }
     getMultiBarWithFocusChart(chartWidth, chartHeight, data) {
@@ -36535,6 +36594,18 @@ 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 => {
+                this.$element.find('.nv-mark-point').css({
+                    'stroke-opacity': 0,
+                    'stroke-width': 0,
+                    'stroke': 'unset',
+                    'fill-opacity': 0,
+                    'fill': 'unset'
+                }).removeClass('nv-mark-point');
+                clearTimeout(this.timer);
+                this.timer = undefined;
+                this.timer = setTimeout(() => {
+                    this.initPoint();
+                }, 100);
                 if (this.currentTimePeriod === 3 || this.currentTimePeriod === 4 || this.currentTimePeriod === 5) {
                     return this.timeFormat(d, '%y-%m-%d');
                 }
@@ -36669,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(); });
     }
@@ -39576,7 +39651,12 @@ class video_element_VideoElement extends conditional_display_element_Conditional
             else if (isIos) {
                 this.setIosVideo(this.videoUrl, videoId);
             }
-            this.videoPlayer = new EZUIPlayer(videoId);
+            try {
+                this.videoPlayer = new EZUIPlayer(videoId);
+            }
+            catch (err) {
+                console.log(err);
+            }
         }, 1000);
         const style = document.createElement('style');
         style.innerHTML = `#${videoId}::-webkit-media-controls-enclosure {
@@ -40260,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};
@@ -40280,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};
@@ -40360,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();
@@ -41715,13 +41793,24 @@ let WriteValueModalComponent = class WriteValueModalComponent {
                 value = this.formatWriteValue();
             }
         }
+        if (!this.args.releasedVariableService) {
+            this.onClosed({
+                value: value,
+                showValue: showValue,
+                enableNumericalOperation: false,
+                isNumericalOperation: this.isNumericalOperation,
+                variableRwType: 6
+            });
+            return;
+        }
         this.args.releasedVariableService.getVariableWithValueTransform(this.variableName).subscribe(result => {
             const valueTransform = JSON.parse(result.valueTransform);
             if ((valueTransform === null || valueTransform === void 0 ? void 0 : valueTransform.Type) !== 0) {
                 this.isNumericalOperation = true;
             }
             this.onClosed({
-                value, showValue,
+                value: value,
+                showValue: showValue,
                 enableNumericalOperation: this.enableNumericalOperation,
                 isNumericalOperation: this.isNumericalOperation,
                 variableRwType: result.variableRwType