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

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

@@ -153,28 +153,34 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
     }
     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');
+            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];
-                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 (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++) {
-                            if (j && $(pointList[j]).attr('transform').split(',')[1] !== $(pointList[j - 1]).attr('transform').split(',')[1]) {
+                            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) {
-                                    pointList[j].setAttribute('style', pointStyle);
-                                    pointList[j - 1].setAttribute('style', pointStyle);
+                                    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);
                                 }
                             }
                         }
@@ -207,6 +213,13 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
         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);
         });
@@ -253,11 +266,18 @@ 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();
-                }, 1);
+                }, 100);
                 if (this.currentTimePeriod === 3 || this.currentTimePeriod === 4 || this.currentTimePeriod === 5) {
                     return this.timeFormat(d, '%y-%m-%d');
                 }

package/elements/video/video-element.js

@@ -113,7 +113,12 @@ export class VideoElement extends ConditionalDisplayElement {
             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 {

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

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

package/package.json

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