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

package/elements/shared/text/text-state-element.d.ts

@@ -1,5 +1,7 @@
 import { LoggerService } from '../../../logger';
+import { TextLibrarySetting } from '../../../model/base/font-setting-model';
 import { IndicatorLightFaultFlicker } from '../../../model/switch-indicator-light/indicator-light-fault-flicker';
+import { TextLibraryService, LanguageService } from '../../../service';
 import { TextState } from './text-state.model';
 export declare class TextStateElement {
     private readonly textStates;
@@ -8,15 +10,24 @@ export declare class TextStateElement {
     private readonly logger;
     private readonly version?;
     private readonly faultFlickers?;
+    private readonly textLibrarySetting?;
+    private readonly textLibraryService?;
+    private readonly languageService?;
     private textElement;
     private _element;
     get Element(): SVGElement;
     private faultFlickerStatus;
     private faultFlickerInterval;
-    constructor(textStates: TextState[], width: number, height: number, logger: LoggerService, version?: number, faultFlickers?: IndicatorLightFaultFlicker[]);
+    constructor(textStates: TextState[], width: number, height: number, logger: LoggerService, version?: number, faultFlickers?: IndicatorLightFaultFlicker[], textLibrarySetting?: TextLibrarySetting, textLibraryService?: TextLibraryService, languageService?: LanguageService);
     switchToState(stateId: number): void;
     private getforeignObjectElement;
     private removeForeignObjectlement;
     private doFaultFlicker;
     private clearFlickerInterval;
+    /**
+     * 获取显示文本
+     * 如果配置了文本库，则根据状态ID从文本库中获取对应语种的文本
+     * 否则返回默认文本
+     */
+    private getDisplayText;
 }

package/elements/shared/text/text-state-element.js

@@ -1,12 +1,15 @@
 import { Flicker } from '../../../model';
 export class TextStateElement {
-    constructor(textStates, width, height, logger, version, faultFlickers) {
+    constructor(textStates, width, height, logger, version, faultFlickers, textLibrarySetting, textLibraryService, languageService) {
         this.textStates = textStates;
         this.width = width;
         this.height = height;
         this.logger = logger;
         this.version = version;
         this.faultFlickers = faultFlickers;
+        this.textLibrarySetting = textLibrarySetting;
+        this.textLibraryService = textLibraryService;
+        this.languageService = languageService;
         this.faultFlickerStatus = false;
         this.faultFlickerInterval = undefined;
         this._element = document.createElementNS('http://www.w3.org/2000/svg', 'g');
@@ -21,7 +24,8 @@ export class TextStateElement {
             this.logger.debug(`Can not find text state:${stateId}.`);
             return;
         }
-        const content = textState.text.content;
+        // 获取显示文本（支持文本库）
+        const content = this.getDisplayText(stateId, textState.text.content);
         if (content === '' || content == null) {
             this.removeForeignObjectlement();
             return;
@@ -111,4 +115,38 @@ export class TextStateElement {
             }
         }
     }
+    /**
+     * 获取显示文本
+     * 如果配置了文本库，则根据状态ID从文本库中获取对应语种的文本
+     * 否则返回默认文本
+     */
+    getDisplayText(stateId, defaultContent) {
+        var _a;
+        // 检查是否使用文本库
+        if (this.textLibrarySetting && this.textLibrarySetting.labelType === 'textLibrary') {
+            const textLibraryId = this.textLibrarySetting.selectedTextLibraryItem;
+            if (textLibraryId && this.textLibraryService) {
+                // 获取当前默认语种
+                const currentLanguage = ((_a = this.languageService) === null || _a === void 0 ? void 0 : _a.getDefaultLanguage()) || 'zh-CN';
+                // 获取文本库数据
+                const textLibraryData = this.textLibraryService.getTextLibraryById(typeof textLibraryId === 'string' ? parseInt(textLibraryId, 10) : textLibraryId);
+                if (textLibraryData && textLibraryData.data) {
+                    // 使用状态ID作为value查找对应的文本条目
+                    const textEntry = textLibraryData.data.find(entry => entry.value === stateId.toString());
+                    if (textEntry) {
+                        // 优先返回对应语种的文本
+                        if (textEntry.cultures && textEntry.cultures[currentLanguage]) {
+                            return textEntry.cultures[currentLanguage];
+                        }
+                        // 如果没有对应语种，返回key作为默认值
+                        return '';
+                    }
+                }
+            }
+            // 文本库配置但未找到数据，返回空字符串
+            return '';
+        }
+        // 默认返回文本内容
+        return defaultContent || '';
+    }
 }

package/elements/shared/text/text-state-element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"TextStateElement":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","module":"./text-state.model","name":"TextState","line":17,"character":45}]},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","module":"../../../logger","name":"LoggerService","line":20,"character":33},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","module":"../../../model/switch-indicator-light/indicator-light-fault-flicker","name":"IndicatorLightFaultFlicker","line":22,"character":41}]}]}],"switchToState":[{"__symbolic":"method"}],"getforeignObjectElement":[{"__symbolic":"method"}],"removeForeignObjectlement":[{"__symbolic":"method"}],"doFaultFlicker":[{"__symbolic":"method"}],"clearFlickerInterval":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"TextStateElement":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","module":"./text-state.model","name":"TextState","line":19,"character":45}]},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","module":"../../../logger","name":"LoggerService","line":22,"character":33},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","module":"../../../model/switch-indicator-light/indicator-light-fault-flicker","name":"IndicatorLightFaultFlicker","line":24,"character":41}]},{"__symbolic":"reference","module":"../../../model/base/font-setting-model","name":"TextLibrarySetting","line":25,"character":46},{"__symbolic":"reference","module":"../../../service","name":"TextLibraryService","line":26,"character":46},{"__symbolic":"reference","module":"../../../service","name":"LanguageService","line":27,"character":43}]}],"switchToState":[{"__symbolic":"method"}],"getforeignObjectElement":[{"__symbolic":"method"}],"removeForeignObjectlement":[{"__symbolic":"method"}],"doFaultFlicker":[{"__symbolic":"method"}],"clearFlickerInterval":[{"__symbolic":"method"}],"getDisplayText":[{"__symbolic":"method"}]}}}}]

