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

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

@@ -1,6 +1,11 @@
 import { isNil } from 'lodash';
 export class TextElementModal {
     constructor(content, font, width, height, isVariableText) {
+        // 保存参数以便后续更新文本
+        this.font = font;
+        this.width = width;
+        this.height = height;
+        this.isVariableText = isVariableText;
         if (/iPhone|iPod/i.test(navigator.userAgent)) {
             width += 10;
         }
@@ -12,6 +17,21 @@ export class TextElementModal {
     get Element() {
         return this._element;
     }
+    /**
+     * 更新文本内容
+     * @param content 新的文本内容
+     */
+    updateText(content) {
+        // 清空现有内容
+        this._element.innerHTML = '';
+        // 创建新的文本元素
+        let width = this.width;
+        if (/iPhone|iPod/i.test(navigator.userAgent)) {
+            width += 10;
+        }
+        const text = this.createNewForeignObjectText(content, this.font, width, this.height, this.isVariableText);
+        this._element.appendChild(text);
+    }
     getforeignObjectElement(width, height) {
         const textElement = document.createElementNS('http://www.w3.org/2000/svg', 'foreignObject');
         textElement.setAttribute('width', width.toString());

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

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"TextElementModal":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"../../../model","name":"Font","line":11,"character":39},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"boolean"}]}],"getforeignObjectElement":[{"__symbolic":"method"}],"createNewForeignObjectText":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"TextElementModal":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"../../../model","name":"Font","line":15,"character":39},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"boolean"}]}],"updateText":[{"__symbolic":"method"}],"getforeignObjectElement":[{"__symbolic":"method"}],"createNewForeignObjectText":[{"__symbolic":"method"}]}}}}]

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

