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

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,15 +1,16 @@
 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';
 export declare class AlarmElement extends ConditionalDisplayElement {
     private readonly alarmsStore;
+    private readonly systemTextLibraryService?;
+    private readonly languageService?;
     readonly model: AlarmModel;
     private readonly logger;
     readonly variableCommunicator: VariableCommunicator;
-    private readonly localization;
     private readonly timePeriods;
     private elementStatus;
     private element;
@@ -25,9 +26,18 @@ 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);
     dispose(): void;
+    /**
+     * 根据列索引获取表头翻译（从系统文本库获取多语种翻译）
+     * 固定4项表头，按列索引顺序：告警名称、告警内容、告警等级、时间
+     */
+    private getHeaderTextByColumn;
     private getValidTimePeriods;
+    /**
+     * 获取时间段文案（从系统文本库获取多语种翻译，fallback 使用 localization）
+     */
+    private getTimePeriodText;
     private getAlarmData;
     private renderElement;
     private renderOperationArea;

package/elements/alarm/alarm-element.js

@@ -1,19 +1,21 @@
 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) {
         var _a;
         super(element, permissionChecker, variableCommunicator, variableStore, signalRAppId);
         this.alarmsStore = alarmsStore;
+        this.systemTextLibraryService = systemTextLibraryService;
+        this.languageService = languageService;
         this.elementStatus = AlaertElementStatus.Loading;
         this.displayOption = {
             dataLimit: 500,
@@ -37,7 +39,6 @@ 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;
@@ -77,17 +78,58 @@ export class AlarmElement extends ConditionalDisplayElement {
         }
         this.logger.debug(`[GUI]Dispose Alarm Table Refresh Interval:${d3.time.format('%x %X')(new Date())}`);
     }
+    /**
+     * 根据列索引获取表头翻译（从系统文本库获取多语种翻译）
+     * 固定4项表头，按列索引顺序：告警名称、告警内容、告警等级、时间
+     */
+    getHeaderTextByColumn(columnIndex) {
+        var _a;
+        if (columnIndex < 0 || columnIndex > 3) {
+            return '';
+        }
+        const currentCulture = ((_a = this.languageService) === null || _a === void 0 ? void 0 : _a.getDefaultLanguage()) || 'zh-CN';
+        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;
     }
+    /**
+     * 获取时间段文案（从系统文本库获取多语种翻译，fallback 使用 localization）
+     */
+    getTimePeriodText(textKey) {
+        var _a;
+        const currentCulture = ((_a = this.languageService) === null || _a === void 0 ? void 0 : _a.getDefaultLanguage()) || 'zh-CN';
+        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 +199,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":19,"character":34},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":52,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":53,"character":18},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":54,"character":27},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":55,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":56,"character":23},{"__symbolic":"reference","module":"../../config","name":"AlarmsStore","line":57,"character":38},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"../../service","name":"SystemTextLibraryService","line":59,"character":52},{"__symbolic":"reference","module":"../../service","name":"LanguageService","line":60,"character":43}]}],"dispose":[{"__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/historical-curve/historical-curve.element.d.ts

@@ -1,11 +1,13 @@
 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';
 export declare class HistoricalCurveElement extends ConditionalDisplayElement {
     private readonly historyDataStore;
+    private readonly systemTextLibraryService?;
+    private readonly languageService?;
     readonly model: HistoricalCurveModel;
     private readonly logger;
     private readonly localization;
@@ -37,15 +39,20 @@ 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);
     dispose(): void;
     private initKeyboardListener;
     private setNeedResize;
     private getValidTimePeriods;
+    /**
+     * 获取时间段文案（从系统文本库获取多语种翻译，fallback 使用 localization）
+     */
+    private getTimePeriodText;
     private updateTimeRange;
     private updateQueryTimeRange;
     private reRenderElement;
     private renderElement;
+    private handleQueryResult;
     setupTooltipAutoHide(chart: any): void;
     private renderChart;
     initPoint(): void;

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

@@ -5,6 +5,7 @@ import * as nv from 'nvd3';
 import { GetHistoryDataArgs } from '../../config';
 import { HistoricalCurveTimeRange } from '../../config/history-data/historical-curve.time-range';
 import { LOCALIZATION } from '../../localization';
+import { SYSTEM_TEXT_LIBRARY_TYPES, TIME_PERIOD_KEYS } from '../../service';
 import { ConditionalDisplayElement } from '../base/conditional-display-element';
 import { HistoricalCurveElementStatus } from './historical-curve-element-status';
 import { LOGGER_SERVICE_TOKEN } from '../../logger';
@@ -12,9 +13,11 @@ import { GlobalSettings, DisplayMode } from '../../settings';
 import { CurveType } from '../../model/historical-curve/curve-type';
 import { AxisRangeType } from '../../model/historical-curve/historical-curve-axis-settings';
 export class HistoricalCurveElement extends ConditionalDisplayElement {
-    constructor(element, injector, permissionChecker, variableCommunicator, variableStore, historyDataStore, signalRAppId) {
+    constructor(element, injector, permissionChecker, variableCommunicator, variableStore, historyDataStore, signalRAppId, systemTextLibraryService, languageService) {
         super(element, permissionChecker, variableCommunicator, variableStore, signalRAppId);
         this.historyDataStore = historyDataStore;
+        this.systemTextLibraryService = systemTextLibraryService;
+        this.languageService = languageService;
         this.displayOption = {
             dataLimit: 500,
             dataZoomHeight: 32,
@@ -80,15 +83,30 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
     }
     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;
     }
+    /**
+     * 获取时间段文案（从系统文本库获取多语种翻译，fallback 使用 localization）
+     */
+    getTimePeriodText(textKey) {
+        var _a;
+        const currentCulture = ((_a = this.languageService) === null || _a === void 0 ? void 0 : _a.getDefaultLanguage()) || 'zh-CN';
+        const systemType = SYSTEM_TEXT_LIBRARY_TYPES.COMPONENT_BUILTIN;
+        if (this.systemTextLibraryService) {
+            const translation = this.systemTextLibraryService.getSystemTextValue(systemType, textKey, currentCulture);
+            if (translation) {
+                return translation;
+            }
+        }
+        return '';
+    }
     updateTimeRange(timePeriodType) {
         this.currentTimePeriod = +timePeriodType;
         this.updateQueryTimeRange();
@@ -127,30 +145,50 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
         if (!this.model.dataSetting) {
             return;
         }
-        const dataItemName = this.model.dataSetting.dataName;
         const dataSourceCode = this.model.dataSetting.dataSourceCode;
-        const channelNames = this.model.dataSetting.channels.map(c => c.name);
         this.updateElementStatus(HistoricalCurveElementStatus.Loading);
-        const input = new GetHistoryDataArgs(dataSourceCode, dataItemName, channelNames, startTime, endTime, limit, rangeType);
-        this.historyDataStore.getHistoryData(input).subscribe(result => {
-            if (result.error) {
-                this.updateElementStatus(HistoricalCurveElementStatus.LoadFailed, result.error);
+        // 【新格式】如果有多条目配置，使用多条目查询
+        if (this.model.dataSetting.dataItems && this.model.dataSetting.dataItems.length > 0) {
+            const historyDataItems = this.model.dataSetting.dataItems.map(item => ({
+                dataItemName: item.dataName,
+                channelNames: item.channels.map(c => c.name)
+            }));
+            // 使用第一个条目的信息作为兼容参数
+            const firstItem = this.model.dataSetting.dataItems[0];
+            const input = new GetHistoryDataArgs(dataSourceCode, firstItem.dataName, firstItem.channels.map(c => c.name), startTime, endTime, limit, rangeType, historyDataItems // 传递多条目参数
+            );
+            this.historyDataStore.getHistoryData(input).subscribe(result => {
+                this.handleQueryResult(result);
+            });
+        }
+        // 【旧格式】单条目模式
+        else {
+            const dataItemName = this.model.dataSetting.dataName;
+            const channelNames = this.model.dataSetting.channels.map(c => c.name);
+            const input = new GetHistoryDataArgs(dataSourceCode, dataItemName, channelNames, startTime, endTime, limit, rangeType);
+            this.historyDataStore.getHistoryData(input).subscribe(result => {
+                this.handleQueryResult(result);
+            });
+        }
+    }
+    handleQueryResult(result) {
+        if (result.error) {
+            this.updateElementStatus(HistoricalCurveElementStatus.LoadFailed, result.error);
+        }
+        else {
+            this.clearStatus();
+            if (result.isUnbind) {
+                this.updateElementStatus(HistoricalCurveElementStatus.Unbound);
             }
             else {
-                this.clearStatus();
-                if (result.isUnbind) {
-                    this.updateElementStatus(HistoricalCurveElementStatus.Unbound);
-                }
-                else {
-                    this.updateElementStatus(HistoricalCurveElementStatus.Normal);
-                }
-                if (result.values.length) {
-                    this.currentStartTime = moment(first(result.values).time);
-                    this.currentEndTime = moment(last(result.values).time);
-                }
-                this.chartElement = this.renderChart(result.values);
+                this.updateElementStatus(HistoricalCurveElementStatus.Normal);
             }
-        });
+            if (result.values.length) {
+                this.currentStartTime = moment(first(result.values).time);
+                this.currentEndTime = moment(last(result.values).time);
+            }
+            this.chartElement = this.renderChart(result.values);
+        }
     }
     setupTooltipAutoHide(chart) {
         const chartContainer = this.rootElement.select('.nv-focus').node();
@@ -178,11 +216,31 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
         const chartWidth = this.model.displaySetting.size.width;
         const chartHeight = this.model.displaySetting.size.height - this.displayOption.operationAreaHeight - this.displayOption.operationAreaMarginTop;
         const data = new Array();
-        each(this.model.dataSetting.channels, (channel, key) => {
-            const values = new Array();
-            each(result, v => values.push({ x: moment(v.time).local().toDate().valueOf(), y: v.values[key] }));
-            data.push({ key: channel.name, area: channel.projectEnabled, values: values });
-        });
+        // 【新格式】多条目模式：曲线名称使用"条目名-通道名"格式
+        if (this.model.dataSetting.dataItems && this.model.dataSetting.dataItems.length > 0) {
+            let channelIndex = 0;
+            each(this.model.dataSetting.dataItems, dataItem => {
+                each(dataItem.channels, channel => {
+                    const values = new Array();
+                    each(result, v => values.push({ x: moment(v.time).local().toDate().valueOf(), y: v.values[channelIndex] }));
+                    // 使用"条目名-通道名"格式
+                    const displayName = `${dataItem.dataName}-${channel.name}`;
+                    data.push({ key: displayName, area: channel.projectEnabled, values: values });
+                    channelIndex++;
+                });
+            });
+        }
+        // 【旧格式】单条目模式：同样使用"条目名-通道名"格式
+        else {
+            const dataItemName = this.model.dataSetting.dataName;
+            each(this.model.dataSetting.channels, (channel, key) => {
+                const values = new Array();
+                each(result, v => values.push({ x: moment(v.time).local().toDate().valueOf(), y: v.values[key] }));
+                // 使用"条目名-通道名"格式
+                const displayName = `${dataItemName}-${channel.name}`;
+                data.push({ key: displayName, area: channel.projectEnabled, values: values });
+            });
+        }
         this.data = data;
         nv.addGraph(() => {
             let chart;
@@ -203,8 +261,22 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
                 .find('.nv-legend')
                 .find('.nv-series');
             let hiddenCount = 0;
+            // 获取所有通道（支持多条目和单条目模式）
+            const allChannels = [];
+            if (this.model.dataSetting.dataItems && this.model.dataSetting.dataItems.length > 0) {
+                // 【新格式】多条目模式：收集所有条目的所有通道
+                each(this.model.dataSetting.dataItems, dataItem => {
+                    each(dataItem.channels, channel => {
+                        allChannels.push(channel);
+                    });
+                });
+            }
+            else {
+                // 【旧格式】单条目模式
+                allChannels.push(...this.model.dataSetting.channels);
+            }
             for (let i = 0; i < this.data.length; i++) {
-                const channel = this.model.dataSetting.channels[i];
+                const channel = allChannels[i];
                 if (legendList.eq(i).children().eq(0).css('fill-opacity') === '1') {
                     const pointList = this.$element
                         .find('.nv-scatterWrap')
@@ -346,7 +418,21 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
         }
         chart.width(chartWidth);
         chart.height(chartHeight);
-        chart.color(this.model.dataSetting.channels.map(c => c.connectorColor));
+        // 获取所有通道的颜色（支持多条目和单条目模式）
+        let channelColors = [];
+        if (this.model.dataSetting.dataItems && this.model.dataSetting.dataItems.length > 0) {
+            // 【新格式】多条目模式：收集所有条目的所有通道颜色
+            each(this.model.dataSetting.dataItems, dataItem => {
+                each(dataItem.channels, channel => {
+                    channelColors.push(channel.connectorColor);
+                });
+            });
+        }
+        else {
+            // 【旧格式】单条目模式
+            channelColors = this.model.dataSetting.channels.map(c => c.connectorColor);
+        }
+        chart.color(channelColors);
         this.rootElement.append('g').datum(data).call(chart);
         this.rootElement.selectAll('.nv-noData').attr('x', chartWidth / 2).attr('y', chartHeight / 2 + this.displayOption.operationAreaHeight);
         this.resizeEventListener = nv.utils.windowResize(() => {

package/elements/historical-curve/historical-curve.element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"HistoricalCurveElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-display-element","name":"ConditionalDisplayElement","line":21,"character":44},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":68,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":69,"character":18},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":70,"character":27},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":71,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":72,"character":23},{"__symbolic":"reference","module":"../../config","name":"HistoryDataStore","line":73,"character":43},{"__symbolic":"reference","name":"string"}]}],"dispose":[{"__symbolic":"method"}],"initKeyboardListener":[{"__symbolic":"method"}],"getValidTimePeriods":[{"__symbolic":"method"}],"updateTimeRange":[{"__symbolic":"method"}],"updateQueryTimeRange":[{"__symbolic":"method"}],"reRenderElement":[{"__symbolic":"method"}],"renderElement":[{"__symbolic":"method"}],"setupTooltipAutoHide":[{"__symbolic":"method"}],"renderChart":[{"__symbolic":"method"}],"initPoint":[{"__symbolic":"method"}],"getLineChart":[{"__symbolic":"method"}],"getMultiBarWithFocusChart":[{"__symbolic":"method"}],"renderCommonProperty":[{"__symbolic":"method"}],"renderOperationArea":[{"__symbolic":"method"}],"timeFormat":[{"__symbolic":"method"}],"loadFirstPage":[{"__symbolic":"method"}],"loadNextPage":[{"__symbolic":"method"}],"loadPreviousPage":[{"__symbolic":"method"}],"loadLastPage":[{"__symbolic":"method"}],"initElementStatus":[{"__symbolic":"method"}],"updateElementStatus":[{"__symbolic":"method"}],"setStatusAsUnbound":[{"__symbolic":"method"}],"setStatusAsLoading":[{"__symbolic":"method"}],"setStatusAsLoadFailed":[{"__symbolic":"method"}],"renderStatus":[{"__symbolic":"method"}],"clearStatus":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"HistoricalCurveElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-display-element","name":"ConditionalDisplayElement","line":21,"character":44},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":68,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":69,"character":18},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":70,"character":27},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":71,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":72,"character":23},{"__symbolic":"reference","module":"../../config","name":"HistoryDataStore","line":73,"character":43},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"../../service","name":"SystemTextLibraryService","line":75,"character":52},{"__symbolic":"reference","module":"../../service","name":"LanguageService","line":76,"character":43}]}],"dispose":[{"__symbolic":"method"}],"initKeyboardListener":[{"__symbolic":"method"}],"getValidTimePeriods":[{"__symbolic":"method"}],"getTimePeriodText":[{"__symbolic":"method"}],"updateTimeRange":[{"__symbolic":"method"}],"updateQueryTimeRange":[{"__symbolic":"method"}],"reRenderElement":[{"__symbolic":"method"}],"renderElement":[{"__symbolic":"method"}],"handleQueryResult":[{"__symbolic":"method"}],"setupTooltipAutoHide":[{"__symbolic":"method"}],"renderChart":[{"__symbolic":"method"}],"initPoint":[{"__symbolic":"method"}],"getLineChart":[{"__symbolic":"method"}],"getMultiBarWithFocusChart":[{"__symbolic":"method"}],"renderCommonProperty":[{"__symbolic":"method"}],"renderOperationArea":[{"__symbolic":"method"}],"timeFormat":[{"__symbolic":"method"}],"loadFirstPage":[{"__symbolic":"method"}],"loadNextPage":[{"__symbolic":"method"}],"loadPreviousPage":[{"__symbolic":"method"}],"loadLastPage":[{"__symbolic":"method"}],"initElementStatus":[{"__symbolic":"method"}],"updateElementStatus":[{"__symbolic":"method"}],"setStatusAsUnbound":[{"__symbolic":"method"}],"setStatusAsLoading":[{"__symbolic":"method"}],"setStatusAsLoadFailed":[{"__symbolic":"method"}],"renderStatus":[{"__symbolic":"method"}],"clearStatus":[{"__symbolic":"method"}]}}}}]