package/elements/static-elements/hyperlink-element.d.ts

@@ -1,4 +1,4 @@
-import { PermissionChecker } from '../../service';
+import { PermissionChecker, TextLibraryService, LanguageService } from '../../service';
 import { VariableCommunicator } from '../../communication';
 import { ConditionalDynamicDisplayElement } from '../base/conditional-dynamic-display-element';
 import { GraphStore, VariableStore } from '../../config';
@@ -7,8 +7,16 @@ import { Injector } from '@angular/core';
 import { HyperlinkModel } from '../../model/hyperlink/hyperlink.model';
 export declare class HyperlinkElement extends ConditionalDynamicDisplayElement {
     private readonly graphStore;
+    private readonly textLibraryService?;
+    private readonly languageService?;
     protected readonly model: HyperlinkModel;
     protected readonly logger: LoggerService;
-    constructor(element: HTMLElement, injector: Injector, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, graphStore: GraphStore, signalRAppId: string);
+    constructor(element: HTMLElement, injector: Injector, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, graphStore: GraphStore, signalRAppId: string, textLibraryService?: TextLibraryService, languageService?: LanguageService);
     private initGraphAndText;
+    /**
+     * 获取显示文本
+     * 如果配置了文本库，则从文本库中获取对应语种的文本
+     * 否则返回默认文本
+     */
+    private getDisplayText;
 }

package/elements/static-elements/hyperlink-element.js