@@ -3,6 +3,7 @@ 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';
+import { GuiContext } from '../../../gui/gui-context';
 export declare class TextStateElement {
     private readonly textStates;
     private width;
@@ -13,20 +14,32 @@ export declare class TextStateElement {
     private readonly textLibrarySetting?;
     private readonly textLibraryService?;
     private readonly languageService?;
+    private readonly guiContext?;
     private textElement;
     private _element;
     get Element(): SVGElement;
     private faultFlickerStatus;
     private faultFlickerInterval;
-    constructor(textStates: TextState[], width: number, height: number, logger: LoggerService, version?: number, faultFlickers?: IndicatorLightFaultFlicker[], textLibrarySetting?: TextLibrarySetting, textLibraryService?: TextLibraryService, languageService?: LanguageService);
+    private currentStateId;
+    private languageChangeSubscription?;
+    constructor(textStates: TextState[], width: number, height: number, logger: LoggerService, version?: number, faultFlickers?: IndicatorLightFaultFlicker[], textLibrarySetting?: TextLibrarySetting, textLibraryService?: TextLibraryService, languageService?: LanguageService, guiContext?: GuiContext);
     switchToState(stateId: number): void;
+    /**
+     * 订阅语种变化事件
+     * 当设备的语种ID改变时，重新渲染当前状态的文本
+     */
+    private subscribeLanguageChange;
+    /**
+     * 释放资源
+     */
+    dispose(): void;
     private getforeignObjectElement;
     private removeForeignObjectlement;
     private doFaultFlicker;
     private clearFlickerInterval;
     /**
      * 获取显示文本
-     * 如果配置了文本库，则根据状态ID从文本库中获取对应语种的文本
+     * 如果配置了文本库，则根据状态ID和当前语种ID从文本库中获取对应语种的文本
      * 否则返回默认文本
      */
     private getDisplayText;

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

@@ -1,6 +1,6 @@
 import { Flicker } from '../../../model';
 export class TextStateElement {
-    constructor(textStates, width, height, logger, version, faultFlickers, textLibrarySetting, textLibraryService, languageService) {
+    constructor(textStates, width, height, logger, version, faultFlickers, textLibrarySetting, textLibraryService, languageService, guiContext) {
         this.textStates = textStates;
         this.width = width;
         this.height = height;
@@ -10,14 +10,19 @@ export class TextStateElement {
         this.textLibrarySetting = textLibrarySetting;
         this.textLibraryService = textLibraryService;
         this.languageService = languageService;
+        this.guiContext = guiContext;
         this.faultFlickerStatus = false;
         this.faultFlickerInterval = undefined;
         this._element = document.createElementNS('http://www.w3.org/2000/svg', 'g');
+        // 订阅语种变化事件
+        this.subscribeLanguageChange();
     }
     get Element() {
         return this._element;
     }
     switchToState(stateId) {
+        // 保存当前状态ID，用于语种切换时重新渲染
+        this.currentStateId = stateId;
         const textState = this.textStates.find(t => t.id === stateId);
         if (textState === undefined) {
             this.removeForeignObjectlement();
@@ -69,6 +74,39 @@ export class TextStateElement {
         }
         this.doFaultFlicker(textElement, stateId);
     }
+    /**
+     * 订阅语种变化事件
+     * 当设备的语种ID改变时，重新渲染当前状态的文本
+     */
+    subscribeLanguageChange() {
+        // 只有使用文本库时才需要订阅语种变化
+        if (!this.textLibrarySetting || this.textLibrarySetting.labelType !== 'textLibrary') {
+            return;
+        }
+        if (this.guiContext && this.guiContext.languageChanged$) {
+            this.languageChangeSubscription = this.guiContext.languageChanged$.subscribe(() => {
+                // 如果当前有状态，重新渲染
+                if (this.currentStateId !== undefined) {
+                    this.switchToState(this.currentStateId);
+                }
+            });
+        }
+    }
+    /**
+     * 释放资源
+     */
+    dispose() {
+        // 取消语种变化订阅
+        if (this.languageChangeSubscription) {
+            this.languageChangeSubscription.unsubscribe();
+            this.languageChangeSubscription = undefined;
+        }
+        // 清除闪烁定时器
+        if (this.faultFlickerInterval) {
+            clearInterval(this.faultFlickerInterval);
+            this.faultFlickerInterval = undefined;
+        }
+    }
     getforeignObjectElement() {
         if (!this.textElement) {
             this.textElement = document.createElementNS('http://www.w3.org/2000/svg', 'text');
@@ -117,29 +155,50 @@ export class TextStateElement {
     }
     /**
      * 获取显示文本
-     * 如果配置了文本库，则根据状态ID从文本库中获取对应语种的文本
+     * 如果配置了文本库，则根据状态ID和当前语种ID从文本库中获取对应语种的文本
      * 否则返回默认文本
      */
     getDisplayText(stateId, defaultContent) {
-        var _a;
+        var _a, _b, _c, _d, _e, _f;
         // 检查是否使用文本库
         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];
+                        // 获取当前语种ID
+                        const currentLanguageId = (_c = (_b = (_a = this.guiContext) === null || _a === void 0 ? void 0 : _a.getCurrentLanguageId) === null || _b === void 0 ? void 0 : _b.call(_a)) !== null && _c !== void 0 ? _c : null;
+                        // 确定要使用的语种代码（culture）
+                        let targetLanguage;
+                        const defaultLanguage = ((_d = this.languageService) === null || _d === void 0 ? void 0 : _d.getDefaultLanguage()) || 'zh-CN';
+                        if (currentLanguageId === null || currentLanguageId === undefined) {
+                            // 设备未设置当前语种，使用默认语种
+                            targetLanguage = defaultLanguage;
+                        }
+                        else {
+                            // 设备已设置当前语种，获取对应的语种代码
+                            const currentLanguage = (_f = (_e = this.guiContext) === null || _e === void 0 ? void 0 : _e.getLanguageCultureById) === null || _f === void 0 ? void 0 : _f.call(_e, currentLanguageId);
+                            if (currentLanguage) {
+                                // 直接使用设备设置的语种，不再fallback
+                                targetLanguage = currentLanguage;
+                            }
+                            else {
+                                targetLanguage = defaultLanguage;
+                            }
+                        }
+                        // 返回对应语种的文本，如果没有则返回空字符串
+                        if (textEntry.cultures && textEntry.cultures[targetLanguage]) {
+                            const text = textEntry.cultures[targetLanguage];
+                            return text;
+                        }
+                        else {
+                            // 对应语种没有文本，返回空字符串
+                            return '';
                         }
-                        // 如果没有对应语种，返回key作为默认值
-                        return '';
                     }
                 }
             }

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":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"}]}}}}]
+[{"__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":23,"character":45}]},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","module":"../../../logger","name":"LoggerService","line":26,"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":28,"character":41}]},{"__symbolic":"reference","module":"../../../model/base/font-setting-model","name":"TextLibrarySetting","line":29,"character":46},{"__symbolic":"reference","module":"../../../service","name":"TextLibraryService","line":30,"character":46},{"__symbolic":"reference","module":"../../../service","name":"LanguageService","line":31,"character":43},{"__symbolic":"reference","module":"../../../gui/gui-context","name":"GuiContext","line":32,"character":38}]}],"switchToState":[{"__symbolic":"method"}],"subscribeLanguageChange":[{"__symbolic":"method"}],"dispose":[{"__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

