@flexem/fc-gui 3.0.0-alpha.14 → 3.0.0-alpha.140

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

@@ -3,12 +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) {
+    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');
@@ -22,6 +27,40 @@ 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.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;
@@ -42,7 +81,96 @@ export class HyperlinkElement extends ConditionalDynamicDisplayElement {
             color: this.model.stroke,
             textAlign: this.model.textAlign
         };
-        const textElement = new TextElementModal(this.model.text, font, width, height);
-        this.$element.append(textElement.Element);
+        // 获取显示文本（支持文本库）
+        const displayText = this.getDisplayText();
+        this.textElementModal = new TextElementModal(displayText, font, width, height);
+        this.$element.append(this.textElementModal.Element);
+    }
+    /**
+     * 获取显示文本
+     * 如果配置了文本库，则从文本库中获取对应语种的文本
+     * 否则返回默认文本
+     */
+    getDisplayText() {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+        // 检查是否使用文本库
+        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 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) {
+                        // 获取当前语种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 '';
+                    }
+                }
+            }
+            // 文本库配置但未找到数据，返回空字符串
+            return '';
+        }
+        // 处理自定义文本（支持多语种）
+        if (this.model.text) {
+            // 检查是否为多语种格式
+            if (typeof this.model.text === 'object' && this.model.text.cultures) {
+                // 新格式：多语种对象
+                // 获取当前语种ID
+                const currentLanguageId = (_j = (_h = (_g = this.guiContext) === null || _g === void 0 ? void 0 : _g.getCurrentLanguageId) === null || _h === void 0 ? void 0 : _h.call(_g)) !== null && _j !== void 0 ? _j : null;
+                // 确定要使用的语种代码（culture）
+                let targetLanguage;
+                const defaultLanguage = ((_k = this.languageService) === null || _k === void 0 ? void 0 : _k.getDefaultLanguage()) || 'zh-CN';
+                if (currentLanguageId === null || currentLanguageId === undefined) {
+                    // 设备未设置当前语种，使用默认语种
+                    targetLanguage = defaultLanguage;
+                }
+                else {
+                    // 设备已设置当前语种，获取对应的语种代码
+                    const currentLanguage = (_m = (_l = this.guiContext) === null || _l === void 0 ? void 0 : _l.getLanguageCultureById) === null || _m === void 0 ? void 0 : _m.call(_l, currentLanguageId);
+                    if (currentLanguage) {
+                        targetLanguage = currentLanguage;
+                    }
+                    else {
+                        targetLanguage = defaultLanguage;
+                    }
+                }
+                // 返回对应语种的文本，如果没有则根据当前语言环境显示默认文本
+                // 获取当前语言环境
+                const language = ((_q = (_p = (_o = window.abp) === null || _o === void 0 ? void 0 : _o.localization) === null || _p === void 0 ? void 0 : _p.currentLanguage) === null || _q === void 0 ? void 0 : _q.name) || 'zh-Hans';
+                const isChinese = language === 'zh-Hans' || language === 'zh';
+                return this.model.text.cultures[targetLanguage] || (isChinese ? '超链接' : 'Hyperlink');
+            }
+            else if (typeof this.model.text === 'string') {
+                // 旧格式：字符串
+                return this.model.text;
+            }
+        }
+        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"}]}],"initGraphAndText":[{"__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

@@ -4,13 +4,35 @@ 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';
+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);
+    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;
+    /**
+     * 获取显示文本
+     * 如果配置了文本库，则从文本库中获取对应语种的文本
+     * 如果是多语种自定义文本，则根据当前语种ID获取对应语种的文本
+     * 否则返回默认文本
+     */
+    private getDisplayText;
     private handleTextValue;
     private initGraph;
 }

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