@@ -3,9 +3,11 @@ import { GraphStateElement } from '../shared/graph/graph-state-element';
 import { LOGGER_SERVICE_TOKEN } from '../../logger';
 import { TextElementModal } from '../shared/text/text-element';
 export class HyperlinkElement extends ConditionalDynamicDisplayElement {
-    constructor(element, injector, permissionChecker, variableCommunicator, variableStore, graphStore, signalRAppId) {
+    constructor(element, injector, permissionChecker, variableCommunicator, variableStore, graphStore, signalRAppId, textLibraryService, languageService) {
         super(element, permissionChecker, variableCommunicator, variableStore, signalRAppId);
         this.graphStore = graphStore;
+        this.textLibraryService = textLibraryService;
+        this.languageService = languageService;
         this.logger = injector.get(LOGGER_SERVICE_TOKEN);
         if (this.model.size) {
             this.initGraphAndText();
@@ -42,7 +44,44 @@ export class HyperlinkElement extends ConditionalDynamicDisplayElement {
             color: this.model.stroke,
             textAlign: this.model.textAlign
         };
-        const textElement = new TextElementModal(this.model.text, font, width, height);
+        // 获取显示文本（支持文本库）
+        const displayText = this.getDisplayText();
+        const textElement = new TextElementModal(displayText, font, width, height);
         this.$element.append(textElement.Element);
     }
+    /**
+     * 获取显示文本
+     * 如果配置了文本库，则从文本库中获取对应语种的文本
+     * 否则返回默认文本
+     */
+    getDisplayText() {
+        var _a;
+        // 检查是否使用文本库
+        if (this.model.textLibrary && this.model.textLibrary.labelType === 'textLibrary') {
+            const textLibraryId = this.model.textLibrary.selectedTextLibraryItem;
+            const textItem = this.model.textLibrary.selectedTextItem;
+            if (textLibraryId && textItem && this.textLibraryService) {
+                // 获取当前默认语种
+                const currentLanguage = ((_a = this.languageService) === null || _a === void 0 ? void 0 : _a.getDefaultLanguage()) || 'zh-CN';
+                // 获取文本库数据
+                const textLibraryData = this.textLibraryService.getTextLibraryById(typeof textLibraryId === 'string' ? parseInt(textLibraryId, 10) : textLibraryId);
+                if (textLibraryData && textLibraryData.data) {
+                    // 查找对应的文本条目
+                    const textEntry = textLibraryData.data.find(entry => entry.key === textItem.toString());
+                    if (textEntry) {
+                        // 优先返回对应语种的文本
+                        if (textEntry.cultures && textEntry.cultures[currentLanguage]) {
+                            return textEntry.cultures[currentLanguage];
+                        }
+                        // 如果没有对应语种，返回默认值
+                        return '';
+                    }
+                }
+            }
+            // 文本库配置但未找到数据，返回空字符串
+            return '';
+        }
+        // 默认返回文本内容
+        return this.model.text || '';
+    }
 }

package/elements/static-elements/hyperlink-element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"HyperlinkElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-dynamic-display-element","name":"ConditionalDynamicDisplayElement","line":12,"character":38},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":17,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":17,"character":48},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":17,"character":77},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":18,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":18,"character":67},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":18,"character":111},{"__symbolic":"reference","name":"string"}]}],"initGraphAndText":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"HyperlinkElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-dynamic-display-element","name":"ConditionalDynamicDisplayElement","line":12,"character":38},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":17,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":17,"character":48},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":17,"character":77},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":18,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":18,"character":67},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":18,"character":111},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"../../service","name":"TextLibraryService","line":20,"character":46},{"__symbolic":"reference","module":"../../service","name":"LanguageService","line":21,"character":43}]}],"initGraphAndText":[{"__symbolic":"method"}],"getDisplayText":[{"__symbolic":"method"}]}}}}]

package/elements/static-elements/text-element.d.ts

@@ -4,13 +4,21 @@ import { ConditionalDynamicDisplayElement } from '../base/conditional-dynamic-di
 import { GraphStore, VariableStore } from '../../config';
 import { LoggerService } from '../../logger';
 import { Injector } from '@angular/core';
-import { PermissionChecker } from '../../service';
+import { PermissionChecker, TextLibraryService, LanguageService } from '../../service';
 export declare class TextElement extends ConditionalDynamicDisplayElement {
     private readonly graphStore;
+    private readonly textLibraryService?;
+    private readonly languageService?;
     protected readonly model: TextModel;
     protected readonly logger: LoggerService;
-    constructor(element: HTMLElement, injector: Injector, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, graphStore: GraphStore, signalRAppId: string);
+    constructor(element: HTMLElement, injector: Injector, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, graphStore: GraphStore, signalRAppId: string, textLibraryService?: TextLibraryService, languageService?: LanguageService);
     dispose(): void;
+    /**
+     * 获取显示文本
+     * 如果配置了文本库，则从文本库中获取对应语种的文本
+     * 否则返回默认文本
+     */
+    private getDisplayText;
     private handleTextValue;
     private initGraph;
 }

package/elements/static-elements/text-element.js