@@ -5,13 +5,27 @@ import { GraphStore, VariableStore } from '../../config';
 import { LoggerService } from '../../logger';
 import { Injector } from '@angular/core';
 import { HyperlinkModel } from '../../model/hyperlink/hyperlink.model';
+import { GuiContext } from '../../gui/gui-context';
 export declare class HyperlinkElement extends ConditionalDynamicDisplayElement {
     private readonly graphStore;
     private readonly textLibraryService?;
     private readonly languageService?;
+    private readonly guiContext?;
     protected readonly model: HyperlinkModel;
     protected readonly logger: LoggerService;
-    constructor(element: HTMLElement, injector: Injector, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, graphStore: GraphStore, signalRAppId: string, textLibraryService?: TextLibraryService, languageService?: LanguageService);
+    private languageChangeSubscription?;
+    private textElementModal?;
+    constructor(element: HTMLElement, injector: Injector, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, graphStore: GraphStore, signalRAppId: string, textLibraryService?: TextLibraryService, languageService?: LanguageService, guiContext?: GuiContext);
+    dispose(): void;
+    /**
+     * 订阅语种变化事件
+     * 当设备的语种ID改变时，重新渲染文本
+     */
+    private subscribeLanguageChange;
+    /**
+     * 重新渲染文本
+     */
+    private reRenderText;
     private initGraphAndText;
     /**
      * 获取显示文本

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

@@ -3,14 +3,17 @@ 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, textLibraryService, languageService) {
+    constructor(element, injector, permissionChecker, variableCommunicator, variableStore, graphStore, signalRAppId, textLibraryService, languageService, guiContext) {
         super(element, permissionChecker, variableCommunicator, variableStore, signalRAppId);
         this.graphStore = graphStore;
         this.textLibraryService = textLibraryService;
         this.languageService = languageService;
+        this.guiContext = guiContext;
         this.logger = injector.get(LOGGER_SERVICE_TOKEN);
         if (this.model.size) {
             this.initGraphAndText();
+            // 订阅语种变化
+            this.subscribeLanguageChange();
         }
         if (this.model && this.model.linkAddress) {
             this.rootElement.style('cursor', 'hand');
@@ -24,6 +27,44 @@ export class HyperlinkElement extends ConditionalDynamicDisplayElement {
             });
         }
     }
+    dispose() {
+        // 取消语种变化订阅
+        if (this.languageChangeSubscription) {
+            this.languageChangeSubscription.unsubscribe();
+            this.languageChangeSubscription = undefined;
+        }
+        if (this.$element) {
+            this.$element.remove();
+        }
+    }
+    /**
+     * 订阅语种变化事件
+     * 当设备的语种ID改变时，重新渲染文本
+     */
+    subscribeLanguageChange() {
+        // 只有使用文本库时才需要订阅语种变化
+        if (!this.model.textLibrary || this.model.textLibrary.labelType !== 'textLibrary') {
+            return;
+        }
+        if (this.guiContext && this.guiContext.languageChanged$) {
+            this.languageChangeSubscription = this.guiContext.languageChanged$.subscribe(() => {
+                // 重新渲染文本
+                this.reRenderText();
+            });
+        }
+    }
+    /**
+     * 重新渲染文本
+     */
+    reRenderText() {
+        if (!this.textElementModal || !this.model.size) {
+            return;
+        }
+        // 获取新的显示文本
+        const displayText = this.getDisplayText();
+        // 直接更新文本内容，而不是重新创建元素
+        this.textElementModal.updateText(displayText);
+    }
     initGraphAndText() {
         this.rootElement.selectAll('*').remove();
         const size = this.model.size;
@@ -46,8 +87,8 @@ export class HyperlinkElement extends ConditionalDynamicDisplayElement {
         };
         // 获取显示文本（支持文本库）
         const displayText = this.getDisplayText();
-        const textElement = new TextElementModal(displayText, font, width, height);
-        this.$element.append(textElement.Element);
+        this.textElementModal = new TextElementModal(displayText, font, width, height);
+        this.$element.append(this.textElementModal.Element);
     }
     /**
      * 获取显示文本
@@ -55,25 +96,43 @@ export class HyperlinkElement extends ConditionalDynamicDisplayElement {
      * 否则返回默认文本
      */
     getDisplayText() {
-        var _a;
+        var _a, _b, _c, _d, _e, _f;
         // 检查是否使用文本库
         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];
+                        // 获取当前语种ID
+                        const currentLanguageId = (_c = (_b = (_a = this.guiContext) === null || _a === void 0 ? void 0 : _a.getCurrentLanguageId) === null || _b === void 0 ? void 0 : _b.call(_a)) !== null && _c !== void 0 ? _c : null;
+                        // 确定要使用的语种代码（culture）
+                        let targetLanguage;
+                        const defaultLanguage = ((_d = this.languageService) === null || _d === void 0 ? void 0 : _d.getDefaultLanguage()) || 'zh-CN';
+                        if (currentLanguageId === null || currentLanguageId === undefined) {
+                            // 设备未设置当前语种，使用默认语种
+                            targetLanguage = defaultLanguage;
+                        }
+                        else {
+                            // 设备已设置当前语种，获取对应的语种代码
+                            const currentLanguage = (_f = (_e = this.guiContext) === null || _e === void 0 ? void 0 : _e.getLanguageCultureById) === null || _f === void 0 ? void 0 : _f.call(_e, currentLanguageId);
+                            if (currentLanguage) {
+                                targetLanguage = currentLanguage;
+                            }
+                            else {
+                                // 无法获取语种代码，使用默认语种
+                                targetLanguage = defaultLanguage;
+                            }
+                        }
+                        // 返回对应语种的文本
+                        if (textEntry.cultures && textEntry.cultures[targetLanguage]) {
+                            return textEntry.cultures[targetLanguage];
                         }
-                        // 如果没有对应语种，返回默认值
+                        // 如果没有对应语种，返回空字符串
                         return '';
                     }
                 }

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"},{"__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"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"HyperlinkElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-dynamic-display-element","name":"ConditionalDynamicDisplayElement","line":14,"character":38},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":21,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":21,"character":48},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":21,"character":77},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":22,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":22,"character":67},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":22,"character":111},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"../../service","name":"TextLibraryService","line":24,"character":46},{"__symbolic":"reference","module":"../../service","name":"LanguageService","line":25,"character":43},{"__symbolic":"reference","module":"../../gui/gui-context","name":"GuiContext","line":26,"character":38}]}],"dispose":[{"__symbolic":"method"}],"subscribeLanguageChange":[{"__symbolic":"method"}],"reRenderText":[{"__symbolic":"method"}],"initGraphAndText":[{"__symbolic":"method"}],"getDisplayText":[{"__symbolic":"method"}]}}}}]

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