@@ -3,9 +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) {
+    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;
@@ -26,8 +29,12 @@ export class TextElement extends ConditionalDynamicDisplayElement {
                 color: this.model.stroke,
                 textAlign: this.model.textAlign
             };
-            const textElement = new TextElementModal(this.model.text, font, width, height);
-            this.$element.append(textElement.Element);
+            // 获取显示文本（支持文本库）
+            const displayText = this.getDisplayText();
+            this.textElementModal = new TextElementModal(displayText, font, width, height);
+            this.$element.append(this.textElementModal.Element);
+            // 订阅语种变化
+            this.subscribeLanguageChange();
         }
         else {
             this.handleTextValue();
@@ -37,10 +44,127 @@ 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.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);
+    }
+    /**
+     * 获取显示文本
+     * 如果配置了文本库，则从文本库中获取对应语种的文本
+     * 如果是多语种自定义文本，则根据当前语种ID获取对应语种的文本
+     * 否则返回默认文本
+     */
+    getDisplayText() {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+        // 检查是否使用文本库
+        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 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) {
+                        // 获取当前语种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 '';
+                    }
+                }
+            }
+            // 文本库配置但未找到数据，返回空字符串
+            return '';
+        }
+        // 处理自定义文本（支持多语种）
+        if (this.model.text) {
+            // 检查是否为多语种格式
+            if (typeof this.model.text === 'object' && this.model.text.cultures) {
+                // 新格式：多语种对象
+                // 获取当前语种ID
+                const currentLanguageId = (_j = (_h = (_g = this.guiContext) === null || _g === void 0 ? void 0 : _g.getCurrentLanguageId) === null || _h === void 0 ? void 0 : _h.call(_g)) !== null && _j !== void 0 ? _j : null;
+                // 确定要使用的语种代码（culture）
+                let targetLanguage;
+                const defaultLanguage = ((_k = this.languageService) === null || _k === void 0 ? void 0 : _k.getDefaultLanguage()) || 'zh-CN';
+                if (currentLanguageId === null || currentLanguageId === undefined) {
+                    // 设备未设置当前语种，使用默认语种
+                    targetLanguage = defaultLanguage;
+                }
+                else {
+                    // 设备已设置当前语种，获取对应的语种代码
+                    const currentLanguage = (_m = (_l = this.guiContext) === null || _l === void 0 ? void 0 : _l.getLanguageCultureById) === null || _m === void 0 ? void 0 : _m.call(_l, currentLanguageId);
+                    if (currentLanguage) {
+                        targetLanguage = currentLanguage;
+                    }
+                    else {
+                        targetLanguage = defaultLanguage;
+                    }
+                }
+                // 返回对应语种的文本，如果没有则根据当前语言环境显示默认文本
+                // 获取当前语言环境
+                const language = ((_q = (_p = (_o = window.abp) === null || _o === void 0 ? void 0 : _o.localization) === null || _p === void 0 ? void 0 : _p.currentLanguage) === null || _q === void 0 ? void 0 : _q.name) || 'zh-Hans';
+                const isChinese = language === 'zh-Hans' || language === 'zh';
+                return this.model.text.cultures[targetLanguage] || (isChinese ? '文本' : 'Text');
+            }
+            else if (typeof this.model.text === 'string') {
+                // 旧格式：字符串
+                return this.model.text;
+            }
+        }
+        return '';
+    }
     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":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

@@ -3,15 +3,19 @@ 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';
+import { GuiContext } from '../../gui/gui-context';
 export declare class SwitchIndicatorLightElement extends ConditionalEnableElement {
     private readonly modalService;
     private readonly graphStore;
     private readonly operationRecordService;
     private readonly securityChecker;
+    private readonly textLibraryService?;
+    private readonly languageService?;
+    private readonly guiContext?;
     protected readonly model: SwitchIndicatorLight;
     private readonly logger;
     private switchOperator;
@@ -24,7 +28,8 @@ 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);
+    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, textLibraryService?: TextLibraryService, languageService?: LanguageService, guiContext?: GuiContext);
     handleMouseUp(): void;
     private initOnDocMouseUpEvent;
     private checkElementPassword;
@@ -35,5 +40,9 @@ export declare class SwitchIndicatorLightElement extends ConditionalEnableElemen
     private currentStateIdChange;
     private switchToState;
     private initGraphAndText;
+    /**
+     * 释放资源
+     */
+    dispose(): void;
     private checkState;
 }

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