@@ -3,9 +3,11 @@ import { GraphStateElement } from '../shared/graph/graph-state-element';
 import { LOGGER_SERVICE_TOKEN } from '../../logger';
 import { TextElementModal } from '../shared/text/text-element';
 export class TextElement extends ConditionalDynamicDisplayElement {
-    constructor(element, injector, permissionChecker, variableCommunicator, variableStore, graphStore, signalRAppId) {
+    constructor(element, injector, permissionChecker, variableCommunicator, variableStore, graphStore, signalRAppId, textLibraryService, languageService) {
         super(element, permissionChecker, variableCommunicator, variableStore, signalRAppId);
         this.graphStore = graphStore;
+        this.textLibraryService = textLibraryService;
+        this.languageService = languageService;
         this.logger = injector.get(LOGGER_SERVICE_TOKEN);
         if (this.model.text && this.model.size) {
             const width = this.model.size.width;
@@ -26,7 +28,9 @@ export class TextElement extends ConditionalDynamicDisplayElement {
                 color: this.model.stroke,
                 textAlign: this.model.textAlign
             };
-            const textElement = new TextElementModal(this.model.text, font, width, height);
+            // 获取显示文本（支持文本库）
+            const displayText = this.getDisplayText();
+            const textElement = new TextElementModal(displayText, font, width, height);
             this.$element.append(textElement.Element);
         }
         else {
@@ -41,6 +45,41 @@ export class TextElement extends ConditionalDynamicDisplayElement {
             this.$element.remove();
         }
     }
+    /**
+     * 获取显示文本
+     * 如果配置了文本库，则从文本库中获取对应语种的文本
+     * 否则返回默认文本
+     */
+    getDisplayText() {
+        var _a;
+        // 检查是否使用文本库
+        if (this.model.textLibrary && this.model.textLibrary.labelType === 'textLibrary') {
+            const textLibraryId = this.model.textLibrary.selectedTextLibraryItem;
+            const textItem = this.model.textLibrary.selectedTextItem;
+            if (textLibraryId && textItem && this.textLibraryService) {
+                // 获取当前默认语种
+                const currentLanguage = ((_a = this.languageService) === null || _a === void 0 ? void 0 : _a.getDefaultLanguage()) || 'zh-CN';
+                // 获取文本库数据
+                const textLibraryData = this.textLibraryService.getTextLibraryById(typeof textLibraryId === 'string' ? parseInt(textLibraryId, 10) : textLibraryId);
+                if (textLibraryData && textLibraryData.data) {
+                    // 查找对应的文本条目
+                    const textEntry = textLibraryData.data.find(entry => entry.key === textItem.toString());
+                    if (textEntry) {
+                        // 优先返回对应语种的文本
+                        if (textEntry.cultures && textEntry.cultures[currentLanguage]) {
+                            return textEntry.cultures[currentLanguage];
+                        }
+                        // 如果没有对应语种，返回默认值
+                        return '';
+                    }
+                }
+            }
+            // 文本库配置但未找到数据，返回空字符串
+            return '';
+        }
+        // 默认返回文本内容
+        return this.model.text || '';
+    }
     handleTextValue() {
         const allText = this.$element.find('text');
         for (let i = 0; i < allText.length; i++) {

package/elements/static-elements/text-element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"TextElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-dynamic-display-element","name":"ConditionalDynamicDisplayElement","line":10,"character":33},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":15,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":15,"character":48},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":15,"character":77},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":16,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":16,"character":67},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":16,"character":111},{"__symbolic":"reference","name":"string"}]}],"dispose":[{"__symbolic":"method"}],"handleTextValue":[{"__symbolic":"method"}],"initGraph":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"TextElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-dynamic-display-element","name":"ConditionalDynamicDisplayElement","line":10,"character":33},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":15,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":15,"character":48},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":15,"character":77},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":16,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":16,"character":67},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":16,"character":111},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"../../service","name":"TextLibraryService","line":18,"character":46},{"__symbolic":"reference","module":"../../service","name":"LanguageService","line":19,"character":43}]}],"dispose":[{"__symbolic":"method"}],"getDisplayText":[{"__symbolic":"method"}],"handleTextValue":[{"__symbolic":"method"}],"initGraph":[{"__symbolic":"method"}]}}}}]

package/elements/switch-indicator-light/switch-indicator-light-element.d.ts

@@ -3,7 +3,7 @@ import { BsModalService } from 'ngx-bootstrap/modal';
 import { GraphStore, VariableStore } from '../../config';
 import { Localization } from '../../localization';
 import { SwitchIndicatorLight } from '../../model';
-import { PermissionChecker, OperationRecordService } from '../../service';
+import { PermissionChecker, OperationRecordService, TextLibraryService, LanguageService } from '../../service';
 import { VariableCommunicator } from '../../communication';
 import { ConditionalEnableElement } from '../base/conditional-enable-element';
 import { SecurityChecker } from '../../security';
