@flexem/fc-gui 3.0.0-alpha.18 → 3.0.0-alpha.180

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

@@ -6,7 +6,12 @@ export interface VariableCommunicator {
     openVariables(variableNames: Array<string>, appId: string): Observable<Array<VariableValue>>;
     write(variableName: string, value: any): Observable<VariableValue>;
     writeWordByBit(variableName: string, index: number, value: number): Observable<VariableValue>;
+    requestVirtualDeviceState(): Observable<void>;
     subscribeVariableState(variableName: string): Observable<VariableState>;
     subscribeVariableStates(variableNames: Array<string>): Observable<Array<VariableState>>;
+    subscribeUserDeviceAlarms(appId: string): any;
+    subscribeUserOneDeviceAlarms(appId: string): any;
+    registerSystemVariableHandler?(variableName: string, getValue: () => Promise<any>, setValue: (value: any) => Promise<void>): void;
+    notifySystemVariableChange?(variableName: string, value: any): void;
     dispose(): any;
 }

package/communication/variable/variable-state-enum.d.ts

@@ -3,5 +3,6 @@ export declare enum VariableStateEnum {
     Offline = 1,
     Unbind = 3,
     DataNormal = 9,
+    InvalidMonitor = 10,
     Abnormal = 99
 }

package/communication/variable/variable-state-enum.js

@@ -4,5 +4,6 @@ export var VariableStateEnum;
     VariableStateEnum[VariableStateEnum["Offline"] = 1] = "Offline";
     VariableStateEnum[VariableStateEnum["Unbind"] = 3] = "Unbind";
     VariableStateEnum[VariableStateEnum["DataNormal"] = 9] = "DataNormal";
+    VariableStateEnum[VariableStateEnum["InvalidMonitor"] = 10] = "InvalidMonitor";
     VariableStateEnum[VariableStateEnum["Abnormal"] = 99] = "Abnormal";
 })(VariableStateEnum || (VariableStateEnum = {}));

package/communication/variable/variable-state-enum.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"VariableStateEnum":{"Normal":0,"Offline":1,"Unbind":3,"DataNormal":9,"Abnormal":99}}}]
+[{"__symbolic":"module","version":4,"metadata":{"VariableStateEnum":{"Normal":0,"Offline":1,"Unbind":3,"DataNormal":9,"InvalidMonitor":10,"Abnormal":99}}}]

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

@@ -4,5 +4,8 @@ export declare class VariableValue {
     state: VariableStateEnum;
     value?: any;
     readonly timeStamp?: string;
-    constructor(variableName: string, state: VariableStateEnum, value?: any, timeStamp?: string);
+    systemName?: string;
+    customStatus?: string;
+    virtualDeviceId?: number;
+    constructor(variableName: string, state: VariableStateEnum, value?: any, timeStamp?: string, systemName?: string, customStatus?: string, virtualDeviceId?: number);
 }

package/communication/variable/variable-value.js

@@ -1,8 +1,11 @@
 export class VariableValue {
-    constructor(variableName, state, value, timeStamp) {
+    constructor(variableName, state, value, timeStamp, systemName, customStatus, virtualDeviceId) {
         this.variableName = variableName;
         this.state = state;
         this.value = value;
         this.timeStamp = timeStamp;
+        this.systemName = systemName;
+        this.customStatus = customStatus;
+        this.virtualDeviceId = virtualDeviceId;
     }
 }

package/communication/variable/variable-value.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"VariableValue":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"./variable-state-enum","name":"VariableStateEnum","line":3,"character":68},{"__symbolic":"reference","name":"any"},{"__symbolic":"reference","name":"string"}]}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"VariableValue":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"./variable-state-enum","name":"VariableStateEnum","line":3,"character":68},{"__symbolic":"reference","name":"any"},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","name":"number"}]}]}}}}]

package/config/alarm/alarm.store.d.ts

@@ -0,0 +1,6 @@
+import { Observable } from 'rxjs';
+import { GetAlarmsArgs } from './get-alarms-args';
+export interface AlarmsStore {
+    getHistoryAlarms(input: GetAlarmsArgs): Observable<any>;
+    getCurrentAlarms(input: GetAlarmsArgs): Observable<any>;
+}

