@flexem/fc-gui 3.0.0-alpha.123 → 3.0.0-alpha.125

package/communication/variable/variable-communicator.d.ts

@@ -10,5 +10,7 @@ export interface VariableCommunicator {
     subscribeVariableState(variableName: string): Observable<VariableState>;
     subscribeVariableStates(variableNames: Array<string>): Observable<Array<VariableState>>;
     subscribeUserDeviceAlarms(appId: string): any;
+    registerSystemVariableHandler?(variableName: string, getValue: () => Promise<any>, setValue: (value: any) => Promise<void>): void;
+    notifySystemVariableChange?(variableName: string, value: any): void;
     dispose(): any;
 }

package/config/alarm/get-alarms-args.d.ts

@@ -5,5 +5,8 @@ export declare class GetAlarmsArgs {
     readonly triggeredEndTime: moment.Moment;
     readonly maxResultCount: number;
     readonly skipCount: number;
-    constructor(alarmNames: string[], triggeredStartTime: moment.Moment, triggeredEndTime: moment.Moment, maxResultCount: number, skipCount: number);
+    readonly state?: number[];
+    readonly sorting?: string;
+    constructor(alarmNames: string[], triggeredStartTime: moment.Moment, triggeredEndTime: moment.Moment, maxResultCount: number, skipCount: number, state?: number[], // 告警状态数组 (0=触发/未确认, 1=触发/已确认, 2=恢复/未确认, 3=恢复/已确认)
+    sorting?: string);
 }

package/config/alarm/get-alarms-args.js

@@ -1,9 +1,13 @@
 export class GetAlarmsArgs {
-    constructor(alarmNames, triggeredStartTime, triggeredEndTime, maxResultCount, skipCount) {
+    constructor(alarmNames, triggeredStartTime, triggeredEndTime, maxResultCount, skipCount, state, // 告警状态数组 (0=触发/未确认, 1=触发/已确认, 2=恢复/未确认, 3=恢复/已确认)
+    sorting // 排序字段 (如: "TriggeredTime DESC" 或 "TriggeredTime ASC")
+    ) {
         this.alarmNames = alarmNames;
         this.triggeredStartTime = triggeredStartTime;
         this.triggeredEndTime = triggeredEndTime;
         this.maxResultCount = maxResultCount;
         this.skipCount = skipCount;
+        this.state = state;
+        this.sorting = sorting;
     }
 }

package/config/alarm/get-alarms-args.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"GetAlarmsArgs":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","name":"string"}]},{"__symbolic":"reference","module":"moment","name":"Moment","line":5,"character":37},{"__symbolic":"reference","module":"moment","name":"Moment","line":6,"character":35},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"number"}]}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"GetAlarmsArgs":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","name":"string"}]},{"__symbolic":"reference","module":"moment","name":"Moment","line":5,"character":37},{"__symbolic":"reference","module":"moment","name":"Moment","line":6,"character":35},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","name":"number"}]},{"__symbolic":"reference","name":"string"}]}]}}}}]

package/config/history-data/get-history-data-args.d.ts

@@ -1,5 +1,14 @@
 import * as moment from 'moment';
 import { HistoricalCurveTimeRange } from './historical-curve.time-range';