@@ -12,6 +12,8 @@ export declare class SwitchIndicatorLightElement extends ConditionalEnableElemen
     private readonly graphStore;
     private readonly operationRecordService;
     private readonly securityChecker;
+    private readonly textLibraryService?;
+    private readonly languageService?;
     protected readonly model: SwitchIndicatorLight;
     private readonly logger;
     private switchOperator;
@@ -24,8 +26,7 @@ export declare class SwitchIndicatorLightElement extends ConditionalEnableElemen
     private restorationTimer;
     private isWriteRestorationDownValue;
     private onDocMouseUp;
-    private indicatorLightSubscription;
-    constructor(element: HTMLElement, injector: Injector, modalService: BsModalService, variableCommunicator: VariableCommunicator, graphStore: GraphStore, permissionChecker: PermissionChecker, operationRecordService: OperationRecordService, securityChecker: SecurityChecker, variableStore: VariableStore, localization: Localization, signalRAppId: string);
+    constructor(element: HTMLElement, injector: Injector, modalService: BsModalService, variableCommunicator: VariableCommunicator, graphStore: GraphStore, permissionChecker: PermissionChecker, operationRecordService: OperationRecordService, securityChecker: SecurityChecker, variableStore: VariableStore, localization: Localization, signalRAppId: string, textLibraryService?: TextLibraryService, languageService?: LanguageService);
     handleMouseUp(): void;
     private initOnDocMouseUpEvent;
     private checkElementPassword;
@@ -37,5 +38,4 @@ export declare class SwitchIndicatorLightElement extends ConditionalEnableElemen
     private switchToState;
     private initGraphAndText;
     private checkState;
-    dispose(): void;
 }

package/elements/switch-indicator-light/switch-indicator-light-element.js

