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

package/public_api.js

@@ -8,4 +8,5 @@ export * from './localization';
 export * from './shared';
 export { GuiModule } from './gui.module';
 export * from './remote';
+export * from './service';
 export { LOGGER_SERVICE_TOKEN, ConsoleLoggerService } from './logger';

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

@@ -20,6 +20,7 @@ export declare class RemoteVariableCommunicator implements VariableCommunicator
     private variableStatesToBeClosed;
     private alarmObservers;
     private alarmChangedSubscription;
+    private systemVariableHandlers;
     constructor(remoteVariableProtocol: RemoteVariableProtocol, logger: LoggerService);
     private doAlarmChanged;
     private doVariableValuesChanged;
@@ -33,5 +34,19 @@ export declare class RemoteVariableCommunicator implements VariableCommunicator
     write(variableName: string, value: any): Observable<VariableValue>;
     writeWordByBit(variableName: string, index: number, value: number): Observable<VariableValue>;
     subscribeUserDeviceAlarms(appId?: string): Observable<any[]>;
+    /**
+     * 注册系统变量处理器
+     * @param variableName 变量名（如"当前语种ID"）
+     * @param getValue 获取值的函数
+     * @param setValue 设置值的函数
+     */
+    registerSystemVariableHandler(variableName: string, getValue: () => Promise<any>, setValue: (value: any) => Promise<void>): void;
+    /**
+     * 通知系统变量值变化
+     * 用于在系统变量值改变时通知所有订阅者
+     * @param variableName 变量名
+     * @param value 新值
+     */
+    notifySystemVariableChange(variableName: string, value: any): void;
     dispose(): void;
 }

package/remote/communication/variable/remote-variable-communicator.js

@@ -11,6 +11,8 @@ export class RemoteVariableCommunicator {
         this.variableStateObservers = new Map();
         this.variableStateCache = new Map();
         this.alarmObservers = [];
+        // 系统变量处理器
+        this.systemVariableHandlers = new Map();
         this.variableValueCache = new StringifyingMap(k => JSON.stringify(k));
         this.connectedSubscription = this.remoteVariableProtocol.connected.subscribe(() => {
             const variableNamesToStart = [];
@@ -175,7 +177,33 @@ export class RemoteVariableCommunicator {
                     }
                 }
             });