@@ -5,14 +5,27 @@ import { GraphStore, VariableStore } from '../../config';
 import { LoggerService } from '../../logger';
 import { Injector } from '@angular/core';
 import { PermissionChecker, TextLibraryService, LanguageService } from '../../service';
+import { GuiContext } from '../../gui/gui-context';
 export declare class TextElement extends ConditionalDynamicDisplayElement {
     private readonly graphStore;
     private readonly textLibraryService?;
     private readonly languageService?;
+    private readonly guiContext?;
     protected readonly model: TextModel;
     protected readonly logger: LoggerService;
-    constructor(element: HTMLElement, injector: Injector, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, graphStore: GraphStore, signalRAppId: string, textLibraryService?: TextLibraryService, languageService?: LanguageService);
+    private languageChangeSubscription?;
+    private textElementModal?;
+    constructor(element: HTMLElement, injector: Injector, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, graphStore: GraphStore, signalRAppId: string, textLibraryService?: TextLibraryService, languageService?: LanguageService, guiContext?: GuiContext);
     dispose(): void;
+    /**
+     * 订阅语种变化事件
+     * 当设备的语种ID改变时，重新渲染文本
+     */
+    private subscribeLanguageChange;
+    /**
+     * 重新渲染文本
+     */
+    private reRenderText;
     /**
      * 获取显示文本
      * 如果配置了文本库，则从文本库中获取对应语种的文本

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

@@ -3,11 +3,12 @@ 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, textLibraryService, languageService) {
+    constructor(element, injector, permissionChecker, variableCommunicator, variableStore, graphStore, signalRAppId, textLibraryService, languageService, guiContext) {
         super(element, permissionChecker, variableCommunicator, variableStore, signalRAppId);
         this.graphStore = graphStore;
         this.textLibraryService = textLibraryService;
         this.languageService = languageService;
+        this.guiContext = guiContext;
         this.logger = injector.get(LOGGER_SERVICE_TOKEN);
         if (this.model.text && this.model.size) {
             const width = this.model.size.width;
@@ -30,8 +31,10 @@ export class TextElement extends ConditionalDynamicDisplayElement {
             };
             // 获取显示文本（支持文本库）
             const displayText = this.getDisplayText();
-            const textElement = new TextElementModal(displayText, font, width, height);
-            this.$element.append(textElement.Element);
+            this.textElementModal = new TextElementModal(displayText, font, width, height);
+            this.$element.append(this.textElementModal.Element);
+            // 订阅语种变化
+            this.subscribeLanguageChange();
         }
         else {
             this.handleTextValue();
@@ -41,35 +44,86 @@ export class TextElement extends ConditionalDynamicDisplayElement {
         }
     }
     dispose() {
+        // 取消语种变化订阅
+        if (this.languageChangeSubscription) {
+            this.languageChangeSubscription.unsubscribe();
+            this.languageChangeSubscription = undefined;
+        }
         if (this.$element) {
             this.$element.remove();
         }
     }
+    /**
+     * 订阅语种变化事件
+     * 当设备的语种ID改变时，重新渲染文本
+     */
+    subscribeLanguageChange() {
+        // 只有使用文本库时才需要订阅语种变化
+        if (!this.model.textLibrary || this.model.textLibrary.labelType !== 'textLibrary') {
+            return;
+        }
+        if (this.guiContext && this.guiContext.languageChanged$) {
+            this.languageChangeSubscription = this.guiContext.languageChanged$.subscribe(() => {
+                // 重新渲染文本
+                this.reRenderText();
+            });
+        }
+    }
+    /**
+     * 重新渲染文本
+     */
+    reRenderText() {
+        if (!this.textElementModal || !this.model.size) {
+            return;
+        }
+        // 获取新的显示文本
+        const displayText = this.getDisplayText();
+        // 直接更新文本内容，而不是重新创建元素
+        this.textElementModal.updateText(displayText);
+    }
     /**
      * 获取显示文本
      * 如果配置了文本库，则从文本库中获取对应语种的文本
      * 否则返回默认文本
      */
     getDisplayText() {
-        var _a;
+        var _a, _b, _c, _d, _e, _f;
         // 检查是否使用文本库
         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];
+                        // 获取当前语种ID
+                        const currentLanguageId = (_c = (_b = (_a = this.guiContext) === null || _a === void 0 ? void 0 : _a.getCurrentLanguageId) === null || _b === void 0 ? void 0 : _b.call(_a)) !== null && _c !== void 0 ? _c : null;
+                        // 确定要使用的语种代码（culture）
+                        let targetLanguage;
+                        const defaultLanguage = ((_d = this.languageService) === null || _d === void 0 ? void 0 : _d.getDefaultLanguage()) || 'zh-CN';
+                        if (currentLanguageId === null || currentLanguageId === undefined) {
+                            // 设备未设置当前语种，使用默认语种
+                            targetLanguage = defaultLanguage;
+                        }
+                        else {
+                            // 设备已设置当前语种，获取对应的语种代码
+                            const currentLanguage = (_f = (_e = this.guiContext) === null || _e === void 0 ? void 0 : _e.getLanguageCultureById) === null || _f === void 0 ? void 0 : _f.call(_e, currentLanguageId);
+                            if (currentLanguage) {
+                                targetLanguage = currentLanguage;
+                            }
+                            else {
+                                // 无法获取语种代码，使用默认语种
+                                targetLanguage = defaultLanguage;
+                            }
+                        }
+                        // 返回对应语种的文本
+                        if (textEntry.cultures && textEntry.cultures[targetLanguage]) {
+                            return textEntry.cultures[targetLanguage];
                         }
-                        // 如果没有对应语种，返回默认值
+                        // 如果没有对应语种，返回空字符串
                         return '';
                     }
                 }

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"},{"__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"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"TextElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-dynamic-display-element","name":"ConditionalDynamicDisplayElement","line":12,"character":33},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":19,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":19,"character":48},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":19,"character":77},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":20,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":20,"character":67},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":20,"character":111},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"../../service","name":"TextLibraryService","line":22,"character":46},{"__symbolic":"reference","module":"../../service","name":"LanguageService","line":23,"character":43},{"__symbolic":"reference","module":"../../gui/gui-context","name":"GuiContext","line":24,"character":38}]}],"dispose":[{"__symbolic":"method"}],"subscribeLanguageChange":[{"__symbolic":"method"}],"reRenderText":[{"__symbolic":"method"}],"getDisplayText":[{"__symbolic":"method"}],"handleTextValue":[{"__symbolic":"method"}],"initGraph":[{"__symbolic":"method"}]}}}}]

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