+/**
+ * 单个历史数据条目查询参数
+ */
+export interface HistoryDataItemArgs {
+    /** 历史数据条目名称 */
+    dataItemName: string;
+    /** 该条目下的通道名称列表 */
+    channelNames: Array<string>;
+}
 export declare class GetHistoryDataArgs {
     readonly dataSourceCode: number;
     readonly dataItemName: string;
@@ -8,15 +17,17 @@ export declare class GetHistoryDataArgs {
     readonly endTime: moment.Moment;
     readonly limit: number;
     readonly rangeType: HistoricalCurveTimeRange;
+    readonly historyDataItems?: Array<HistoryDataItemArgs>;
     /**
      * 获取历史数据参数
      * @param dataSourceCode 数据源编码
-     * @param dataItemName 历史数据条目名称
-     * @param channelNames 通道名称
+     * @param dataItemName 历史数据条目名称（单条目模式，兼容旧版）
+     * @param channelNames 通道名称（单条目模式，兼容旧版）
      * @param startTime 开始时间
      * @param endTime 结束时间
      * @param limit 获取数据数量，为负数则倒叙
      * @param rangeType 区间类型
+     * @param historyDataItems 多条目模式：多个历史数据条目及其通道配置
      */
-    constructor(dataSourceCode: number, dataItemName: string, channelNames: Array<string>, startTime: moment.Moment, endTime: moment.Moment, limit: number, rangeType: HistoricalCurveTimeRange);
+    constructor(dataSourceCode: number, dataItemName: string, channelNames: Array<string>, startTime: moment.Moment, endTime: moment.Moment, limit: number, rangeType: HistoricalCurveTimeRange, historyDataItems?: Array<HistoryDataItemArgs>);
 }

package/config/history-data/get-history-data-args.js

@@ -2,14 +2,15 @@ export class GetHistoryDataArgs {
     /**
      * 获取历史数据参数
      * @param dataSourceCode 数据源编码
-     * @param dataItemName 历史数据条目名称
-     * @param channelNames 通道名称
+     * @param dataItemName 历史数据条目名称（单条目模式，兼容旧版）
+     * @param channelNames 通道名称（单条目模式，兼容旧版）
      * @param startTime 开始时间
      * @param endTime 结束时间
      * @param limit 获取数据数量，为负数则倒叙
      * @param rangeType 区间类型
+     * @param historyDataItems 多条目模式：多个历史数据条目及其通道配置
      */
-    constructor(dataSourceCode, dataItemName, channelNames, startTime, endTime, limit, rangeType) {
+    constructor(dataSourceCode, dataItemName, channelNames, startTime, endTime, limit, rangeType, historyDataItems) {
         this.dataSourceCode = dataSourceCode;
         this.dataItemName = dataItemName;
         this.channelNames = channelNames;
@@ -17,5 +18,6 @@ export class GetHistoryDataArgs {
         this.endTime = endTime;
         this.limit = limit;
         this.rangeType = rangeType;
+        this.historyDataItems = historyDataItems;
     }
 }

package/config/history-data/get-history-data-args.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"GetHistoryDataArgs":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","name":"string"}]},{"__symbolic":"reference","module":"moment","name":"Moment","line":17,"character":28},{"__symbolic":"reference","module":"moment","name":"Moment","line":18,"character":26},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","module":"./historical-curve.time-range","name":"HistoricalCurveTimeRange","line":20,"character":28}]}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"HistoryDataItemArgs":{"__symbolic":"interface"},"GetHistoryDataArgs":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","name":"any"}]},{"__symbolic":"reference","module":"moment","name":"Moment","line":28,"character":28},{"__symbolic":"reference","module":"moment","name":"Moment","line":29,"character":26},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","module":"./historical-curve.time-range","name":"HistoricalCurveTimeRange","line":31,"character":28},{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","name":"any"}]}]}]}}}}]

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

@@ -1,16 +1,20 @@
 import { Injector } from '@angular/core';
-import { PermissionChecker } from '../../service';
+import { PermissionChecker, SystemTextLibraryService, LanguageService } from '../../service';
 import { VariableCommunicator } from '../../communication';
 import { ConditionalDisplayElement } from '../base/conditional-display-element';
 import { AlarmModel } from '../../model/alarm/alarm.model';
 import { AlarmsStore, VariableStore } from '../../config';
+import { GuiContext } from '../../gui/gui-context';
 export declare class AlarmElement extends ConditionalDisplayElement {
     private readonly alarmsStore;
+    private readonly systemTextLibraryService?;
+    private readonly languageService?;
+    private readonly guiContext?;
     readonly model: AlarmModel;
     private readonly logger;
     readonly variableCommunicator: VariableCommunicator;
-    private readonly localization;
     private readonly timePeriods;
+    private languageChangeSubscription?;
     private elementStatus;
     private element;
     private refreshIntervalId;
@@ -25,9 +29,30 @@ export declare class AlarmElement extends ConditionalDisplayElement {
     private totalCount;
     private pageSize;
     private getAlarmDataId;
-    constructor(element: HTMLElement, injector: Injector, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, alarmsStore: AlarmsStore, signalRAppId: string);
+    constructor(element: HTMLElement, injector: Injector, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, alarmsStore: AlarmsStore, signalRAppId: string, systemTextLibraryService?: SystemTextLibraryService, languageService?: LanguageService, guiContext?: GuiContext);
     dispose(): void;
+    /**
+     * 订阅语种变化事件
+     */
+    private subscribeLanguageChange;
+    /**
+     * 更新语种相关的文案（表头和时间段选择器）
+     */
+    private updateLanguageTexts;
+    /**
+     * 获取当前语种的 culture 代码
+     */
+    private getCurrentCulture;
+    /**
+     * 根据列索引获取表头翻译（从系统文本库获取多语种翻译）
+     * 固定4项表头，按列索引顺序：告警名称、告警内容、告警等级、时间
+     */
+    private getHeaderTextByColumn;
     private getValidTimePeriods;
+    /**
+     * 获取时间段文案（从系统文本库获取多语种翻译）
+     */
+    private getTimePeriodText;
     private getAlarmData;
     private renderElement;
     private renderOperationArea;

package/elements/alarm/alarm-element.js

@@ -1,19 +1,22 @@
 import * as d3 from 'd3';
+import { SYSTEM_TEXT_LIBRARY_TYPES, ALARM_TABLE_HEADER_KEYS, TIME_PERIOD_KEYS } from '../../service';
 import { ConditionalDisplayElement } from '../base/conditional-display-element';
 import { GetAlarmsArgs } from '../../config';
 import * as moment from 'moment';
 import { LOGGER_SERVICE_TOKEN } from '../../logger';
-import { LOCALIZATION } from '../../localization';
 var AlaertElementStatus;
 (function (AlaertElementStatus) {
     AlaertElementStatus[AlaertElementStatus["Normal"] = 0] = "Normal";
     AlaertElementStatus[AlaertElementStatus["Loading"] = 1] = "Loading"; // 加载中
 })(AlaertElementStatus || (AlaertElementStatus = {}));
 export class AlarmElement extends ConditionalDisplayElement {
-    constructor(element, injector, permissionChecker, variableCommunicator, variableStore, alarmsStore, signalRAppId) {
+    constructor(element, injector, permissionChecker, variableCommunicator, variableStore, alarmsStore, signalRAppId, systemTextLibraryService, languageService, guiContext) {
         var _a;
         super(element, permissionChecker, variableCommunicator, variableStore, signalRAppId);
         this.alarmsStore = alarmsStore;
+        this.systemTextLibraryService = systemTextLibraryService;
+        this.languageService = languageService;
+        this.guiContext = guiContext;
         this.elementStatus = AlaertElementStatus.Loading;
         this.displayOption = {
             dataLimit: 500,
@@ -37,11 +40,12 @@ export class AlarmElement extends ConditionalDisplayElement {
         this.rootElement.selectAll('*').remove();
         this.setStatusAsLoading();
         this.logger = injector.get(LOGGER_SERVICE_TOKEN);
-        this.localization = injector.get(LOCALIZATION);
         this.variableCommunicator = variableCommunicator;
         this.timePeriods = this.getValidTimePeriods();
         this.pageSize = this.model.generalSetting.pageSize;
         localStorage.setItem('simulate-time', moment().valueOf() + '');
+        // 订阅语种变化事件
+        this.subscribeLanguageChange();
         if (this.model.filterSetting) {
             this.alarmNames = this.model.filterSetting.detailsData.map(item => item.name);
             this.currentTimePeriod = (_a = this.model.filterSetting) === null || _a === void 0 ? void 0 : _a.displayPeriod;
@@ -75,19 +79,125 @@ export class AlarmElement extends ConditionalDisplayElement {
         if (this.element) {
             this.element.tooltip.hidden(true);
         }
+        // 取消语种变化订阅
+        if (this.languageChangeSubscription) {
+            this.languageChangeSubscription.unsubscribe();
+            this.languageChangeSubscription = undefined;
+        }
         this.logger.debug(`[GUI]Dispose Alarm Table Refresh Interval:${d3.time.format('%x %X')(new Date())}`);
     }
+    /**
+     * 订阅语种变化事件
+     */
+    subscribeLanguageChange() {
+        if (this.guiContext && this.guiContext.languageChanged$) {
+            this.languageChangeSubscription = this.guiContext.languageChanged$.subscribe(() => {
+                // 只更新文案，不重新查询数据
+                this.updateLanguageTexts();
+            });
+        }
+    }
+    /**
+     * 更新语种相关的文案（表头和时间段选择器）
+     */
+    updateLanguageTexts() {
+        var _a;
+        // 更新表头文本
+        const headerCells = this.$element.find('table th');
+        for (let col = 0; col < 4 && col < headerCells.length; col++) {
+            headerCells.eq(col).text(this.getHeaderTextByColumn(col));
+        }
+        // 更新时间段选择器选项
+        if ((_a = this.model.filterSetting) === null || _a === void 0 ? void 0 : _a.alarmType) {
+            const selectElement = this.rootElement.select('select');
+            if (!selectElement.empty()) {
+                // 重新生成时间段数据
+                const updatedTimePeriods = this.getValidTimePeriods();
+                // 更新选项文本
+                const options = selectElement.selectAll('option');
+                options.each(function (_d, i) {
+                    if (i < updatedTimePeriods.length) {
+                        d3.select(this).text(updatedTimePeriods[i].name);
+                    }
+                });
+            }
+        }
+    }
+    /**
+     * 获取当前语种的 culture 代码
+     */
+    getCurrentCulture() {
+        var _a, _b, _c, _e, _f, _g;
+        // 获取当前语种ID
+        const currentLanguageId = (_c = (_b = (_a = this.guiContext) === null || _a === void 0 ? void 0 : _a.getCurrentLanguageId) === null || _b === void 0 ? void 0 : _b.call(_a)) !== null && _c !== void 0 ? _c : null;
+        // 确定要使用的语种代码（culture）
+        const defaultLanguage = ((_e = this.languageService) === null || _e === void 0 ? void 0 : _e.getDefaultLanguage()) || 'zh-CN';
+        if (currentLanguageId === null || currentLanguageId === undefined) {
+            // 设备未设置当前语种，使用默认语种
+            return defaultLanguage;
+        }
+        else {
+            // 设备已设置当前语种，获取对应的语种代码
+            const currentLanguage = (_g = (_f = this.guiContext) === null || _f === void 0 ? void 0 : _f.getLanguageCultureById) === null || _g === void 0 ? void 0 : _g.call(_f, currentLanguageId);
+            if (currentLanguage) {
+                return currentLanguage;
+            }
+            else {
+                // 无法获取语种代码，使用默认语种
+                return defaultLanguage;
+            }
+        }
+    }
+    /**
+     * 根据列索引获取表头翻译（从系统文本库获取多语种翻译）
+     * 固定4项表头，按列索引顺序：告警名称、告警内容、告警等级、时间
+     */
+    getHeaderTextByColumn(columnIndex) {
+        if (columnIndex < 0 || columnIndex > 3) {
+            return '';
+        }
+        const currentCulture = this.getCurrentCulture();
+        const systemType = SYSTEM_TEXT_LIBRARY_TYPES.COMPONENT_BUILTIN;
+        const headerKeys = [
+            ALARM_TABLE_HEADER_KEYS.ALARM_NAME,
+            ALARM_TABLE_HEADER_KEYS.ALARM_MESSAGE,
+            ALARM_TABLE_HEADER_KEYS.ALARM_LEVEL,
+            ALARM_TABLE_HEADER_KEYS.TIME
+        ];
+        // 尝试从系统文本库获取翻译
+        if (this.systemTextLibraryService) {
+            const translation = this.systemTextLibraryService.getSystemTextValue(systemType, headerKeys[columnIndex], currentCulture);
+            if (translation) {
+                return translation;
+            }
+        }
+        return '';
+    }
     getValidTimePeriods() {
         const timePeriods = new Array();
-        timePeriods.push({ key: 6, name: this.localization.lastThirtyMinutes });
-        timePeriods.push({ key: 1, name: this.localization.lastOneHour });
-        timePeriods.push({ key: 7, name: this.localization.lastEightHour });
-        timePeriods.push({ key: 2, name: this.localization.lastTwentyFourHours });
-        timePeriods.push({ key: 3, name: this.localization.lastSevenDays });
-        timePeriods.push({ key: 4, name: this.localization.lastThirtyDays });
-        timePeriods.push({ key: 5, name: this.localization.lastOneYear });
+        timePeriods.push({ key: 6, name: this.getTimePeriodText(TIME_PERIOD_KEYS.LAST_THIRTY_MINUTES) });
+        timePeriods.push({ key: 1, name: this.getTimePeriodText(TIME_PERIOD_KEYS.LAST_ONE_HOUR) });
+        timePeriods.push({ key: 7, name: this.getTimePeriodText(TIME_PERIOD_KEYS.LAST_EIGHT_HOURS) });
+        timePeriods.push({ key: 2, name: this.getTimePeriodText(TIME_PERIOD_KEYS.LAST_TWENTY_FOUR_HOURS) });
+        timePeriods.push({ key: 3, name: this.getTimePeriodText(TIME_PERIOD_KEYS.LAST_SEVEN_DAYS) });
+        timePeriods.push({ key: 4, name: this.getTimePeriodText(TIME_PERIOD_KEYS.LAST_THIRTY_DAYS) });
+        timePeriods.push({ key: 5, name: this.getTimePeriodText(TIME_PERIOD_KEYS.LAST_ONE_YEAR) });
         return timePeriods;
     }
+    /**
+     * 获取时间段文案（从系统文本库获取多语种翻译）
+     */
+    getTimePeriodText(textKey) {
+        const currentCulture = this.getCurrentCulture();
+        const systemType = SYSTEM_TEXT_LIBRARY_TYPES.COMPONENT_BUILTIN;
+        if (this.systemTextLibraryService) {
+            const translation = this.systemTextLibraryService.getSystemTextValue(systemType, textKey, currentCulture);
+            if (translation) {
+                return translation;
+            }
+        }
+        return '';
+    }
     getAlarmData() {
         this.rootElement.selectAll('*').remove();
         this.setStatusAsLoading();
@@ -157,13 +267,13 @@ export class AlarmElement extends ConditionalDisplayElement {
             text-align: ${this.model.generalSetting.headerFont.textAlign};
             ${this.model.generalSetting.headerFont.isUnderline ? 'text-decoration: underline' : ''};
             vertical-align: middle;`;
-        for (let row = 0; row < 4; row++) {
+        for (let col = 0; col < 4; col++) {
             const th = document.createElement('th');
-            th.innerHTML = this.model.columLabels[row];
-            th.style.cssText = `width: ${this.model.widths[row] / this.model.size.width * 100}%;
+            th.innerHTML = this.getHeaderTextByColumn(col);
+            th.style.cssText = `width: ${this.model.widths[col] / this.model.size.width * 100}%;
                 border-style: solid;
                 border-color: ${this.model.generalSetting.splitLine};
-                border-left-width: ${!row || this.model.generalSetting.isHiddenColumnSplitLine ? 0 : 1}px;`;
+                border-left-width: ${!col || this.model.generalSetting.isHiddenColumnSplitLine ? 0 : 1}px;`;
             tr.appendChild(th);
         }
         table.appendChild(tr);

package/elements/alarm/alarm-element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"AlarmElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-display-element","name":"ConditionalDisplayElement","line":20,"character":34},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":54,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":55,"character":18},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":56,"character":27},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":57,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":58,"character":23},{"__symbolic":"reference","module":"../../config","name":"AlarmsStore","line":59,"character":38},{"__symbolic":"reference","name":"string"}]}],"dispose":[{"__symbolic":"method"}],"getValidTimePeriods":[{"__symbolic":"method"}],"getAlarmData":[{"__symbolic":"method"}],"renderElement":[{"__symbolic":"method"}],"renderOperationArea":[{"__symbolic":"method"}],"updateTimeRange":[{"__symbolic":"method"}],"updateQueryTimeRange":[{"__symbolic":"method"}],"loadFirstPage":[{"__symbolic":"method"}],"loadNextPage":[{"__symbolic":"method"}],"loadPreviousPage":[{"__symbolic":"method"}],"loadLastPage":[{"__symbolic":"method"}],"setStatusAsNormal":[{"__symbolic":"method"}],"setStatusAsLoading":[{"__symbolic":"method"}],"renderStatus":[{"__symbolic":"method"}],"clearStatus":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"AlarmElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-display-element","name":"ConditionalDisplayElement","line":21,"character":34},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":55,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":56,"character":18},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":57,"character":27},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":58,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":59,"character":23},{"__symbolic":"reference","module":"../../config","name":"AlarmsStore","line":60,"character":38},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"../../service","name":"SystemTextLibraryService","line":62,"character":52},{"__symbolic":"reference","module":"../../service","name":"LanguageService","line":63,"character":43},{"__symbolic":"reference","module":"../../gui/gui-context","name":"GuiContext","line":64,"character":38}]}],"dispose":[{"__symbolic":"method"}],"subscribeLanguageChange":[{"__symbolic":"method"}],"updateLanguageTexts":[{"__symbolic":"method"}],"getCurrentCulture":[{"__symbolic":"method"}],"getHeaderTextByColumn":[{"__symbolic":"method"}],"getValidTimePeriods":[{"__symbolic":"method"}],"getTimePeriodText":[{"__symbolic":"method"}],"getAlarmData":[{"__symbolic":"method"}],"renderElement":[{"__symbolic":"method"}],"renderOperationArea":[{"__symbolic":"method"}],"updateTimeRange":[{"__symbolic":"method"}],"updateQueryTimeRange":[{"__symbolic":"method"}],"loadFirstPage":[{"__symbolic":"method"}],"loadNextPage":[{"__symbolic":"method"}],"loadPreviousPage":[{"__symbolic":"method"}],"loadLastPage":[{"__symbolic":"method"}],"setStatusAsNormal":[{"__symbolic":"method"}],"setStatusAsLoading":[{"__symbolic":"method"}],"renderStatus":[{"__symbolic":"method"}],"clearStatus":[{"__symbolic":"method"}]}}}}]

package/elements/base/readable-element.js

@@ -79,11 +79,7 @@ export class ReadableElement extends ConditionalEnableElement {
                 this.changeStates();
             }
         });
-        if (value.systemName !== '设备状态' && (this.state === State.Normal || this.state === State.Disable
-            || value.variableName === this.minVariableName
-            || value.variableName === this.maxVariableName)) {
-            this.updateVariableValue(value.value, value.variableName);
-        }
+        // 处理系统变量"设备状态"
         if (value.systemName === '设备状态') {
             let name = value.customStatus;
             const language = ((_b = (_a = window.abp.localization) === null || _a === void 0 ? void 0 : _a.currentLanguage) === null || _b === void 0 ? void 0 : _b.name) || ((_d = (_c = this.localization.localizationService) === null || _c === void 0 ? void 0 : _c.translate) === null || _d === void 0 ? void 0 : _d.currentLang);
@@ -106,6 +102,19 @@ export class ReadableElement extends ConditionalEnableElement {
                 }
             }
             this.updateVariableValue(name, '设备状态');
+            return; // 处理完"设备状态"后直接返回
+        }
+        // 处理系统变量"当前语种ID"
+        if (value.variableName === '当前语种ID') {
+            // 直接使用变量值（数字或null）
+            this.updateVariableValue(value.value, value.variableName);
+            return;
+        }
+        // 处理普通变量
+        if (this.state === State.Normal || this.state === State.Disable
+            || value.variableName === this.minVariableName
+            || value.variableName === this.maxVariableName) {
+            this.updateVariableValue(value.value, value.variableName);
         }
     }
 }

package/elements/base/state-control-element.js

@@ -139,8 +139,8 @@ export class StateControlElement extends ConditionalDynamicDisplayElement {
         if (!this.currentRect.length) {
             return;
         }
-        // 元件绑定设备状态时不需要在右上角显示状态
-        if (this.$element[0].dataset.model.includes('设备状态'))
+        // 元件绑定设备状态或当前语种ID时不需要在右上角显示状态
+        if (this.$element[0].dataset.model.includes('设备状态') || this.$element[0].dataset.model.includes('当前语种ID'))
             return;
         const document = this.$element[0].ownerDocument;
         const imgObj = document.createElementNS('http://www.w3.org/2000/svg', 'image');

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

@@ -1,15 +1,20 @@
 import { VariableCommunicator } from '../../communication';
 import { HistoryDataStore, VariableStore } from '../../config';
 import { HistoricalCurveModel } from '../../model/historical-curve/historical-curve.model';
-import { PermissionChecker } from '../../service';
+import { PermissionChecker, SystemTextLibraryService, LanguageService } from '../../service';
 import { ConditionalDisplayElement } from '../base/conditional-display-element';
 import { Injector } from '@angular/core';
+import { GuiContext } from '../../gui/gui-context';
 export declare class HistoricalCurveElement extends ConditionalDisplayElement {
     private readonly historyDataStore;
+    private readonly systemTextLibraryService?;
+    private readonly languageService?;
+    private readonly guiContext?;
     readonly model: HistoricalCurveModel;
     private readonly logger;
     private readonly localization;
     private readonly timePeriods;
+    private languageChangeSubscription?;
     private readonly displayOption;
     /**
      * 当前时间段的开始时间
@@ -37,15 +42,32 @@ export declare class HistoricalCurveElement extends ConditionalDisplayElement {
     private resizeEventListener;
     private isAndroid;
     private needResize;
-    constructor(element: HTMLElement, injector: Injector, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, historyDataStore: HistoryDataStore, signalRAppId: string);
+    constructor(element: HTMLElement, injector: Injector, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, historyDataStore: HistoryDataStore, signalRAppId: string, systemTextLibraryService?: SystemTextLibraryService, languageService?: LanguageService, guiContext?: GuiContext);
     dispose(): void;
     private initKeyboardListener;
     private setNeedResize;
+    /**
+     * 订阅语种变化事件
+     */
+    private subscribeLanguageChange;
+    /**
+     * 更新语种相关的文案（时间段选择器）
+     */
+    private updateLanguageTexts;
+    /**
+     * 获取当前语种的 culture 代码
+     */
+    private getCurrentCulture;
     private getValidTimePeriods;
+    /**
+     * 获取时间段文案（从系统文本库获取多语种翻译）
+     */
+    private getTimePeriodText;
     private updateTimeRange;
     private updateQueryTimeRange;
     private reRenderElement;
     private renderElement;
+    private handleQueryResult;
     setupTooltipAutoHide(chart: any): void;
     private renderChart;
     initPoint(): void;