package/elements/main-element.js

@@ -29,6 +29,7 @@ import { VideoElement } from './video/video-element';
 import { WeatherElement } from './weather/weater-element';
 import { AirQualityElement } from './air-quality/air-quality-element';
 import { AlarmElement } from './alarm/alarm-element';
+import { ScrollAlarmElement } from './scroll-alarm/scroll-alarm-element';
 export class MainElement {
     constructor(injector, bsModalService, context, variableCommunicator, popupViewService, signalRAppId) {
         this.injector = injector;
@@ -73,7 +74,7 @@ export class MainElement {
                     this.elements.push(new PipeElement(element, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.injector.get(LOCALIZATION), this.signalRAppId));
                     break;
                 case GuiConsts.components.switchIndicatorLightKey:
-                    this.elements.push(new SwitchIndicatorLightElement(element, this.injector, this.bsModalService, this.variableCommunicator, this.context.configStore.graphStore, this.context.permissionChecker, this.context.operationRecordService, this.context.securityChecker, this.context.configStore.variableStore, this.injector.get(LOCALIZATION), this.signalRAppId));
+                    this.elements.push(new SwitchIndicatorLightElement(element, this.injector, this.bsModalService, this.variableCommunicator, this.context.configStore.graphStore, this.context.permissionChecker, this.context.operationRecordService, this.context.securityChecker, this.context.configStore.variableStore, this.injector.get(LOCALIZATION), this.signalRAppId, this.context.textLibraryService, this.context.languageService));
                     break;
                 case GuiConsts.components.barGraphKey:
                     this.elements.push(new BarGraphElement(element, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.injector.get(LOCALIZATION), this.signalRAppId));
@@ -86,10 +87,10 @@ export class MainElement {
                     this.elements.push(new CharacterDisplayElement(element, this.injector, this.bsModalService, this.variableCommunicator, this.context.configStore.graphStore, this.context.permissionChecker, this.context.operationRecordService, this.context.securityChecker, this.context.configStore.variableStore, this.injector.get(LOCALIZATION), this.signalRAppId));
                     break;
                 case GuiConsts.components.textKey:
-                    this.elements.push(new TextElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.graphStore, this.signalRAppId));
+                    this.elements.push(new TextElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.graphStore, this.signalRAppId, this.context.textLibraryService, this.context.languageService));
                     break;
                 case GuiConsts.components.hyperlinkKey:
-                    this.elements.push(new HyperlinkElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.graphStore, this.signalRAppId));
+                    this.elements.push(new HyperlinkElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.graphStore, this.signalRAppId, this.context.textLibraryService, this.context.languageService));
                     break;
                 case GuiConsts.components.straightLineKey:
                     this.elements.push(new StraightLineElement(element, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.signalRAppId));
