@flexem/fc-gui 3.0.0-alpha.128 → 3.0.0-alpha.129
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/@flexem/fc-gui.umd.js +13 -6
- package/bundles/@flexem/fc-gui.umd.js.map +1 -1
- package/bundles/@flexem/fc-gui.umd.min.js +1 -1
- package/bundles/@flexem/fc-gui.umd.min.js.map +1 -1
- package/elements/alarm/alarm-element.d.ts +1 -1
- package/elements/alarm/alarm-element.js +2 -1
- package/elements/historical-curve/historical-curve.element.d.ts +1 -1
- package/elements/historical-curve/historical-curve.element.js +2 -1
- package/elements/numerical-display/numerical-display-element.js +9 -4
- package/package.json +1 -1
|
@@ -37131,7 +37131,6 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
|
|
|
37131
37131
|
};
|
|
37132
37132
|
this.logger = injector.get(logger["b" /* LOGGER_SERVICE_TOKEN */]);
|
|
37133
37133
|
this.localization = injector.get(_tmp_localization["b" /* LOCALIZATION */]);
|
|
37134
|
-
this.timePeriods = this.getValidTimePeriods();
|
|
37135
37134
|
this.updateTimeRange(this.model.displaySetting.displayTimePeriod);
|
|
37136
37135
|
this.refreshIntervalId = setInterval(() => {
|
|
37137
37136
|
this.loadFirstPage();
|
|
@@ -37198,6 +37197,7 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
|
|
|
37198
37197
|
if (!selectElement.empty()) {
|
|
37199
37198
|
// 重新生成时间段数据
|
|
37200
37199
|
const updatedTimePeriods = this.getValidTimePeriods();
|
|
37200
|
+
this.timePeriods = updatedTimePeriods;
|
|
37201
37201
|
// 更新选项文本
|
|
37202
37202
|
const options = selectElement.selectAll('option');
|
|
37203
37203
|
options.each(function (_d, i) {
|
|
@@ -37322,6 +37322,7 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
|
|
|
37322
37322
|
}
|
|
37323
37323
|
}
|
|
37324
37324
|
handleQueryResult(result) {
|
|
37325
|
+
this.timePeriods = this.getValidTimePeriods();
|
|
37325
37326
|
// 【新格式】多条目模式下的错误处理
|
|
37326
37327
|
if (result.historyDataItems && result.historyDataItems.length > 0) {
|
|
37327
37328
|
// 只要有条目正常返回(即使没有数据),就走正常逻辑
|
|
@@ -38291,6 +38292,14 @@ class numerical_display_element_NumericalDisplayElement extends readable_element
|
|
|
38291
38292
|
this.recordValue = result.value;
|
|
38292
38293
|
const writeValue = this.dataTypeService.formatToDecimal(this.model.version, result.value, this.model.dataType);
|
|
38293
38294
|
this.showValue = result.showValue;
|
|
38295
|
+
// 如果是系统变量"当前语种ID",只更新显示,不执行变量写入和操作记录
|
|
38296
|
+
if (this.writeVariableName === '当前语种ID') {
|
|
38297
|
+
// 直接更新显示值
|
|
38298
|
+
this.displayText = this.showValue;
|
|
38299
|
+
this.updateDisplayText(this.formatDisplayTextUnit(this.displayText));
|
|
38300
|
+
this.writeValueMmodalRef.hide();
|
|
38301
|
+
return;
|
|
38302
|
+
}
|
|
38294
38303
|
if (this.displayText !== this.showValue || result.variableRwType === variableRwTypeEnum.witer) {
|
|
38295
38304
|
if (this.numericalOperation || result.enableNumericalOperation || result.isNumericalOperation || result.variableRwType === variableRwTypeEnum.witer) {
|
|
38296
38305
|
this.recordOperation(result.value);
|
|
@@ -38307,10 +38316,7 @@ class numerical_display_element_NumericalDisplayElement extends readable_element
|
|
|
38307
38316
|
}
|
|
38308
38317
|
}, 30000);
|
|
38309
38318
|
}
|
|
38310
|
-
|
|
38311
|
-
if (this.writeVariableName !== '当前语种ID') {
|
|
38312
|
-
this.variableCommunicator.write(this.writeVariableName, writeValue).subscribe();
|
|
38313
|
-
}
|
|
38319
|
+
this.variableCommunicator.write(this.writeVariableName, writeValue).subscribe();
|
|
38314
38320
|
}
|
|
38315
38321
|
else {
|
|
38316
38322
|
this.writeValueMmodalRef.hide();
|
|
@@ -41738,7 +41744,6 @@ class alarm_element_AlarmElement extends conditional_display_element_Conditional
|
|
|
41738
41744
|
this.setStatusAsLoading();
|
|
41739
41745
|
this.logger = injector.get(logger["b" /* LOGGER_SERVICE_TOKEN */]);
|
|
41740
41746
|
this.variableCommunicator = variableCommunicator;
|
|
41741
|
-
this.timePeriods = this.getValidTimePeriods();
|
|
41742
41747
|
this.pageSize = this.model.generalSetting.pageSize;
|
|
41743
41748
|
localStorage.setItem('simulate-time', moment().valueOf() + '');
|
|
41744
41749
|
// 订阅语种变化事件
|
|
@@ -41810,6 +41815,7 @@ class alarm_element_AlarmElement extends conditional_display_element_Conditional
|
|
|
41810
41815
|
if (!selectElement.empty()) {
|
|
41811
41816
|
// 重新生成时间段数据
|
|
41812
41817
|
const updatedTimePeriods = this.getValidTimePeriods();
|
|
41818
|
+
this.timePeriods = updatedTimePeriods;
|
|
41813
41819
|
// 更新选项文本
|
|
41814
41820
|
const options = selectElement.selectAll('option');
|
|
41815
41821
|
options.each(function (_d, i) {
|
|
@@ -41900,6 +41906,7 @@ class alarm_element_AlarmElement extends conditional_display_element_Conditional
|
|
|
41900
41906
|
this.setStatusAsLoading();
|
|
41901
41907
|
clearTimeout(this.getAlarmDataId);
|
|
41902
41908
|
this.getAlarmDataId = setTimeout(() => {
|
|
41909
|
+
this.timePeriods = this.getValidTimePeriods();
|
|
41903
41910
|
if (this.model.filterSetting.alarmType) {
|
|
41904
41911
|
this.updateQueryTimeRange();
|
|
41905
41912
|
const input = new _tmp_config["c" /* GetAlarmsArgs */](this.alarmNames, this.startTime, this.endTime, this.pageSize, this.page * this.pageSize);
|