package/config/alarm/alarm.store.metadata.json

@@ -0,0 +1 @@
+[{"__symbolic":"module","version":4,"metadata":{"AlarmsStore":{"__symbolic":"interface"}}}]

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

@@ -0,0 +1,12 @@
+import * as moment from 'moment';
+export declare class GetAlarmsArgs {
+    readonly alarmNames: string[];
+    readonly triggeredStartTime: moment.Moment;
+    readonly triggeredEndTime: moment.Moment;
+    readonly maxResultCount: number;
+    readonly 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

@@ -0,0 +1,13 @@
+export class GetAlarmsArgs {
+    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

@@ -0,0 +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":"reference","name":"Array","arguments":[{"__symbolic":"reference","name":"number"}]},{"__symbolic":"reference","name":"string"}]}]}}}}]

package/config/alarm/index.d.ts

@@ -0,0 +1,2 @@
+export { AlarmsStore } from './alarm.store';
+export { GetAlarmsArgs } from './get-alarms-args';

package/config/alarm/index.js

@@ -0,0 +1 @@
+export { GetAlarmsArgs } from './get-alarms-args';

package/config/alarm/index.metadata.json

@@ -0,0 +1 @@
+[{"__symbolic":"module","version":4,"metadata":{},"exports":[{"from":"./alarm.store","export":["AlarmsStore"]},{"from":"./get-alarms-args","export":["GetAlarmsArgs"]}]}]

package/config/config-store.d.ts

@@ -3,6 +3,7 @@ import { ViewStore } from './view/view-store';
 import { ImageStore } from './image/image-store';
 import { HistoryDataStore } from './history-data/history-data.store';
 import { VariableStore } from './variable/variable-store';
+import { AlarmsStore } from './alarm';
 /**
  * 配置仓储
  */
@@ -11,5 +12,6 @@ export interface ConfigStore {
     readonly graphStore: GraphStore;
     readonly imageStore: ImageStore;
     readonly historyDataStore: HistoryDataStore;
+    readonly alarmsStore: AlarmsStore;
     readonly variableStore: VariableStore;
 }

package/config/gui-feature-config.d.ts

@@ -0,0 +1,3 @@
+export declare class GuiFeatureConfig {
+    static isOfflineDisplayEnabled: boolean;
+}

package/config/gui-feature-config.js

@@ -0,0 +1,3 @@
+export class GuiFeatureConfig {
+}
+GuiFeatureConfig.isOfflineDisplayEnabled = false;

package/config/gui-feature-config.metadata.json

@@ -0,0 +1 @@
+[{"__symbolic":"module","version":4,"metadata":{"GuiFeatureConfig":{"__symbolic":"class","statics":{"isOfflineDisplayEnabled":false}}}}]

package/config/index.d.ts

@@ -1,4 +1,5 @@
 export { ConfigStore } from './config-store';
+export { GuiFeatureConfig } from './gui-feature-config';
 export { Graph } from './graph/graph';
 export { GraphResult } from './graph/graph-result';
 export { GraphType } from './graph/graph-type';
@@ -8,3 +9,4 @@ export { ViewModel } from './view/view.model';
 export { ImageStore } from './image/image-store';
 export * from './history-data';
 export * from './variable';
+export * from './alarm';

package/config/index.js

@@ -1,6 +1,8 @@
+export { GuiFeatureConfig } from './gui-feature-config';
 export { Graph } from './graph/graph';
 export { GraphResult } from './graph/graph-result';
 export { GraphType } from './graph/graph-type';
 export { ViewModel } from './view/view.model';
 export * from './history-data';
 export * from './variable';
+export * from './alarm';

package/config/index.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{},"exports":[{"from":"./config-store","export":["ConfigStore"]},{"from":"./graph/graph","export":["Graph"]},{"from":"./graph/graph-result","export":["GraphResult"]},{"from":"./graph/graph-type","export":["GraphType"]},{"from":"./graph/graph-store","export":["GraphStore"]},{"from":"./view/view-store","export":["ViewStore"]},{"from":"./view/view.model","export":["ViewModel"]},{"from":"./image/image-store","export":["ImageStore"]},{"from":"./history-data"},{"from":"./variable"}]}]
+[{"__symbolic":"module","version":4,"metadata":{},"exports":[{"from":"./config-store","export":["ConfigStore"]},{"from":"./gui-feature-config","export":["GuiFeatureConfig"]},{"from":"./graph/graph","export":["Graph"]},{"from":"./graph/graph-result","export":["GraphResult"]},{"from":"./graph/graph-type","export":["GraphType"]},{"from":"./graph/graph-store","export":["GraphStore"]},{"from":"./view/view-store","export":["ViewStore"]},{"from":"./view/view.model","export":["ViewModel"]},{"from":"./image/image-store","export":["ImageStore"]},{"from":"./history-data"},{"from":"./variable"},{"from":"./alarm"}]}]

