@flexem/fc-gui 3.0.0-alpha.94 → 3.0.0-alpha.96

package/elements/historical-curve/historical-curve.element.d.ts

@@ -32,8 +32,6 @@ export declare class HistoricalCurveElement extends ConditionalDisplayElement {
     private elementStatus;
     private chartElement;
     private isMobileMode;
-    private data;
-    private timer;
     constructor(element: HTMLElement, injector: Injector, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, historyDataStore: HistoryDataStore, signalRAppId: string);
     dispose(): void;
     private getValidTimePeriods;
@@ -42,7 +40,6 @@ export declare class HistoricalCurveElement extends ConditionalDisplayElement {
     private reRenderElement;
     private renderElement;
     private renderChart;
-    initPoint(): void;
     private getLineChart;
     private getMultiBarWithFocusChart;
     private renderCommonProperty;

package/elements/historical-curve/historical-curve.element.js

@@ -29,7 +29,6 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
             operationButtonMargin: 4
         };
         this.elementStatus = HistoricalCurveElementStatus.Loading;
-        this.data = [];
         this.logger = injector.get(LOGGER_SERVICE_TOKEN);
         this.localization = injector.get(LOCALIZATION);
         this.timePeriods = this.getValidTimePeriods();
@@ -141,7 +140,6 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
             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.addGraph(() => {
             if (this.model.displaySetting.curveType === CurveType.BarGroup || this.model.displaySetting.curveType === CurveType.BarStack) {
                 return this.getMultiBarWithFocusChart(chartWidth, chartHeight, data);
@@ -151,50 +149,6 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
             }
         });
     }
-    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.models.lineChart().showLegend(true)
             .margin({ top: 0, bottom: 0, left: this.displayOption.marginLeft, right: this.displayOption.marginRight })
@@ -210,19 +164,6 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
         }
         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) {
@@ -266,18 +207,6 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
         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');
                 }

package/elements/historical-curve/historical-curve.element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"HistoricalCurveElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-display-element","name":"ConditionalDisplayElement","line":21,"character":44},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":65,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":66,"character":18},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":67,"character":27},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":68,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":69,"character":23},{"__symbolic":"reference","module":"../../config","name":"HistoryDataStore","line":70,"character":43},{"__symbolic":"reference","name":"string"}]}],"dispose":[{"__symbolic":"method"}],"getValidTimePeriods":[{"__symbolic":"method"}],"updateTimeRange":[{"__symbolic":"method"}],"updateQueryTimeRange":[{"__symbolic":"method"}],"reRenderElement":[{"__symbolic":"method"}],"renderElement":[{"__symbolic":"method"}],"renderChart":[{"__symbolic":"method"}],"initPoint":[{"__symbolic":"method"}],"getLineChart":[{"__symbolic":"method"}],"getMultiBarWithFocusChart":[{"__symbolic":"method"}],"renderCommonProperty":[{"__symbolic":"method"}],"renderOperationArea":[{"__symbolic":"method"}],"timeFormat":[{"__symbolic":"method"}],"loadFirstPage":[{"__symbolic":"method"}],"loadNextPage":[{"__symbolic":"method"}],"loadPreviousPage":[{"__symbolic":"method"}],"loadLastPage":[{"__symbolic":"method"}],"initElementStatus":[{"__symbolic":"method"}],"updateElementStatus":[{"__symbolic":"method"}],"setStatusAsUnbound":[{"__symbolic":"method"}],"setStatusAsLoading":[{"__symbolic":"method"}],"setStatusAsLoadFailed":[{"__symbolic":"method"}],"renderStatus":[{"__symbolic":"method"}],"clearStatus":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"HistoricalCurveElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-display-element","name":"ConditionalDisplayElement","line":21,"character":44},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":63,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":64,"character":18},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":65,"character":27},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":66,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":67,"character":23},{"__symbolic":"reference","module":"../../config","name":"HistoryDataStore","line":68,"character":43},{"__symbolic":"reference","name":"string"}]}],"dispose":[{"__symbolic":"method"}],"getValidTimePeriods":[{"__symbolic":"method"}],"updateTimeRange":[{"__symbolic":"method"}],"updateQueryTimeRange":[{"__symbolic":"method"}],"reRenderElement":[{"__symbolic":"method"}],"renderElement":[{"__symbolic":"method"}],"renderChart":[{"__symbolic":"method"}],"getLineChart":[{"__symbolic":"method"}],"getMultiBarWithFocusChart":[{"__symbolic":"method"}],"renderCommonProperty":[{"__symbolic":"method"}],"renderOperationArea":[{"__symbolic":"method"}],"timeFormat":[{"__symbolic":"method"}],"loadFirstPage":[{"__symbolic":"method"}],"loadNextPage":[{"__symbolic":"method"}],"loadPreviousPage":[{"__symbolic":"method"}],"loadLastPage":[{"__symbolic":"method"}],"initElementStatus":[{"__symbolic":"method"}],"updateElementStatus":[{"__symbolic":"method"}],"setStatusAsUnbound":[{"__symbolic":"method"}],"setStatusAsLoading":[{"__symbolic":"method"}],"setStatusAsLoadFailed":[{"__symbolic":"method"}],"renderStatus":[{"__symbolic":"method"}],"clearStatus":[{"__symbolic":"method"}]}}}}]