-            variablesToStart = uniq(variablesToStart);
+            // 过滤掉系统变量，它们不需要通过SignalR订阅
+            const normalVariables = variablesToStart.filter(v => !this.systemVariableHandlers.has(v));
+            const systemVariables = variablesToStart.filter(v => this.systemVariableHandlers.has(v));
+            // 处理系统变量的初始值
+            systemVariables.forEach(variableName => {
+                const handler = this.systemVariableHandlers.get(variableName);
+                if (handler && handler.getValue) {
+                    void handler.getValue().then(value => {
+                        const variableValue = {
+                            variableName: variableName,
+                            value: value,
+                            state: 1 // Normal state
+                        };
+                        this.variableValueCache.set(variableName, variableValue);
+                        if (this.observers.has(variableName)) {
+                            each(this.observers.get(variableName), ob => {
+                                ob.next([variableValue]);
+                            });
+                        }
+                    }).catch(error => {
+                        if (this.logger) {
+                            this.logger.error(`[RemoteVariableCommunicator] Failed to get system variable "${variableName}" value:`, error);
+                        }
+                    });
+                }
+            });
+            variablesToStart = uniq(normalVariables);
             if (variablesToStart && variablesToStart.length > 0) {
                 if (!this.variablesToBeOpened) {
                     this.variablesToBeOpened = [];
@@ -220,8 +248,24 @@ export class RemoteVariableCommunicator {
     }
     write(variableName, value) {
         if (!variableName) {
-            return;
+            return new Observable(observer => {
+                observer.complete();
+            });
         }
+        // 检查是否为系统变量
+        if (this.systemVariableHandlers.has(variableName)) {
+            const handler = this.systemVariableHandlers.get(variableName);
+            // 调用系统变量的setValue处理器
+            void handler.setValue(value).catch(error => {
+                if (this.logger) {
+                    this.logger.error('[RemoteVariableCommunicator] Failed to set system variable value:', error);
+                }
+            });
+            return new Observable(__ => {
+                /* 系统变量通过自己的机制通知变化 */
+            });
+        }
+        // 普通变量通过SignalR写入
         this.remoteVariableProtocol.writeVariable(variableName, value);
         return new Observable(__ => {
             /* do nothing right now, if want value change immediately, can use this code below:
@@ -247,6 +291,36 @@ export class RemoteVariableCommunicator {
             };
         });
     }
+    /**
+     * 注册系统变量处理器
+     * @param variableName 变量名（如"当前语种ID"）
+     * @param getValue 获取值的函数
+     * @param setValue 设置值的函数
+     */
+    registerSystemVariableHandler(variableName, getValue, setValue) {
+        this.systemVariableHandlers.set(variableName, { getValue, setValue });
+    }
+    /**
+     * 通知系统变量值变化
+     * 用于在系统变量值改变时通知所有订阅者
+     * @param variableName 变量名
+     * @param value 新值
+     */
+    notifySystemVariableChange(variableName, value) {
+        const variableValue = {
+            variableName: variableName,
+            value: value,
+            state: 1 // Normal state
+        };
+        // 更新缓存
+        this.variableValueCache.set(variableName, variableValue);
+        // 通知所有订阅者
+        if (this.observers.has(variableName)) {
+            each(this.observers.get(variableName), ob => {
+                ob.next([variableValue]);
+            });
+        }
+    }
     dispose() {
         // TODO调用所有的ob.complete()。
         this.connectedSubscription.unsubscribe();

package/remote/communication/variable/remote-variable-communicator.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"RemoteVariableCommunicator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"./remote-variable-protocol","name":"RemoteVariableProtocol","line":28,"character":57},{"__symbolic":"reference","module":"../../../logger","name":"LoggerService","line":28,"character":106}]}],"doAlarmChanged":[{"__symbolic":"method"}],"doVariableValuesChanged":[{"__symbolic":"method"}],"doVirtualDeviceStatesChanged":[{"__symbolic":"method"}],"doVariableStatesChanged":[{"__symbolic":"method"}],"subscribeVariableStates":[{"__symbolic":"method"}],"subscribeVariableState":[{"__symbolic":"method"}],"requestVirtualDeviceState":[{"__symbolic":"method"}],"openVariables":[{"__symbolic":"method"}],"openVariable":[{"__symbolic":"method"}],"write":[{"__symbolic":"method"}],"writeWordByBit":[{"__symbolic":"method"}],"subscribeUserDeviceAlarms":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"RemoteVariableCommunicator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"./remote-variable-protocol","name":"RemoteVariableProtocol","line":34,"character":57},{"__symbolic":"reference","module":"../../../logger","name":"LoggerService","line":34,"character":106}]}],"doAlarmChanged":[{"__symbolic":"method"}],"doVariableValuesChanged":[{"__symbolic":"method"}],"doVirtualDeviceStatesChanged":[{"__symbolic":"method"}],"doVariableStatesChanged":[{"__symbolic":"method"}],"subscribeVariableStates":[{"__symbolic":"method"}],"subscribeVariableState":[{"__symbolic":"method"}],"requestVirtualDeviceState":[{"__symbolic":"method"}],"openVariables":[{"__symbolic":"method"}],"openVariable":[{"__symbolic":"method"}],"write":[{"__symbolic":"method"}],"writeWordByBit":[{"__symbolic":"method"}],"subscribeUserDeviceAlarms":[{"__symbolic":"method"}],"registerSystemVariableHandler":[{"__symbolic":"method"}],"notifySystemVariableChange":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}]}}}}]

package/service/index.d.ts

@@ -3,3 +3,6 @@ export { PermissionChecker } from './permission-checker';
 export { ReleasedVariableService } from './released-variable';
 export * from './operation-record';
 export * from './video';