@@ -110,7 +111,7 @@ export class MainElement {
                     this.elements.push(new DatetimeDisplayElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.graphStore, this.signalRAppId));
                     break;
                 case GuiConsts.components.historicalCurveKey:
-                    this.elements.push(new HistoricalCurveElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.historyDataStore, this.signalRAppId));
+                    this.elements.push(new HistoricalCurveElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.historyDataStore, this.signalRAppId, this.context.systemTextLibraryService, this.context.languageService));
                     break;
                 case GuiConsts.components.ringGraphKey:
                     this.elements.push(new RingGraphElement(element, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.injector.get(LOCALIZATION), this.signalRAppId));
@@ -131,7 +132,10 @@ export class MainElement {
                     this.elements.push(new AirQualityElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.weatherService, this.signalRAppId));
                     break;
                 case GuiConsts.components.alarmKey:
-                    this.elements.push(new AlarmElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.alarmsStore, this.signalRAppId));
+                    this.elements.push(new AlarmElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.alarmsStore, this.signalRAppId, this.context.systemTextLibraryService, this.context.languageService));
+                    break;
+                case GuiConsts.components.scrollAlarmKey:
+                    this.elements.push(new ScrollAlarmElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.alarmsStore, this.signalRAppId));
                     break;
             }
         });
