@flexem/fc-gui 3.0.0-alpha.128 → 3.0.0-alpha.129

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

@@ -13,7 +13,7 @@ export declare class AlarmElement extends ConditionalDisplayElement {
     readonly model: AlarmModel;
     private readonly logger;
     readonly variableCommunicator: VariableCommunicator;
-    private readonly timePeriods;
+    private timePeriods;
     private languageChangeSubscription?;
     private elementStatus;
     private element;

package/elements/alarm/alarm-element.js

@@ -41,7 +41,6 @@ export class AlarmElement extends ConditionalDisplayElement {
         this.setStatusAsLoading();
         this.logger = injector.get(LOGGER_SERVICE_TOKEN);
         this.variableCommunicator = variableCommunicator;
-        this.timePeriods = this.getValidTimePeriods();
         this.pageSize = this.model.generalSetting.pageSize;
         localStorage.setItem('simulate-time', moment().valueOf() + '');
         // 订阅语种变化事件
@@ -113,6 +112,7 @@ export class AlarmElement extends ConditionalDisplayElement {
             if (!selectElement.empty()) {
                 // 重新生成时间段数据
                 const updatedTimePeriods = this.getValidTimePeriods();
+                this.timePeriods = updatedTimePeriods;
                 // 更新选项文本
                 const options = selectElement.selectAll('option');
                 options.each(function (_d, i) {
@@ -203,6 +203,7 @@ export class AlarmElement extends ConditionalDisplayElement {
         this.setStatusAsLoading();
         clearTimeout(this.getAlarmDataId);
         this.getAlarmDataId = setTimeout(() => {
+            this.timePeriods = this.getValidTimePeriods();
             if (this.model.filterSetting.alarmType) {
                 this.updateQueryTimeRange();
                 const input = new GetAlarmsArgs(this.alarmNames, this.startTime, this.endTime, this.pageSize, this.page * this.pageSize);

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

@@ -13,7 +13,7 @@ export declare class HistoricalCurveElement extends ConditionalDisplayElement {
     readonly model: HistoricalCurveModel;
     private readonly logger;
     private readonly localization;
-    private readonly timePeriods;
+    private timePeriods;
     private languageChangeSubscription?;
     private readonly displayOption;
     /**

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

@@ -41,7 +41,6 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
         };
         this.logger = injector.get(LOGGER_SERVICE_TOKEN);
         this.localization = injector.get(LOCALIZATION);
-        this.timePeriods = this.getValidTimePeriods();
         this.updateTimeRange(this.model.displaySetting.displayTimePeriod);
         this.refreshIntervalId = setInterval(() => {
             this.loadFirstPage();
@@ -108,6 +107,7 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
         if (!selectElement.empty()) {
             // 重新生成时间段数据
             const updatedTimePeriods = this.getValidTimePeriods();
+            this.timePeriods = updatedTimePeriods;
             // 更新选项文本
             const options = selectElement.selectAll('option');
             options.each(function (_d, i) {
@@ -232,6 +232,7 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
         }
     }
     handleQueryResult(result) {
+        this.timePeriods = this.getValidTimePeriods();
         // 【新格式】多条目模式下的错误处理
         if (result.historyDataItems && result.historyDataItems.length > 0) {
             // 只要有条目正常返回(即使没有数据),就走正常逻辑

package/elements/numerical-display/numerical-display-element.js

@@ -213,6 +213,14 @@ export class NumericalDisplayElement extends ReadableElement {
                 this.recordValue = result.value;
                 const writeValue = this.dataTypeService.formatToDecimal(this.model.version, result.value, this.model.dataType);
                 this.showValue = result.showValue;
+                // 如果是系统变量"当前语种ID"，只更新显示，不执行变量写入和操作记录
+                if (this.writeVariableName === '当前语种ID') {
+                    // 直接更新显示值
+                    this.displayText = this.showValue;
+                    this.updateDisplayText(this.formatDisplayTextUnit(this.displayText));
+                    this.writeValueMmodalRef.hide();
+                    return;
+                }
                 if (this.displayText !== this.showValue || result.variableRwType === variableRwTypeEnum.witer) {
                     if (this.numericalOperation || result.enableNumericalOperation || result.isNumericalOperation || result.variableRwType === variableRwTypeEnum.witer) {
                         this.recordOperation(result.value);
@@ -229,10 +237,7 @@ export class NumericalDisplayElement extends ReadableElement {
                             }
                         }, 30000);
                     }
-                    // 如果是系统变量"当前语种ID"，跳过写值操作（已在 handleCurrentLanguageIdSave 中处理）
-                    if (this.writeVariableName !== '当前语种ID') {
-                        this.variableCommunicator.write(this.writeVariableName, writeValue).subscribe();
-                    }
+                    this.variableCommunicator.write(this.writeVariableName, writeValue).subscribe();
                 }
                 else {
                     this.writeValueMmodalRef.hide();

package/package.json

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