+export * from './text-library.service';
+export * from './language.service';
+export * from './system-text-library.service';

package/service/index.js

@@ -0,0 +1 @@
+export * from './system-text-library.service';

package/service/index.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{},"exports":[{"from":"./weather.service","export":["WeatherService"]},{"from":"./permission-checker","export":["PermissionChecker"]},{"from":"./released-variable","export":["ReleasedVariableService"]},{"from":"./operation-record"},{"from":"./video"}]}]
+[{"__symbolic":"module","version":4,"metadata":{},"exports":[{"from":"./weather.service","export":["WeatherService"]},{"from":"./permission-checker","export":["PermissionChecker"]},{"from":"./released-variable","export":["ReleasedVariableService"]},{"from":"./operation-record"},{"from":"./video"},{"from":"./text-library.service"},{"from":"./language.service"},{"from":"./system-text-library.service"}]}]

package/service/language.service.d.ts

@@ -0,0 +1,37 @@
+import { Observable } from 'rxjs';
+/**
+ * 语种 DTO 接口 - 与 Designer 中的 API 返回格式保持一致
+ */
+export interface ConfigureLanguageDto {
+    name: string;
+    displayName: string;
+    icon: string;
+    isDefault: boolean;
+    isSystem: boolean;
+}
+/**
+ * 语种服务接口
+ * 提供语种的查询能力，供 GUI 组件使用
+ */
+export interface LanguageService {
+    /**
+     * 获取所有语种
+     */
+    getLanguages(): ConfigureLanguageDto[];
+    /**
+     * 获取默认语言代码
+     */
+    getDefaultLanguage(): string;
+    /**
+     * 根据语种代码获取语种信息
+     */
+    getLanguageByCode(code: string): ConfigureLanguageDto | null;
+    /**
+     * 检查是否有缓存数据
+     */
+    hasCache(): boolean;
+    /**
+     * 缓存更新事件 (可选)
+     */
+    readonly cacheUpdated?: Observable<void>;
+}

package/service/language.service.metadata.json

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

package/service/system-text-library.service.d.ts

@@ -0,0 +1,76 @@
+import { Observable } from 'rxjs';
+/**
+ * 系统文本条目接口
+ */
+export interface SystemTextEntry {
+    key: string;
+    value: string;
+    referenceLocation: string;
+    isKeyReadOnly: boolean;
+    cultures: {
+        [key: string]: string;
+    };
+}
+/**
+ * 系统文本库缓存数据接口
+ */
+export interface SystemTextLibraryCacheData {
+    id: number;
+    name: string;
+    systemType: string;
+    data: SystemTextEntry[];
+}
+/**
+ * 系统文本库类型常量
+ */
+export declare const SYSTEM_TEXT_LIBRARY_TYPES: {
+    COMPONENT_BUILTIN: string;
+};
+/**
+ * 告警表表头 key 常量
+ */
+export declare const ALARM_TABLE_HEADER_KEYS: {
+    ALARM_NAME: string;
+    ALARM_MESSAGE: string;
+    ALARM_LEVEL: string;
+    TIME: string;
+};
+/**
+ * 时间段 key 常量（用于告警表和历史曲线下拉选择）
+ * 对应 localization 中的: lastThirtyMinutes, lastOneHour, lastEightHour, lastTwentyFourHours, lastSevenDays, lastThirtyDays, lastOneYear
+ */
+export declare const TIME_PERIOD_KEYS: {
+    LAST_THIRTY_MINUTES: string;
+    LAST_ONE_HOUR: string;
+    LAST_EIGHT_HOURS: string;
+    LAST_TWENTY_FOUR_HOURS: string;
+    LAST_SEVEN_DAYS: string;
+    LAST_THIRTY_DAYS: string;
+    LAST_ONE_YEAR: string;
+};
+/**
+ * 系统文本库服务接口
+ * 提供系统文本库的查询能力，供 GUI 组件使用
+ */
+export interface SystemTextLibraryService {
+    /**
+     * 根据 systemType 获取系统文本库
+     */
+    getSystemTextLibrary(systemType: string): SystemTextLibraryCacheData | null;
+    /**
+     * 根据 systemType 和 key 获取系统文本条目
+     */
+    getSystemTextEntry(systemType: string, entryKey: string): SystemTextEntry | null;
+    /**
+     * 根据 systemType、key 和语言获取系统文本值
+     */
+    getSystemTextValue(systemType: string, entryKey: string, culture?: string): string | null;
+    /**
+     * 检查系统文本库缓存是否存在
+     */
+    hasSystemTextLibraryCache(systemType: string): boolean;
+    /**
+     * 缓存更新事件 (可选)
+     */
+    readonly cacheUpdated?: Observable<void>;
+}