package/elements/video/video-element.d.ts

@@ -16,16 +16,15 @@ export declare class VideoElement extends ConditionalDisplayElement {
     private videoId;
     private isShow;
     private videoPlayer;
+    private resetTimer;
     private refreshTimer;
-    private isFullscreen;
-    private videoUrl;
+    private isMobileType;
     constructor(element: HTMLElement, injector: Injector, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, videoService: VideoService, guiSize: Size, svgRootClass: string, signalRAppId: string);
     dispose(): void;
     hide(): void;
     show(): void;
     private init;
-    private initVideo;
     private addVideoAddressToolTip;
     private setAndroidVideo;
-    private setIosVideo;
+    private bindFullscreenEvent;
 }

package/elements/video/video-element.js

@@ -11,7 +11,6 @@ export class VideoElement extends ConditionalDisplayElement {
         this.guiSize = guiSize;
         this.svgRootClass = svgRootClass;
         this.videoId = '';
-        this.isFullscreen = false;
         this.isMobileMode = DisplayMode.Mobile === injector.get(GlobalSettings).displayMode;
         this.localization = injector.get(LOCALIZATION);
         this.init();
@@ -47,84 +46,60 @@ export class VideoElement extends ConditionalDisplayElement {
             return;
         }
         this.videoId = Guid.newGuid().toString('n');
-        this.rootElement.append('rect').attr('id', 'rect' + this.videoId).attr('fill', 'transparent')
-            .attr('width', this.model.size.width)
-            .attr('height', this.model.size.height);
         this.videoService.getVideoUrl(this.model.videoTag).then(result => {
-            this.videoUrl = result.url;
-            this.initVideo(result.url, this.videoId);
-        }).catch(() => {
-            throw new Error('Failure of the videoService');
-        });
-    }
-    initVideo(videoUrl, videoId) {
-        const patt = /https:.+.m3u8/;
-        if (videoUrl.indexOf('http:') !== -1) {
-            videoUrl = videoUrl.replace('http:', 'https:');
-        }
-        if (!patt.test(videoUrl)) {
-            let videoToolTip = this.localization.invalidVideoAddress;
-            if (isNil(videoUrl) || videoUrl === '') {
-                videoToolTip = this.localization.unconfiguredVideoAddress;
-            }
-            this.addVideoAddressToolTip(videoToolTip);
-            return;
-        }
-        const isAndroid = !!navigator.userAgent.match(/(Android)/i);
-        const isIos = !!navigator.userAgent.match(/(Mac)/i);
-        const currentRect = this.$element.find('rect#rect' + videoId).first();
-        if (!currentRect.length) {
-            return;
-        }
-        const clientRect = currentRect[0].getBoundingClientRect();
-        const chartWidth = clientRect.width;
-        const chartHeight = clientRect.height;
-        const left = this.model.location.x / this.guiSize.width * $('.' + this.svgRootClass).find('.svg-content').width();
-        const top = this.model.location.y / this.guiSize.height * $('.' + this.svgRootClass).find('.svg-content').height();
-        const scareX = this.model.location.x / this.guiSize.width;
-        const scareY = this.model.location.y / this.guiSize.height;
-        if (isIos) {
-            videoUrl = videoUrl + '#t=1';
-        }
-        const preload = isIos ? ' preload=\'metadata\'' : '';
-        let videoHtml = `<video scareX="${scareX}"
-                scareY="${scareY}" id="${videoId}" ${preload} src="${videoUrl}" width="${chartWidth}" height="${chartHeight}"
-                style="position: absolute;top:${top}px;left:${left}px;object-fit:fill;z-index:0;"
-                playsInline webkit-playsinline `;
-        if (this.isMobileMode) {
-            if (isAndroid) {
-                videoHtml += ' autoplay muted></video>';
+            this.isMobileType = result.isMobileType;
+            const isAndroid = !!navigator.userAgent.match(/(Android)/i);
+            let videoUrl = result.url;
+            const patt = /https:.+.m3u8/;
+            if (videoUrl.indexOf('http:') !== -1) {
+                videoUrl = videoUrl.replace('http:', 'https:');
             }
-            else {
-                videoHtml += ' controls muted></video>';
+            if (!patt.test(videoUrl)) {
+                let videoToolTip = this.localization.invalidVideoAddress;
+                if (isNil(videoUrl) || videoUrl === '') {
+                    videoToolTip = this.localization.unconfiguredVideoAddress;
+                }
+                this.addVideoAddressToolTip(videoToolTip);
+                return;
             }
-        }
-        else {
-            videoHtml += ' controls autoplay muted></video>';
-        }
-        $('.' + this.svgRootClass).find('.svg-content').append(videoHtml);
-        if (this.isShow === false) {
-            $('#' + this.videoId).hide();
-        }
-        setTimeout(() => {
-            if (isAndroid) {
-                this.setAndroidVideo(videoId);
+            const video = this.rootElement.append('foreignObject')
+                .attr('x', 0)
+                .attr('y', 0)
+                .attr('width', this.model.size.width)
+                .attr('height', this.model.size.height)
+                .append('xhtml:video')
+                .attr('id', this.videoId)
+                .attr('class', 'element-video')
+                .attr('scareX', this.model.location.x / this.guiSize.width)
+                .attr('scareY', this.model.location.y / this.guiSize.height)
+                .attr('src', videoUrl)
+                .style('width', '100%')
+                .style('height', '100%')
+                .style('object-fit', 'fill')
+                .attr('playsInline', true)
+                .attr('webkit-playsinline', true)
+                .attr('controls', true)
+                .attr('muted', true);
+            if (this.isMobileMode) {
+                if (isAndroid) {
+                    video.attr('autoplay', true);
+                }
             }
-            else if (isIos) {
-                this.setIosVideo(this.videoUrl, videoId);
+            else {
+                video.attr('autoplay', true);
             }
-            try {
-                this.videoPlayer = new EZUIPlayer(videoId);
+            if (this.isShow === false) {
+                $('#' + this.videoId).hide();
             }
-            catch (err) {
-                console.log(err);
+            this.videoPlayer = new EZUIPlayer(this.videoId);
+            if (isAndroid) {
+                setTimeout(() => {
+                    this.setAndroidVideo();
+                }, 500);
             }
-        }, 1000);
-        const style = document.createElement('style');
-        style.innerHTML = `#${videoId}::-webkit-media-controls-enclosure {
-            display: none;
-        }`;
-        document.head.append();
+        }).catch(() => {
+            throw new Error('Failure of the videoService');
+        });
     }
     addVideoAddressToolTip(videoToolTip) {
         const size = this.model.size;
@@ -146,69 +121,51 @@ export class VideoElement extends ConditionalDisplayElement {
         const textElement = new TextElementModal(videoToolTip, font, size.width, size.height);
         this.$element.append(textElement.Element);
     }
-    setAndroidVideo(videoId) {
-        const videoElement = $('#' + videoId);
-        let preHeight = videoElement.height();
-        let preWidth = videoElement.width();
-        let preTop = videoElement.css('top');
-        let preLeft = videoElement.css('left');
+    setAndroidVideo() {
         const { StatusBar } = window;
-        videoElement.on('click', () => {
-            if (!this.isFullscreen) {
-                if (StatusBar) {
-                    StatusBar.hide();
-                }
-                preHeight = videoElement.height();
-                preWidth = videoElement.width();
-                preTop = videoElement.css('top');
-                preLeft = videoElement.css('left');
-                const width = document.documentElement.clientWidth;
-                const height = document.documentElement.clientHeight;
-                videoElement.css('object-fit', 'contain');
-                videoElement.css('background', '#000000');
-                videoElement.css('width', width + 'px');
-                videoElement.css('height', height + 'px');
-                videoElement.css('left', '0px');
-                videoElement.css('top', '0px');
-                videoElement.css('z-index', '99');
-                videoElement.css('position', 'fixed');
-                this.isFullscreen = true;
-                try {
-                    screen.orientation.lock(screen.orientation.type);
-                }
-                catch (error) {
-                    console.error(error);
-                }
+        this.bindFullscreenEvent();
+        window.addEventListener('orientationchange', () => {
+            StatusBar.show();
+            this.hide();
+            clearTimeout(this.refreshTimer);
+            this.refreshTimer = null;
+            this.refreshTimer = setTimeout(() => {
+                this.init();
+                this.show();
+            }, 1000);
+        });
+    }
+    bindFullscreenEvent() {
+        const that = this;
+        const { StatusBar } = window;
+        $('#' + this.videoId).bind('webkitfullscreenchange', () => {
+            if (document.webkitIsFullScreen) {
+                $('#' + that.videoId).css({
+                    'object-fit': 'contain',
+                    'z-index': 99
+                });
+                StatusBar.hide();
             }
             else {
-                videoElement.css('object-fit', 'fill');
-                videoElement.css('width', preWidth + 'px');
-                videoElement.css('height', preHeight + 'px');
-                videoElement.css('left', preLeft);
-                videoElement.css('top', preTop);
-                videoElement.css('z-index', '0');
-                videoElement.css('position', 'absolute');
-                this.isFullscreen = false;
-                try {
-                    if (screen.orientation.type.includes('portrait')) {
-                        StatusBar.show();
-                    }
+                StatusBar.show();
+                if (that.isMobileType) {
+                    $('#' + this.videoId).css('object-fit', document.webkitIsFullScreen ? 'contain' : 'fill');
                 }
-                catch (error) {
-                    console.error(error);
+                else {
+                    clearTimeout(this.resetTimer);
+                    this.resetTimer = null;
+                    $('#' + this.videoId).css('display', 'none');
+                    this.resetTimer = setTimeout(() => {
+                        $('#' + this.videoId).css({
+                            'width': '100%',
+                            'height': '100%',
+                            'display': 'block',
+                            'z-index': 0,
+                            'object-fit': document.webkitIsFullScreen ? 'contain' : 'fill'
+                        });
+                    }, 1000);
                 }
             }
         });
     }
-    setIosVideo(videoUrl, videoId) {
-        const video = $('#' + this.videoId);
-        video.on('webkitendfullscreen', () => {
-            video.remove();
-            clearTimeout(this.refreshTimer);
-            this.refreshTimer = null;
-            this.refreshTimer = setTimeout(() => {
-                this.initVideo(videoUrl, videoId);
-            }, 500);
-        });
-    }
 }

package/elements/video/video-element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"VideoElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-display-element","name":"ConditionalDisplayElement","line":15,"character":34},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":27,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":28,"character":18},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":29,"character":27},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":30,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":31,"character":23},{"__symbolic":"reference","module":"../../service","name":"VideoService","line":32,"character":39},{"__symbolic":"reference","module":"../../model","name":"Size","line":33,"character":34},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","name":"string"}]}],"dispose":[{"__symbolic":"method"}],"hide":[{"__symbolic":"method"}],"show":[{"__symbolic":"method"}],"init":[{"__symbolic":"method"}],"initVideo":[{"__symbolic":"method"}],"addVideoAddressToolTip":[{"__symbolic":"method"}],"setAndroidVideo":[{"__symbolic":"method"}],"setIosVideo":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"VideoElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-display-element","name":"ConditionalDisplayElement","line":15,"character":34},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":27,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":28,"character":18},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":29,"character":27},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":30,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":31,"character":23},{"__symbolic":"reference","module":"../../service","name":"VideoService","line":32,"character":39},{"__symbolic":"reference","module":"../../model","name":"Size","line":33,"character":34},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","name":"string"}]}],"dispose":[{"__symbolic":"method"}],"hide":[{"__symbolic":"method"}],"show":[{"__symbolic":"method"}],"init":[{"__symbolic":"method"}],"addVideoAddressToolTip":[{"__symbolic":"method"}],"setAndroidVideo":[{"__symbolic":"method"}],"bindFullscreenEvent":[{"__symbolic":"method"}]}}}}]

