@flexem/fc-gui 3.0.0-alpha.84 → 3.0.0-alpha.86

package/CHANGELOG.md

@@ -375,4 +375,15 @@
 ## 3.0.0-alpha.84(2023-05-11)
 ### Web端
 #### Bug Fix
-    1. FLEXCLOUD-2609 double类型数值输入元件无法写负数
+    1. FLEXCLOUD-2609 double类型数值输入元件无法写负数
+
+## 3.0.0-alpha.85(2023-05-11)
+### Web端
+#### Bug Fix
+    1. FLEXCLOUD-2609 double类型数值输入元件无法写负数
+    - 修改写值提示的格式
+
+## 3.0.0-alpha.86(2023-05-12)
+### Web端
+#### Bug Fix
+    1. FLEXCLOUD-2612 组态元件写值超时

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;
@@ -41759,7 +41765,7 @@ __decorate([
 WriteValueModalComponent = __decorate([
     Object(_angular_core__WEBPACK_IMPORTED_MODULE_0__["Component"])({
         selector: 'writeValueModal',
-        template: "<form #writeValueForm=\"ngForm\" novalidate (ngSubmit)=\"save()\" bs-modal-drag> <div class=\"modal-header\"> <h4 class=\"modal-title\"> <span>{{localization.setting}}</span> <span>{{variableName}}</span> </h4> <button type=\"button\" class=\"close pull-right\" aria-label=\"Close\" (click)=\"close()\"> <span aria-hidden=\"true\">&times;</span> </button> </div> <div class=\"modal-body\"> <span class=\"write-value-range\">{{localization.writeValueRange}}：&nbsp;{{writeValueRangeText}} <span *ngIf=\"valueType\">({{valueType}})</span> </span> <input type=\"text\" name=\"valueInput\" autoFocus class=\"form-control write-value\" [(ngModel)]=\"value\" (keyup)=\"validate($event)\" autocomplete=\"off\"> <span class=\"help-block text-danger\" [hidden]=\"!validationError\">{{validationErrorText}}</span> </div> <div class=\"modal-footer\"> <button type=\"submit\" class=\"btn md-skip btn-primary btn-block\" [disabled]=\"validationError || isSubmitting\"> <ng-container *ngIf=\"!isSubmitting\">{{localization.submit}}</ng-container> <ng-container *ngIf=\"isSubmitting\">{{localization.submitting}}</ng-container> </button> </div> </form> ",
+        template: "<form #writeValueForm=\"ngForm\" novalidate (ngSubmit)=\"save()\" bs-modal-drag> <div class=\"modal-header\"> <h4 class=\"modal-title\"> <span>{{localization.setting}}</span> <span>{{variableName}}</span> </h4> <button type=\"button\" class=\"close pull-right\" aria-label=\"Close\" (click)=\"close()\"> <span aria-hidden=\"true\">&times;</span> </button> </div> <div class=\"modal-body\"> <span class=\"write-value-range\">{{localization.writeValueRange}}：</span> <div class=\"write-value-range\"> {{writeValueRangeText}} <span *ngIf=\"valueType\">({{valueType}})</span> </div> <input type=\"text\" name=\"valueInput\" autoFocus class=\"form-control write-value\" [(ngModel)]=\"value\" (keyup)=\"validate($event)\" autocomplete=\"off\"> <span class=\"help-block text-danger\" [hidden]=\"!validationError\">{{validationErrorText}}</span> </div> <div class=\"modal-footer\"> <button type=\"submit\" class=\"btn md-skip btn-primary btn-block\" [disabled]=\"validationError || isSubmitting\"> <ng-container *ngIf=\"!isSubmitting\">{{localization.submit}}</ng-container> <ng-container *ngIf=\"isSubmitting\">{{localization.submitting}}</ng-container> </button> </div> </form> ",
         styles: [".modal-header { padding: 10px; border-color: transparent; } .modal-body { position: relative; padding: 0px 5px !important; padding-top: 10px !important; } .modal-title { display: unset; margin-left: -6px; font-size: 16px !important; } .form-control { margin: 0 5%; float: none; width: 90%; } .modal-footer { padding: 10px 4px 20px 5px !important; text-align: right; border-color: transparent; } .text-danger { display: block; color: #ed6b75; font-size: 14px; margin: 5px 0px 0px 15px; } .btn-primary { background-color: #3B97FC; border-color: #3B97FC; padding: 5px 30px; width: 90%; margin: 0 5%; height: 32px; } .write-value-range { color: #7f939e; font-size: 14px; margin-left: 15px; } .write-value { padding-left: 8px; margin-left: 16px; height: 32px; } "]
     }),
     __param(0, Object(_angular_core__WEBPACK_IMPORTED_MODULE_0__["Inject"])(_localization__WEBPACK_IMPORTED_MODULE_1__[/* LOCALIZATION */ "b"]))