package/service/system-text-library.service.js

@@ -0,0 +1,28 @@
+/**
+ * 系统文本库类型常量
+ */
+export const SYSTEM_TEXT_LIBRARY_TYPES = {
+    COMPONENT_BUILTIN: 'ComponentBuiltIn'
+};
+/**
+ * 告警表表头 key 常量
+ */
+export const ALARM_TABLE_HEADER_KEYS = {
+    ALARM_NAME: 'AlarmTable.Header.AlarmName',
+    ALARM_MESSAGE: 'AlarmTable.Header.AlarmMessage',
+    ALARM_LEVEL: 'AlarmTable.Header.AlarmLevel',
+    TIME: 'AlarmTable.Header.Time'
+};
+/**
+ * 时间段 key 常量（用于告警表和历史曲线下拉选择）
+ * 对应 localization 中的: lastThirtyMinutes, lastOneHour, lastEightHour, lastTwentyFourHours, lastSevenDays, lastThirtyDays, lastOneYear
+ */
+export const TIME_PERIOD_KEYS = {
+    LAST_THIRTY_MINUTES: 'HistoricalCurve.TimeFilter.Last30Minutes',
+    LAST_ONE_HOUR: 'HistoricalCurve.TimeFilter.Last1Hour',
+    LAST_EIGHT_HOURS: 'HistoricalCurve.TimeFilter.Last8Hours',
+    LAST_TWENTY_FOUR_HOURS: 'HistoricalCurve.TimeFilter.Last24Hours',
+    LAST_SEVEN_DAYS: 'HistoricalCurve.TimeFilter.Last7Days',
+    LAST_THIRTY_DAYS: 'HistoricalCurve.TimeFilter.Last30Days',
+    LAST_ONE_YEAR: 'HistoricalCurve.TimeFilter.Last1Year'
+};

package/service/system-text-library.service.metadata.json

@@ -0,0 +1 @@
+[{"__symbolic":"module","version":4,"metadata":{"SystemTextEntry":{"__symbolic":"interface"},"SystemTextLibraryCacheData":{"__symbolic":"interface"},"SYSTEM_TEXT_LIBRARY_TYPES":{"COMPONENT_BUILTIN":"ComponentBuiltIn"},"ALARM_TABLE_HEADER_KEYS":{"ALARM_NAME":"AlarmTable.Header.AlarmName","ALARM_MESSAGE":"AlarmTable.Header.AlarmMessage","ALARM_LEVEL":"AlarmTable.Header.AlarmLevel","TIME":"AlarmTable.Header.Time"},"TIME_PERIOD_KEYS":{"LAST_THIRTY_MINUTES":"HistoricalCurve.TimeFilter.Last30Minutes","LAST_ONE_HOUR":"HistoricalCurve.TimeFilter.Last1Hour","LAST_EIGHT_HOURS":"HistoricalCurve.TimeFilter.Last8Hours","LAST_TWENTY_FOUR_HOURS":"HistoricalCurve.TimeFilter.Last24Hours","LAST_SEVEN_DAYS":"HistoricalCurve.TimeFilter.Last7Days","LAST_THIRTY_DAYS":"HistoricalCurve.TimeFilter.Last30Days","LAST_ONE_YEAR":"HistoricalCurve.TimeFilter.Last1Year"},"SystemTextLibraryService":{"__symbolic":"interface"}}}]

package/service/text-library.service.d.ts