package/config/variable/variable-store.d.ts

@@ -4,4 +4,5 @@ export interface VariableStore {
      * 老数据转换
      */
     getVariableName(input: GetVariableNameArgs): string;
+    getAllVariableNames?(): string[];
 }

package/elements/air-quality/air-quality-element.js

@@ -40,9 +40,9 @@ export class AirQualityElement extends ConditionalDisplayElement {
         this.buildBackgroudRect(airQualitySvg, backgroundColor);
         this.buildLocGroup(airQualitySvg, airQuality.city, fontColor);
         this.buildAirQualityText(airQualitySvg, 130, 55, airQuality.aqi, fontColor, 53);
-        this.buildAirQualityText(airQualitySvg, 190, 28, '空气质量', fontColor);
+        this.buildAirQualityText(airQualitySvg, 220, 28, '空气质量', fontColor);
         this.buildRectBackgroundForAqi(airQualitySvg, airQuality.level);
-        this.buildAirQualityText(airQualitySvg, 190, 49, airQuality.category, fontColor);
+        this.buildAirQualityText(airQualitySvg, 220, 49, airQuality.category, fontColor);
         this.buildAirQualityText(airQualitySvg, 30, 75, 'PM2.5', fontColor, 12, 0.8);
         this.buildAirQualityText(airQualitySvg, 30, 95, airQuality.pm25, fontColor, 15);
         this.buildAirQualityText(airQualitySvg, 80, 75, 'PM10', fontColor, 12, 0.8);
@@ -62,7 +62,6 @@ export class AirQualityElement extends ConditionalDisplayElement {
     }
     handleGettingAddress() {
         this.handleUnusualCommon(this.localization.airQualityNotAvailable);
-        setTimeout(() => this.initAirQualityInfo(), 1000 * 60);
     }
     handleNoAddress() {
         this.handleUnusualCommon(this.localization.airQualityNotAddress);
@@ -105,7 +104,7 @@ export class AirQualityElement extends ConditionalDisplayElement {
             backgroundColor = '#A10E0E';
         }
         airQualitySvg.append('rect')
-            .attr('x', '165')
+            .attr('x', '195')
             .attr('y', '35')
             .attr('rx', '5')
             .attr('width', '50')

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

@@ -0,0 +1,69 @@
+import { Injector } from '@angular/core';
+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 timePeriods;
+    private languageChangeSubscription?;
+    private elementStatus;
+    private element;
+    private refreshIntervalId;
+    private readonly displayOption;
+    private alarmNames;
+    private startTime;
+    private endTime;
+    private currentTimePeriod;
+    private alarmList;
+    private currentAlarmList;
+    private page;
+    private totalCount;
+    private pageSize;
+    private getAlarmDataId;
+    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;
+    private updateTimeRange;
+    private updateQueryTimeRange;
+    private loadFirstPage;
+    private loadNextPage;
+    private loadPreviousPage;
+    private loadLastPage;
+    private setStatusAsNormal;
+    private setStatusAsLoading;
+    private renderStatus;
+    private clearStatus;
+}