@flexem/fc-gui 3.0.0-alpha.41 → 3.0.0-alpha.43

package/CHANGELOG.md

@@ -174,4 +174,14 @@
 ## 3.0.0-alpha.41(2022-10-20)
 ### Web端
 #### Features
-    1. FLEXCLOUD-2296：组态页面点击刷新后不显示历史曲线组件
+    1. FLEXCLOUD-2296：组态页面点击刷新后不显示历史曲线组件
+
+## 3.0.0-alpha.42(2022-10-20)
+### Web端
+#### Features
+    1. 修改历史曲线图设置刻度字体方式
+
+## 3.0.0-alpha.43(2022-10-20)
+### Web端
+#### Features
+    1. FLEXCLOUD-2312: fink设备写值异常

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

@@ -26980,17 +26980,17 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
             chart.update();
             this.rootElement.selectAll('.nv-noData').attr('x', chartWidth / 2).attr('y', chartHeight / 2 + this.displayOption.operationAreaHeight);
         });
-        const fontSize = ((_b = (_a = this.model.displaySetting.axisSetting) === null || _a === void 0 ? void 0 : _a.axisLabelFont) === null || _b === void 0 ? void 0 : _b.fontSize) || '12px';
+        const fontSize = (_b = (_a = this.model.displaySetting.axisSetting) === null || _a === void 0 ? void 0 : _a.axisLabelFont) === null || _b === void 0 ? void 0 : _b.fontSize;
         this.rootElement.selectAll('.domain').style('stroke-opacity', 1);
         if (this.model.displaySetting.showAxis && this.model.displaySetting.axisSetting) {
             const axisColor = this.model.displaySetting.axisSetting.axisColor;
             this.rootElement.selectAll('.domain').style('stroke', axisColor);
-            if (this.model.displaySetting.axisSetting.showAxisLabel) {
+            if (fontSize && this.model.displaySetting.axisSetting.showAxisLabel) {
                 this.rootElement.selectAll('.nv-axisMaxMin').select('text').style('font-size', fontSize);
             }
         }
-        const self = this;
-        if (self.currentTimePeriod === 3 || self.currentTimePeriod === 4 || self.currentTimePeriod === 5) {
+        if (fontSize && this.currentTimePeriod === 3 || this.currentTimePeriod === 4 || this.currentTimePeriod === 5) {
+            const self = this;
             this.rootElement
                 .selectAll('.nv-x')
                 .selectAll('.tick')
@@ -27546,11 +27546,13 @@ class numerical_display_element_NumericalDisplayElement extends readable_element
         });
         this.writeValueMmodalRef.content.onClosed = (result) => {
             if (result) {
-                this.writeValue = this.dataTypeService.formatToDecimal(this.model.version, result.value, this.model.dataType);
-                if (this.displayText.toString() !== this.writeValue) {
-                    this.variableCommunicator.write(this.writeVariableName, this.writeValue).subscribe();
+                const writeValue = this.dataTypeService.formatToDecimal(this.model.version, result.value, this.model.dataType);
+                this.writeValue = writeValue;
+                this.originalValue = result.originalValue;
+                if (this.displayText.toString() !== this.originalValue) {
+                    this.variableCommunicator.write(this.writeVariableName, writeValue).subscribe();
                     setTimeout(() => {
-                        if (this.displayText.toString() !== this.writeValue) {
+                        if (this.displayText.toString() !== this.originalValue) {
                             this.writeValueMmodalRef.content.isSubmitting = false;
                             this.writeValueMmodalRef.content.showValidationErrorInfo(this.localization.writeValueTimeout);
                         }
@@ -27589,7 +27591,7 @@ class numerical_display_element_NumericalDisplayElement extends readable_element
         var _a;
         this.displayText = this.formatNumericalDisplayText(this.model.dataType, this.model.fractionDigits, value);
         this.updateDisplayText(this.formatDisplayTextUnit(this.displayText));
-        if (((_a = this.writeValueMmodalRef) === null || _a === void 0 ? void 0 : _a.content) && this.displayText.toString() === this.writeValue) {
+        if (((_a = this.writeValueMmodalRef) === null || _a === void 0 ? void 0 : _a.content) && this.displayText.toString() === this.originalValue) {
             this.writeValueMmodalRef.hide();
             this.writeValueMmodalRef.content.hideValidationErrorInfo();
             this.recordOperation(this.writeValue);
@@ -41182,6 +41184,7 @@ let WriteValueModalComponent = class WriteValueModalComponent {
     }
     save() {
         this.isSubmitting = true;
+        const originalValue = this.value;
         if (this.args.enableDataParsed) {
             if (this.enableNumericalOperation) {
                 this.value = this.numericalOperationService.getWriteValue(this.args.version, this.value, this.numericalOperation, this.dataType, this.fractionDigits);
@@ -41190,7 +41193,7 @@ let WriteValueModalComponent = class WriteValueModalComponent {
                 this.value = this.formatWriteValue();
             }
         }
-        this.onClosed({ value: this.value });
+        this.onClosed({ value: this.value, originalValue });
     }
     close() {
         this.bsModalRef.hide();