@@ -17,12 +17,14 @@ import { DisplayMode, GlobalSettings } from '../../settings';
 import { VariableUtil } from '../../utils/variable-util';
 import { VariableDefinition } from '../../communication/variable/variable-definition';
 export class SwitchIndicatorLightElement extends ConditionalEnableElement {
-    constructor(element, injector, modalService, variableCommunicator, graphStore, permissionChecker, operationRecordService, securityChecker, variableStore, localization, signalRAppId) {
+    constructor(element, injector, modalService, variableCommunicator, graphStore, permissionChecker, operationRecordService, securityChecker, variableStore, localization, signalRAppId, textLibraryService, languageService) {
         super(element, permissionChecker, variableCommunicator, variableStore, localization, signalRAppId);
         this.modalService = modalService;
         this.graphStore = graphStore;
         this.operationRecordService = operationRecordService;
         this.securityChecker = securityChecker;
+        this.textLibraryService = textLibraryService;
+        this.languageService = languageService;
         this.isBitRestoration = false; // 是否是 位设定且执行设置是复位
         this.isVerifiedForRestoration = false; // 位设定且执行设置是复位情况下，是否已经完成了验证
         this.isWriteRestorationDownValue = false;
@@ -208,7 +210,7 @@ export class SwitchIndicatorLightElement extends ConditionalEnableElement {
             default:
                 throw new Error(`Unknown switchType:${settings.type}`);
         }
-        this.indicatorLightSubscription = this.indicatorLightOperator.currentStateIdChanged.subscribe(statusIdValue => {
+        this.indicatorLightOperator.currentStateIdChanged.subscribe(statusIdValue => {
             this.currentStateIdChange(statusIdValue);
         });
         this.indicatorLightOperator.requestData(this.signalRAppId);
@@ -238,7 +240,7 @@ export class SwitchIndicatorLightElement extends ConditionalEnableElement {
             this.graphStateElement = new GraphStateElement(this.model.graphSetting, width, height, this.graphStore, this.logger, this.model.version, this.model.states);
             this.$element.append(this.graphStateElement.Element);
         }
-        this.textStateElement = new TextStateElement(this.model.states, width, height, this.logger, this.model.version, this.model.states);
+        this.textStateElement = new TextStateElement(this.model.states, width, height, this.logger, this.model.version, this.model.states, this.model.textLibrary, this.textLibraryService, this.languageService);
         this.$element.append(this.textStateElement.Element);
     }
     checkState() {
@@ -249,28 +251,4 @@ export class SwitchIndicatorLightElement extends ConditionalEnableElement {
             throw new Error('The switch indicator light\'s states must greater than 2.');
         }
     }
-    dispose() {
-        // 清理 document 级别的事件监听器
-        if (this.onDocMouseUp) {
-            document.removeEventListener(this.isMobileMode ? 'touchend' : 'mouseup', this.onDocMouseUp);
-        }
-        // 清理定时器
-        if (this.restorationTimer) {
-            clearTimeout(this.restorationTimer);
-            this.restorationTimer = undefined;
-        }
-        // 清理 indicatorLightOperator 订阅
-        if (this.indicatorLightSubscription) {
-            this.indicatorLightSubscription.unsubscribe();
-        }
-        // 清理图形元素（释放 SVG 内存）
-        if (this.graphStateElement) {
-            this.graphStateElement.dispose();
-        }
-        // 清理文本元素
-        if (this.textStateElement) {
-            // TextStateElement 可能也需要 dispose，暂时先清理引用
-            this.textStateElement = null;
-        }
-    }
 }

package/elements/switch-indicator-light/switch-indicator-light-element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"SwitchIndicatorLightElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-enable-element","name":"ConditionalEnableElement","line":32,"character":49},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":51,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":52,"character":18},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":53,"character":39},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":54,"character":30},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":55,"character":37},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":56,"character":27},{"__symbolic":"reference","module":"../../service","name":"OperationRecordService","line":57,"character":49},{"__symbolic":"reference","module":"../../security","name":"SecurityChecker","line":58,"character":42},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":59,"character":23},{"__symbolic":"reference","module":"../../localization","name":"Localization","line":60,"character":22},{"__symbolic":"reference","name":"string"}]}],"handleMouseUp":[{"__symbolic":"method"}],"initOnDocMouseUpEvent":[{"__symbolic":"method"}],"checkElementPassword":[{"__symbolic":"method"}],"doSwitchOperator":[{"__symbolic":"method"}],"writeValue":[{"__symbolic":"method"}],"initSwitchOperator":[{"__symbolic":"method"}],"initIndictorLightOperator":[{"__symbolic":"method"}],"currentStateIdChange":[{"__symbolic":"method"}],"switchToState":[{"__symbolic":"method"}],"initGraphAndText":[{"__symbolic":"method"}],"checkState":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"SwitchIndicatorLightElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-enable-element","name":"ConditionalEnableElement","line":32,"character":49},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":50,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":51,"character":18},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":52,"character":39},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":53,"character":30},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":54,"character":37},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":55,"character":27},{"__symbolic":"reference","module":"../../service","name":"OperationRecordService","line":56,"character":49},{"__symbolic":"reference","module":"../../security","name":"SecurityChecker","line":57,"character":42},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":58,"character":23},{"__symbolic":"reference","module":"../../localization","name":"Localization","line":59,"character":22},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"../../service","name":"TextLibraryService","line":61,"character":46},{"__symbolic":"reference","module":"../../service","name":"LanguageService","line":62,"character":43}]}],"handleMouseUp":[{"__symbolic":"method"}],"initOnDocMouseUpEvent":[{"__symbolic":"method"}],"checkElementPassword":[{"__symbolic":"method"}],"doSwitchOperator":[{"__symbolic":"method"}],"writeValue":[{"__symbolic":"method"}],"initSwitchOperator":[{"__symbolic":"method"}],"initIndictorLightOperator":[{"__symbolic":"method"}],"currentStateIdChange":[{"__symbolic":"method"}],"switchToState":[{"__symbolic":"method"}],"initGraphAndText":[{"__symbolic":"method"}],"checkState":[{"__symbolic":"method"}]}}}}]

package/gui/gui-context.d.ts

@@ -1,7 +1,7 @@
 import { ConfigStore } from '../config';
 import { VariableCommunicator } from '../communication';
 import { SecurityChecker } from '../security';