@@ -298,7 +302,7 @@ export class MainElement {
         each(this.elements, e => {
             if (e instanceof HistoricalCurveElement || e instanceof VideoElement
                 || e instanceof WeatherElement || e instanceof NumericalDisplayElement || e instanceof TextElement
-                || e instanceof AirQualityElement || e instanceof SwitchIndicatorLightElement) {
+                || e instanceof AirQualityElement || e instanceof ScrollAlarmElement) {
                 e.dispose();
             }
         });

package/elements/main-element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"MainElement":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":55,"character":43},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":56,"character":41},{"__symbolic":"reference","module":"../gui/gui-context","name":"GuiContext","line":57,"character":34},{"__symbolic":"reference","module":"../communication","name":"VariableCommunicator","line":58,"character":47},{"__symbolic":"reference","module":"../view/popup-view.service","name":"PopupViewService","line":59,"character":43},null]}],"load":[{"__symbolic":"method"}],"uniformStretch":[{"__symbolic":"method"}],"changeVideoStyle":[{"__symbolic":"method"}],"horizontalStretch":[{"__symbolic":"method"}],"initElementState":[{"__symbolic":"method"}],"getVariableNames":[{"__symbolic":"method"}],"reportVariableStates":[{"__symbolic":"method"}],"getVirtualDeviceIdFromRect":[{"__symbolic":"method"}],"reportVariableValues":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}],"checkIsLoaded":[{"__symbolic":"method"}],"initBackground":[{"__symbolic":"method"}],"getImageEl":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"MainElement":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":56,"character":43},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":57,"character":41},{"__symbolic":"reference","module":"../gui/gui-context","name":"GuiContext","line":58,"character":34},{"__symbolic":"reference","module":"../communication","name":"VariableCommunicator","line":59,"character":47},{"__symbolic":"reference","module":"../view/popup-view.service","name":"PopupViewService","line":60,"character":43},null]}],"load":[{"__symbolic":"method"}],"uniformStretch":[{"__symbolic":"method"}],"changeVideoStyle":[{"__symbolic":"method"}],"horizontalStretch":[{"__symbolic":"method"}],"initElementState":[{"__symbolic":"method"}],"getVariableNames":[{"__symbolic":"method"}],"reportVariableStates":[{"__symbolic":"method"}],"getVirtualDeviceIdFromRect":[{"__symbolic":"method"}],"reportVariableValues":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}],"checkIsLoaded":[{"__symbolic":"method"}],"initBackground":[{"__symbolic":"method"}],"getImageEl":[{"__symbolic":"method"}]}}}}]