@@ -0,0 +1,49 @@
+import { Observable } from 'rxjs';
+/**
+ * 文本条目接口
+ */
+export interface TextEntry {
+    key: string;
+    value: string;
+    cultures: {
+        [key: string]: string;
+    };
+}
+/**
+ * 文本库缓存数据接口
+ */
+export interface TextLibraryCacheData {
+    id: number;
+    name: string;
+    data: TextEntry[];
+}
+/**
+ * 文本库服务接口
+ * 提供文本库的查询能力，供 GUI 组件使用
+ */
+export interface TextLibraryService {
+    /**
+     * 获取所有文本库
+     */
+    getAllTextLibraries(): TextLibraryCacheData[];
+    /**
+     * 根据ID获取文本库
+     */
+    getTextLibraryById(id: number): TextLibraryCacheData | null;
+    /**
+     * 根据文本库ID和条目key获取文本条目
+     */
+    getTextEntry(textLibraryId: number, entryKey: string): TextEntry | null;
+    /**
+     * 根据文本库ID、条目key和语言获取文本值
+     */
+    getTextValue(textLibraryId: number, entryKey: string, culture?: string): string | null;
+    /**
+     * 检查是否有缓存数据
+     */
+    hasCache(): boolean;
+    /**
+     * 缓存更新事件 (可选)
+     */
+    readonly cacheUpdated?: Observable<void>;
+}

package/service/text-library.service.metadata.json

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

package/shared/gui-consts.d.ts

@@ -28,5 +28,6 @@ export declare class GuiConsts {
         weatherKey: string;
         airQualityKey: string;
         alarmKey: string;
+        scrollAlarmKey: string;
     };
 }

package/shared/gui-consts.js

@@ -28,5 +28,6 @@ GuiConsts.components = {
     tableKey: 'Table',
     weatherKey: 'Weather',
     airQualityKey: 'AirQualityIndex',
-    alarmKey: 'Alarm'
+    alarmKey: 'Alarm',
+    scrollAlarmKey: 'ScrollAlarm'
 };

package/shared/gui-consts.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"GuiConsts":{"__symbolic":"class","statics":{"components":{"imageKey":"Image","numericalDisplayKey":"NumericalDisplay","textKey":"Text","hyperlinkKey":"Hyperlink","meterKey":"Meter","pipeKey":"Pipe","switchIndicatorLightKey":"SwitchIndicatorLight","barGraphKey":"BarGraph","toggleViewKey":"ToggleView","characterKey":"Character","straightLineKey":"StraightLine","polyLineKey":"PolyLine","rectangleKey":"Rectangle","sectorkey":"Sector","ellipseKey":"Ellipse","datetimeDisplayKey":"DatetimeDisplay","historicalCurveKey":"HistoricalCurve","ringGraphKey":"RingGraph","viewOperationElement":"ViewOperation","polygonKey":"Polygon","videokey":"Video","tableKey":"Table","weatherKey":"Weather","airQualityKey":"AirQualityIndex","alarmKey":"Alarm"}}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"GuiConsts":{"__symbolic":"class","statics":{"components":{"imageKey":"Image","numericalDisplayKey":"NumericalDisplay","textKey":"Text","hyperlinkKey":"Hyperlink","meterKey":"Meter","pipeKey":"Pipe","switchIndicatorLightKey":"SwitchIndicatorLight","barGraphKey":"BarGraph","toggleViewKey":"ToggleView","characterKey":"Character","straightLineKey":"StraightLine","polyLineKey":"PolyLine","rectangleKey":"Rectangle","sectorkey":"Sector","ellipseKey":"Ellipse","datetimeDisplayKey":"DatetimeDisplay","historicalCurveKey":"HistoricalCurve","ringGraphKey":"RingGraph","viewOperationElement":"ViewOperation","polygonKey":"Polygon","videokey":"Video","tableKey":"Table","weatherKey":"Weather","airQualityKey":"AirQualityIndex","alarmKey":"Alarm","scrollAlarmKey":"ScrollAlarm"}}}}}]