-import { VideoService, WeatherService, PermissionChecker, OperationRecordService, ReleasedVariableService } from '../service';
+import { VideoService, WeatherService, PermissionChecker, OperationRecordService, ReleasedVariableService, TextLibraryService, LanguageService, SystemTextLibraryService } from '../service';
 export interface GuiContext {
     readonly configStore: ConfigStore;
     readonly variableCommunicator: VariableCommunicator;
@@ -11,6 +11,9 @@ export interface GuiContext {
     readonly securityChecker: SecurityChecker;
     readonly videoService: VideoService;
     readonly weatherService: WeatherService;
+    readonly textLibraryService?: TextLibraryService;
+    readonly languageService?: LanguageService;
+    readonly systemTextLibraryService?: SystemTextLibraryService;
     readonly configureViewId?: number;
     readonly configureViewCode?: string;
     dispose(): any;

package/model/base/font-setting-model.d.ts

@@ -1,3 +1,8 @@
+export interface TextLibrarySetting {
+    readonly labelType: 'text' | 'textLibrary';
+    readonly selectedTextLibraryItem?: string | number;
+    readonly selectedTextItem?: string | number;
+}
 export interface FontSettingModel {
     readonly text: string;
     readonly stroke: string;
@@ -5,4 +10,5 @@ export interface FontSettingModel {
     readonly fontSize: string;
     readonly isUnderline: boolean;
     readonly textAlign: string;
+    readonly textLibrary?: TextLibrarySetting;
 }

package/model/base/font-setting-model.metadata.json

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

package/model/historical-curve/historical-curve.data-settings.d.ts

@@ -1,9 +1,26 @@
 import { HistroicalCurveChannelModel } from './historical-curve-chanel.model';
+/**
+ * 单个历史数据条目的运行时配置
+ */
+export interface HistoricalCurveDataItem {
+    /** 历史数据条目名称 */
+    readonly dataName: string;
+    /** 该条目的通道列表 */
+    readonly channels: Array<HistroicalCurveChannelModel>;
+}
 export interface HistoricalCurveDataSettings {
     readonly dataSourceCode: number;
     /**
-     * 历史数据名称
+     * 【旧格式-兼容】历史数据名称，单条目模式
      */
     readonly dataName: string;
+    /**
+     * 【旧格式-兼容】通道列表，单条目模式
+     */
     readonly channels: Array<HistroicalCurveChannelModel>;
+    /**
+     * 【新格式】多个历史数据条目配置
+     * 如果此字段有值，优先使用此字段
+     */
+    readonly dataItems?: Array<HistoricalCurveDataItem>;
 }

package/model/historical-curve/historical-curve.data-settings.metadata.json

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

package/model/scroll-alarm/scroll-alarm.model.d.ts

@@ -0,0 +1,21 @@
+import { ConditionalDynamicDisplayModel } from '../base/conditional-dynamic-display-model';
+import { Point, Size } from '../shared';
+import { DynamicDisplayModel } from '../shared/dynamic-display/dynamic-display-model';
+export interface ScrollAlarmModel extends ConditionalDynamicDisplayModel {
+    readonly version: number;
+    readonly size: Size;
+    readonly location: Point;
+    readonly generalSetting?: any;
+    readonly filterSetting?: any;
+    readonly widths: number[];
+    readonly heights: number[];
+    readonly columLabels: string[];
+    readonly levelText: string[];
+    readonly scrollSetting?: {
+        readonly scrollInterval?: number;
+        readonly scrollDirection?: 'vertical' | 'horizontal';
+        readonly pauseOnHover?: boolean;
+        readonly autoPlay?: boolean;
+    };
+    readonly dynamicSetting?: DynamicDisplayModel;
+}

package/model/scroll-alarm/scroll-alarm.model.metadata.json

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

package/model/switch-indicator-light/switch-indicator-light.d.ts

@@ -5,6 +5,7 @@ import { ConditionalEnableModel } from '../base/conditional-enable-model';
 import { ConditionItemModel, GraphSetting, Point, Size } from '../shared';
 import { DynamicDisplayModel } from '../shared/dynamic-display/dynamic-display-model';
 import { SecurityModel } from '../base/security-model';
+import { TextLibrarySetting } from '../base/font-setting-model';
 export interface SwitchIndicatorLight extends ConditionalEnableModel, SecurityModel {
     /**
        * @type {(number)}
@@ -30,4 +31,5 @@ export interface SwitchIndicatorLight extends ConditionalEnableModel, SecurityMo
     readonly isAwaysEnable?: boolean;
     readonly enableItems?: ConditionItemModel[];
     readonly fixedPositionType?: number;
+    readonly textLibrary?: TextLibrarySetting;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"main": "bundles/fc-gui.umd.js",
-	"version": "3.0.0-alpha.123",
+	"version": "3.0.0-alpha.124",
 	"module": "public_api.js",
 	"typings": "public_api.d.ts",
 	"license": "UNLICENSED",

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/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"}}}]