@flexem/fc-gui 3.0.0-alpha.85 → 3.0.0-alpha.87

package/CHANGELOG.md

@@ -381,4 +381,14 @@
 ### Web端
 #### Bug Fix
     1. FLEXCLOUD-2609 double类型数值输入元件无法写负数
-    - 修改写值提示的格式
+    - 修改写值提示的格式
+
+## 3.0.0-alpha.86(2023-05-12)
+### Web端
+#### Bug Fix
+    1. FLEXCLOUD-2612 组态元件写值超时
+
+## 3.0.0-alpha.8(2023-05-31)
+### Web端
+#### Bug Fix
+    1. FLEXCLOUD-2698 【app-ios】视频元件放大后缩小不应占满整个组态

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

@@ -37160,14 +37160,17 @@ class numerical_display_element_NumericalDisplayElement extends readable_element
                 this.recordValue = result.value;
                 const writeValue = this.dataTypeService.formatToDecimal(this.model.version, result.value, this.model.dataType);
                 this.showValue = result.showValue;
-                if (this.displayText.toString().toUpperCase() !== this.showValue.toString().toUpperCase() || result.variableRwType === variableRwTypeEnum.witer) {
+                if (this.displayText !== this.showValue || result.variableRwType === variableRwTypeEnum.witer) {
                     if (this.numericalOperation || result.enableNumericalOperation || result.isNumericalOperation || result.variableRwType === variableRwTypeEnum.witer) {
                         this.recordOperation(result.value);
                         this.writeValueMmodalRef.hide();
                     }
                     else {
                         this.restorationTimer = setTimeout(() => {
-                            if (this.displayText.toString().toUpperCase() !== this.showValue.toString().toUpperCase()) {
+                            const isEquation = this.model.fractionDigits ?
+                                parseFloat(this.displayText) === parseFloat(this.showValue) :
+                                parseInt(this.displayText, 16) === parseInt(this.showValue, 16);
+                            if (!isEquation) {
                                 this.writeValueMmodalRef.content.isSubmitting = false;
                                 this.writeValueMmodalRef.content.showValidationErrorInfo(this.localization.writeValueTimeout);
                             }
@@ -37207,7 +37210,10 @@ class numerical_display_element_NumericalDisplayElement extends readable_element
     updateVariableValue(value) {
         var _a;
         const displayText = this.formatNumericalDisplayText(this.model.dataType, this.model.fractionDigits, value);
-        if (((_a = this.writeValueMmodalRef) === null || _a === void 0 ? void 0 : _a.content) && displayText.toString().toUpperCase() === this.showValue.toString().toUpperCase()) {
+        const isEquation = this.model.fractionDigits ?
+            parseFloat(displayText) === parseFloat(this.showValue) :
+            parseInt(displayText, 16) === parseInt(this.showValue, 16);
+        if (((_a = this.writeValueMmodalRef) === null || _a === void 0 ? void 0 : _a.content) && isEquation) {
             if (this.restorationTimer) {
                 clearTimeout(this.restorationTimer);
                 this.restorationTimer = undefined;
@@ -39498,6 +39504,7 @@ class video_element_VideoElement extends conditional_display_element_Conditional
         this.videoService.getVideoUrl(this.model.videoTag).then(result => {
             this.isMobileType = result.isMobileType;
             const isAndroid = !!navigator.userAgent.match(/(Android)/i);
+            const isIos = !!navigator.userAgent.match(/(Mac)/i);
             let videoUrl = result.url;
             const patt = /https:.+.m3u8/;
             if (videoUrl.indexOf('http:') !== -1) {
@@ -39511,6 +39518,7 @@ class video_element_VideoElement extends conditional_display_element_Conditional
                 this.addVideoAddressToolTip(videoToolTip);
                 return;
             }
+            this.rootElement.attr('id', this.videoId + '-box');
             const video = this.rootElement.append('foreignObject')
                 .attr('x', 0)
                 .attr('y', 0)
@@ -39540,6 +39548,32 @@ class video_element_VideoElement extends conditional_display_element_Conditional
             if (this.isShow === false) {
                 $('#' + this.videoId).hide();
             }
+            if (isIos) {
+                const gElement = document.getElementById(this.videoId + '-box');
+                this.clientRect = this.clientRect || gElement.getBoundingClientRect();
+                const svgElement = document.querySelector('.svg-content > svg');
+                const svgClientRect = svgElement.getBoundingClientRect();
+                svgElement.style.overflow = 'visible';
+                const x = svgElement.clientWidth / this.clientRect.width;
+                const y = svgElement.clientHeight / this.clientRect.height;
+                this.rootElement.style('transform', `scale(${x}, ${y})`);
+                this.rootElement.style('transform-origin', 'left top');
+                video.style('z-index', 0);
+                setTimeout(() => {
+                    this.videoClientRect = document.getElementById(this.videoId).getBoundingClientRect();
+                    video.style('position', 'absolute');
+                    video.style('left', this.clientRect.left + 'px');
+                    video.style('top', this.clientRect.top - svgClientRect.top + 'px');
+                    video.style('transform', `scale(${this.clientRect.width / this.videoClientRect.width}, ${this.clientRect.height / this.videoClientRect.height})`);
+                    video.style('transform-origin', 'left top');
+                }, 300);
+                $('#' + this.videoId).bind('webkitendfullscreen', () => {
+                    setTimeout(() => {
+                        video.style('width', this.videoClientRect.width + 'px');
+                        video.style('height', this.videoClientRect.height + 'px');
+                    }, 1000);
+                });
+            }
             this.videoPlayer = new EZUIPlayer(this.videoId);
             if (isAndroid) {
                 setTimeout(() => {