package/elements/view-operation/view-operation.element.js

@@ -170,9 +170,6 @@ export class ViewOperationElement extends ConditionalEnableElement {
         const viewIndex = this.model.viewIndex;
         if (null != viewIndex) {
             this.popupViewService.popView(viewIndex, this.hostContainerId, this.el).subscribe(() => this.recordViewOperation(), error => this.logger.error(`ToggleView(${viewIndex}) failed. ${error}`));
-            $(`#${this.hostContainerId} video`)
-                .addClass('video-hidden')
-                .css('visibility', 'hidden');
         }
         else {
             this.logger.error('[GUI]Toggle View:invalid view index');
@@ -180,11 +177,6 @@ export class ViewOperationElement extends ConditionalEnableElement {
     }
     closeView() {
         this.popupViewService.closeView();
-        if ($(`#${this.hostContainerId} > svg > svg`).length === 0) {
-            $(`#${this.hostContainerId} .video-hidden`)
-                .removeClass('video-hidden')
-                .css('visibility', 'visible');
-        }
         this.recordViewOperation();
     }
     moveView(movementX, movementY) {

package/modal/write-value/write-value-modal.component.js

@@ -110,24 +110,13 @@ 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.Type !== 0) {
+            if ((valueTransform === null || valueTransform === void 0 ? void 0 : valueTransform.Type) !== 0) {
                 this.isNumericalOperation = true;
             }
             this.onClosed({
-                value: value,
-                showValue: showValue,
+                value, showValue,
                 enableNumericalOperation: this.enableNumericalOperation,
                 isNumericalOperation: this.isNumericalOperation,
                 variableRwType: result.variableRwType

package/model/historical-curve/historical-curve-chanel.model.d.ts

@@ -7,14 +7,6 @@ export interface HistroicalCurveChannelModel {
      * 连接线颜色
      */
     readonly connectorColor: string;
-    /**
-     * 启用标记点
-     */
-    readonly enablePoint: boolean;
-    /**
-     * 标记点颜色
-     */
-    readonly pointColor: string;
     /**
      * 是否投影颜色
      */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"main": "bundles/fc-gui.umd.js",
-	"version": "3.0.0-alpha.94",
+	"version": "3.0.0-alpha.96",
 	"module": "public_api.js",
 	"typings": "public_api.d.ts",
 	"license": "UNLICENSED",