@@ -7,6 +7,7 @@ import { PermissionChecker, OperationRecordService, TextLibraryService, Language
 import { VariableCommunicator } from '../../communication';
 import { ConditionalEnableElement } from '../base/conditional-enable-element';
 import { SecurityChecker } from '../../security';
+import { GuiContext } from '../../gui/gui-context';
 export declare class SwitchIndicatorLightElement extends ConditionalEnableElement {
     private readonly modalService;
     private readonly graphStore;
@@ -14,6 +15,7 @@ export declare class SwitchIndicatorLightElement extends ConditionalEnableElemen
     private readonly securityChecker;
     private readonly textLibraryService?;
     private readonly languageService?;
+    private readonly guiContext?;
     protected readonly model: SwitchIndicatorLight;
     private readonly logger;
     private switchOperator;
@@ -26,7 +28,7 @@ export declare class SwitchIndicatorLightElement extends ConditionalEnableElemen
     private restorationTimer;
     private isWriteRestorationDownValue;
     private onDocMouseUp;
-    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);
+    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, guiContext?: GuiContext);
     handleMouseUp(): void;
     private initOnDocMouseUpEvent;
     private checkElementPassword;
@@ -37,5 +39,9 @@ export declare class SwitchIndicatorLightElement extends ConditionalEnableElemen
     private currentStateIdChange;
     private switchToState;
     private initGraphAndText;
+    /**
+     * 释放资源
+     */
+    dispose(): void;
     private checkState;
 }