@@ -17,12 +17,15 @@ 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, guiContext) {
         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.guiContext = guiContext;
         this.isBitRestoration = false; // 是否是 位设定且执行设置是复位
         this.isVerifiedForRestoration = false; // 位设定且执行设置是复位情况下，是否已经完成了验证
         this.isWriteRestorationDownValue = false;
@@ -32,7 +35,8 @@ export class SwitchIndicatorLightElement extends ConditionalEnableElement {
         if (this.model.useSwitch) {
             this.initSwitchOperator();
             this.rootElement.style('cursor', 'hand');
-            this.rootElement.on('mousedown', () => {
+            const isMobile = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i);
+            this.rootElement.on(this.isMobileMode && isMobile ? 'touchstart' : 'mousedown', () => {
                 if (!this.isInitialized) {
                     return;
                 }
@@ -59,13 +63,13 @@ export class SwitchIndicatorLightElement extends ConditionalEnableElement {
                         }
                         else {
                             this.checkElementPassword(false);
-                            if (!this.model.useIndicatorLight && !this.isMobileMode) {
+                            if (!this.model.useIndicatorLight) {
                                 this.switchToState(1);
                             }
                         }
                     }
                     else {
-                        document.addEventListener('mouseup', this.onDocMouseUp);
+                        document.addEventListener(this.isMobileMode ? 'touchend' : 'mouseup', this.onDocMouseUp);
                         this.restorationTimer = setTimeout(() => {
                             this.writeValue(1);
                             this.isWriteRestorationDownValue = true;
@@ -74,7 +78,7 @@ export class SwitchIndicatorLightElement extends ConditionalEnableElement {
                     d3.event.preventDefault();
                 }
             });
-            this.rootElement.on('mouseup', () => {
+            this.rootElement.on(this.isMobileMode && isMobile ? 'touchend' : 'mouseup', () => {
                 this.handleMouseUp();
                 d3.event.stopPropagation();
             });
@@ -96,10 +100,10 @@ export class SwitchIndicatorLightElement extends ConditionalEnableElement {
         if (this.isBitRestoration && this.isWriteRestorationDownValue) {
             this.writeValue(0);
         }
-        document.removeEventListener('mouseup', this.onDocMouseUp);
+        document.removeEventListener(this.isMobileMode ? 'touchend' : 'mouseup', this.onDocMouseUp);
         this.isVerifiedForRestoration = false;
         this.isWriteRestorationDownValue = false;
-        if (!this.model.useIndicatorLight && !this.isMobileMode) {
+        if (!this.model.useIndicatorLight) {
             this.switchToState(0);
             if (d3.event) {
                 d3.event.preventDefault();
@@ -137,7 +141,7 @@ export class SwitchIndicatorLightElement extends ConditionalEnableElement {
                 }
                 else {
                     this.isVerifiedForRestoration = true;
-                    document.addEventListener('mouseup', this.onDocMouseUp);
+                    document.addEventListener(this.isMobileMode ? 'touchend' : 'mouseup', this.onDocMouseUp);
                     this.restorationTimer = setTimeout(() => {
                         this.writeValue(1);
                         this.isWriteRestorationDownValue = true;
@@ -207,7 +211,7 @@ export class SwitchIndicatorLightElement extends ConditionalEnableElement {
             default:
                 throw new Error(`Unknown switchType:${settings.type}`);
         }
-        this.indicatorLightOperator.currentStateIdChanged.subscribe(statusIdValue => {
+        this.indicatorLightSubscription = this.indicatorLightOperator.currentStateIdChanged.subscribe(statusIdValue => {
             this.currentStateIdChange(statusIdValue);
         });
         this.indicatorLightOperator.requestData(this.signalRAppId);
@@ -237,9 +241,44 @@ 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.guiContext, true);
         this.$element.append(this.textStateElement.Element);
     }
+    /**
+     * 释放资源
+     */
+    dispose() {
+        // 释放文本元素资源（取消语种变化订阅等）
+        if (this.textStateElement) {
+            this.textStateElement.dispose();
+        }
+        // 释放指示灯操作器资源
+        if (this.indicatorLightOperator) {
+            // indicatorLightOperator 可能有自己的dispose方法
+        }
+        // 清除定时器
+        if (this.restorationTimer) {
+            clearTimeout(this.restorationTimer);
+            this.restorationTimer = undefined;
+        }
+        // 移除事件监听
+        if (this.onDocMouseUp) {
+            document.removeEventListener(this.isMobileMode ? 'touchend' : 'mouseup', this.onDocMouseUp);
+        }
+        // 清理 indicatorLightOperator 订阅
+        if (this.indicatorLightSubscription) {
+            this.indicatorLightSubscription.unsubscribe();
+        }
+        // 清理图形元素（释放 SVG 内存）
+        if (this.graphStateElement) {
+            this.graphStateElement.dispose();
+        }
+        // 清理文本元素
+        if (this.textStateElement) {
+            // TextStateElement 可能也需要 dispose，暂时先清理引用
+            this.textStateElement = null;
+        }
+    }
     checkState() {
         if (!this.model.states) {
             throw new Error('The switch indicator light\'s states is undefined.');

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":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"}]}],"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"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"SwitchIndicatorLightElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-enable-element","name":"ConditionalEnableElement","line":33,"character":49},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":52,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":53,"character":18},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":54,"character":39},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":55,"character":30},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":56,"character":37},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":57,"character":27},{"__symbolic":"reference","module":"../../service","name":"OperationRecordService","line":58,"character":49},{"__symbolic":"reference","module":"../../security","name":"SecurityChecker","line":59,"character":42},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":60,"character":23},{"__symbolic":"reference","module":"../../localization","name":"Localization","line":61,"character":22},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"../../service","name":"TextLibraryService","line":63,"character":46},{"__symbolic":"reference","module":"../../service","name":"LanguageService","line":64,"character":43},{"__symbolic":"reference","module":"../../gui/gui-context","name":"GuiContext","line":65,"character":38}]}],"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"}],"dispose":[{"__symbolic":"method"}],"checkState":[{"__symbolic":"method"}]}}}}]

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

@@ -16,6 +16,9 @@ export declare class VideoElement extends ConditionalDisplayElement {
     private videoId;
     private isShow;
     private videoPlayer;
+    private refreshTimer;
+    private isFullscreen;
+    private videoUrl;
     constructor(element: HTMLElement, injector: Injector, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, videoService: VideoService, guiSize: Size, svgRootClass: string, signalRAppId: string);
     dispose(): void;
     hide(): void;
@@ -24,4 +27,5 @@ export declare class VideoElement extends ConditionalDisplayElement {
     private initVideo;
     private addVideoAddressToolTip;
     private setAndroidVideo;
+    private setIosVideo;
 }