@flexem/fc-gui 3.0.0-alpha.17 → 3.0.0-alpha.171

package/elements/scroll-alarm/scroll-alarm-element.metadata.json

@@ -0,0 +1 @@
+[{"__symbolic":"module","version":4,"metadata":{"ScrollAlarmElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-dynamic-display-element","name":"ConditionalDynamicDisplayElement","line":16,"character":40},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":54,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":55,"character":18},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":56,"character":27},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":57,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":58,"character":23},{"__symbolic":"reference","module":"../../config","name":"AlarmsStore","line":59,"character":38},{"__symbolic":"reference","name":"string"}]}],"dispose":[{"__symbolic":"method"}],"getAlarmData":[{"__symbolic":"method"}],"initDisplayContainer":[{"__symbolic":"method"}],"_buildFontAttrs":[{"__symbolic":"method"}],"_createSvgTextNode":[{"__symbolic":"method"}],"_measureTextWithCanvas":[{"__symbolic":"method"}],"_getSvgTextWidth":[{"__symbolic":"method"}],"_updateUnderlineWidth":[{"__symbolic":"method"}],"renderNewPage":[{"__symbolic":"method"}],"_rebaseTextNodes":[{"__symbolic":"method"}],"removeOldestPage":[{"__symbolic":"method"}],"scrollContent":[{"__symbolic":"method"}],"initScrolling":[{"__symbolic":"method"}],"resetToFirstPage":[{"__symbolic":"method"}],"updateQueryTimeRange":[{"__symbolic":"method"}],"setStatusAsNormal":[{"__symbolic":"method"}],"setStatusAsLoading":[{"__symbolic":"method"}],"renderStatus":[{"__symbolic":"method"}],"clearStatus":[{"__symbolic":"method"}],"renderStaticDisplay":[{"__symbolic":"method"}],"initStaticScrolling":[{"__symbolic":"method"}],"scrollStaticContent":[{"__symbolic":"method"}],"replaceCurrentScrollingContent":[{"__symbolic":"method"}]}}}}]

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

@@ -24,4 +24,5 @@ export declare class GraphStateElement {
     private removeImageElement;
     private doFaultFlicker;
     private clearFlickerInterval;
+    dispose(): void;
 }

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

@@ -42,12 +42,19 @@ export class GraphStateElement {
         }
     }
     changeGraph(stateId, graphResult) {
+        // 检查元素是否已被销毁
+        if (!this._element) {
+            return;
+        }
         if (!graphResult.failed) {
             const graph = graphResult.graph;
             switch (graph.graphType) {
                 case GraphType.Image:
                 case GraphType.SVG:
                     const imageElement = this.getImageElement();
+                    if (!imageElement) {
+                        return;
+                    }
                     imageElement.setAttributeNS('http://www.w3.org/1999/xlink', 'href', graph.source);
                     this.doFaultFlicker(imageElement, stateId);
                     break;
@@ -63,6 +70,10 @@ export class GraphStateElement {
     }
     getImageElement() {
         if (!this.imageElement) {
+            // 检查 _element 是否已被销毁
+            if (!this._element) {
+                return null;
+            }
             this.imageElement = document.createElementNS('http://www.w3.org/2000/svg', 'image');
             this.imageElement.setAttribute('width', this.width + '');
             this.imageElement.setAttribute('height', this.height + '');
@@ -74,7 +85,7 @@ export class GraphStateElement {
         return this.imageElement;
     }
     removeImageElement() {
-        if (this.imageElement) {
+        if (this.imageElement && this._element) {
             this._element.removeChild(this.imageElement);
             delete this.imageElement;
         }
@@ -107,4 +118,22 @@ export class GraphStateElement {
             }
         }
     }
+    dispose() {
+        // 清理定时器
+        if (this.faultFlickerInterval) {
+            clearInterval(this.faultFlickerInterval);
+            this.faultFlickerInterval = undefined;
+        }
+        // 移除图片元素
+        this.removeImageElement();
+        // 清理图形缓存
+        if (this.graphs) {
+            this.graphs.clear();
+        }
+        // 清理 SVG 元素
+        if (this._element && this._element.parentNode) {
+            this._element.parentNode.removeChild(this._element);
+        }
+        this._element = null;
+    }
 }

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

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"GraphStateElement":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"../../../model","name":"GraphSetting","line":21,"character":47},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","module":"../../../config","name":"GraphStore","line":24,"character":37},{"__symbolic":"reference","module":"../../../logger","name":"LoggerService","line":25,"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":27,"character":41}]}]}],"switchToState":[{"__symbolic":"method"}],"changeGraph":[{"__symbolic":"method"}],"getImageElement":[{"__symbolic":"method"}],"removeImageElement":[{"__symbolic":"method"}],"doFaultFlicker":[{"__symbolic":"method"}],"clearFlickerInterval":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"GraphStateElement":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"../../../model","name":"GraphSetting","line":21,"character":47},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","module":"../../../config","name":"GraphStore","line":24,"character":37},{"__symbolic":"reference","module":"../../../logger","name":"LoggerService","line":25,"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":27,"character":41}]}]}],"switchToState":[{"__symbolic":"method"}],"changeGraph":[{"__symbolic":"method"}],"getImageElement":[{"__symbolic":"method"}],"removeImageElement":[{"__symbolic":"method"}],"doFaultFlicker":[{"__symbolic":"method"}],"clearFlickerInterval":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}]}}}}]

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

@@ -1,8 +1,22 @@
 import { Font } from '../../../model';
 export declare class TextElementModal {
     private _element;
+    private font;
+    private width;
+    private height;
+    private isVariableText?;
     get Element(): SVGElement;
     constructor(content: string, font: Font, width: number, height: number, isVariableText?: boolean);
+    /**
+     * 更新字体样式
+     * @param font 新的字体样式
+     */
+    updateFont(font: Font): void;
+    /**
+     * 更新文本内容
+     * @param content 新的文本内容
+     */
+    updateText(content: string): void;
     private getforeignObjectElement;
     private createNewForeignObjectText;
 }

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,28 @@ export class TextElementModal {
     get Element() {
         return this._element;
     }
+    /**
+     * 更新字体样式
+     * @param font 新的字体样式
+     */
+    updateFont(font) {
+        this.font = font;
+    }
+    /**
+     * 更新文本内容
+     * @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());
@@ -19,7 +46,7 @@ export class TextElementModal {
         return textElement;
     }
     createNewForeignObjectText(content, font, width, height, isVariableText) {
-        if (font) {
+        if (font && !font.fontFamily.includes(',msyh')) {
             font.fontFamily += ',msyh';
         }
         const bodyDiv = document.createElement('div');
@@ -36,7 +63,7 @@ export class TextElementModal {
         for (let index = 0; index < textArray.length; index++) {
             const textDiv = document.createElement('div');
             textDiv.className = 'text-list';
-            textDiv.innerHTML = textArray[index] ? textArray[index] : '&nbsp;';
+            const innerHTML = textArray[index] ? textArray[index] : '&nbsp;';
             let fontString = '';
             if (font.isItalic) {
                 fontString += 'italic ';
@@ -45,12 +72,23 @@ export class TextElementModal {
                 fontString += 'bold ';
             }
             let lineHeight = 0;
+            // chrome支持可显示最小字体大小为12px, 更小字体通过缩放实现
+            const minFontSize = 12;
             lineHeight = parseInt(font.fontSize, 10) + 5;
             fontString += font.fontSize + '/' + lineHeight.toString() + 'px ' + font.fontFamily;
-            textDiv.style.cssText = `color: ${font.color};word-break: break-all;font: ${fontString};`;
-            if (font.isUnderline) {
+            textDiv.style.cssText = `color: ${font.color};word-break: break-all;font: ${fontString};text-align: ${textAlign};`;
+            if (font.isUnderline && content.length > 0) {
                 textDiv.style.textDecoration = 'underline';
             }
+            const spanText = document.createElement('span');
+            spanText.style.cssText = `
+                display: contents;
+                transform: scale(${parseInt(font.fontSize, 10) > minFontSize ? 1 : parseInt(font.fontSize, 10) / minFontSize});
+                width: 100%;
+                height: 100%;
+            `;
+            spanText.innerHTML = innerHTML;
+            textDiv.appendChild(spanText);
             fragment.appendChild(textDiv);
         }
         bodyDiv.appendChild(fragment);

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"}]}],"updateFont":[{"__symbolic":"method"}],"updateText":[{"__symbolic":"method"}],"getforeignObjectElement":[{"__symbolic":"method"}],"createNewForeignObjectText":[{"__symbolic":"method"}]}}}}]

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

@@ -1,6 +1,9 @@
 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';
+import { GuiContext } from '../../../gui/gui-context';
 export declare class TextStateElement {
     private readonly textStates;
     private width;
@@ -8,16 +11,50 @@ export declare class TextStateElement {
     private readonly logger;
     private readonly version?;
     private readonly faultFlickers?;
+    private readonly textLibrarySetting?;
+    private readonly textLibraryService?;
+    private readonly languageService?;
+    private readonly guiContext?;
+    private readonly allowEmpty;
+    private readonly fontStyleCultures?;
     private textElement;
     private _element;
     get Element(): SVGElement;
     private faultFlickerStatus;
     private faultFlickerInterval;
-    constructor(textStates: TextState[], width: number, height: number, logger: LoggerService, version?: number, faultFlickers?: IndicatorLightFaultFlicker[]);
+    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, allowEmpty?: boolean, fontStyleCultures?: {
+        [stateId: string]: {
+            [languageCode: string]: any;
+        };
+    });
     switchToState(stateId: number): void;
+    /**
+     * 订阅语种变化事件
+     * 当设备的语种ID改变时，重新渲染当前状态的文本
+     */
+    private subscribeLanguageChange;
+    /**
+     * 释放资源
+     */
+    dispose(): void;
     private getforeignObjectElement;
-    private createNewForeignObjectText;
     private removeForeignObjectlement;
     private doFaultFlicker;
     private clearFlickerInterval;
+    /**
+     * 获取指定状态在当前语种下的字体样式
+     * fontStyleCultures 中保存的对象含 fontStyle 字符串但无 isBold/isItalic/fontFamily，
+     * 此处从 fontStyle 解析这三个字段后返回
+     */
+    private getFontForState;
+    /**
+     * 获取显示文本
+     * 支持三种格式：
+     * 1. 新格式：textData.cultures 在顶层（与 content 并列）
+     * 2. 中间格式：textData.content 为 { cultures: {...} }（已废弃，向下兼容）
+     * 3. 旧格式：textData.content 为字符串
+     */
+    private getDisplayText;
 }

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

@@ -1,112 +1,151 @@
 import { Flicker } from '../../../model';
-import { isNil } from 'lodash';
 export class TextStateElement {
-    constructor(textStates, width, height, logger, version, faultFlickers) {
+    constructor(textStates, width, height, logger, version, faultFlickers, textLibrarySetting, textLibraryService, languageService, guiContext, allowEmpty = false, fontStyleCultures) {
         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.guiContext = guiContext;
+        this.allowEmpty = allowEmpty;
+        this.fontStyleCultures = fontStyleCultures;
         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();
             this.logger.debug(`Can not find text state:${stateId}.`);
             return;
         }
-        const content = textState.text.content;
-        if (content === '') {
+        // 获取显示文本（支持文本库）
+        const content = this.getDisplayText(stateId, textState.text);
+        if (content === '' || content == null) {
             this.removeForeignObjectlement();
             return;
         }
-        const font = textState.text.font;
+        const font = this.getFontForState(stateId, textState.text.font);
         if (!font) {
             this.removeForeignObjectlement();
             this.logger.debug('The font is undefined.');
             return;
         }
-        const foreignObjectElement = this.getforeignObjectElement();
-        foreignObjectElement.innerHTML = '';
-        const text = this.createNewForeignObjectText(content, font);
-        foreignObjectElement.appendChild(text);
-        this.doFaultFlicker(foreignObjectElement, stateId);
+        const textElement = this.getforeignObjectElement();
+        textElement.setAttribute('pointer-events', 'auto');
+        // 根据 textAlign 计算 SVG text-anchor 和 x 坐标
+        const textAlign = font.textAlign || 'center';
+        let textAnchor;
+        let anchorX;
+        if (textAlign === 'left') {
+            textAnchor = 'start';
+            anchorX = 0;
+        }
+        else if (textAlign === 'right') {
+            textAnchor = 'end';
+            anchorX = this.width;
+        }
+        else {
+            textAnchor = 'middle';
+            anchorX = this.width / 2;
+        }
+        // 拆分换行
+        const lines = content.split('\n');
+        const fontSize = parseInt(font.fontSize, 10);
+        const lineHeight = fontSize + 4;
+        // 总高度 = 行数 * 行高
+        const totalHeight = lines.length * lineHeight;
+        // 调整文本整体垂直居中（通过 dy）
+        const startY = (this.height / 2) - (totalHeight / 2) + (lineHeight / 2);
+        // 复用已有 tspan，不足则新建，多余则隐藏——避免删除 touch 目标节点导致 touchend 丢失
+        const existingTspans = Array.from(textElement.children);
+        for (let i = 0; i < lines.length; i++) {
+            let tspan = existingTspans[i];
+            if (!tspan) {
+                tspan = document.createElementNS('http://www.w3.org/2000/svg', 'tspan');
+                textElement.appendChild(tspan);
+            }
+            tspan.setAttribute('display', 'inline');
+            tspan.setAttribute('x', anchorX.toString());
+            tspan.setAttribute('y', startY + i * lineHeight + 'px');
+            tspan.textContent = lines[i].replace(/ /g, ' ');
+            tspan.setAttribute('font-size', font.fontSize);
+            tspan.setAttribute('fill', font.color);
+            tspan.setAttribute('font-family', font.fontFamily);
+            tspan.setAttribute('font-weight', font.isBold ? 'bold' : 'normal');
+            tspan.setAttribute('font-style', font.isItalic ? 'italic' : 'normal');
+            tspan.setAttribute('text-decoration', font.isUnderline ? 'underline' : 'none');
+            tspan.setAttribute('text-anchor', textAnchor);
+            tspan.setAttribute('dominant-baseline', 'middle');
+        }
+        // 隐藏多余的 tspan（不删除）
+        for (let i = lines.length; i < existingTspans.length; i++) {
+            existingTspans[i].setAttribute('display', 'none');
+        }
+        this.doFaultFlicker(textElement, stateId);
+    }
+    /**
+     * 订阅语种变化事件
+     * 当设备的语种ID改变时，重新渲染当前状态的文本
+     */
+    subscribeLanguageChange() {
+        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', 'foreignObject');
-            this.textElement.setAttribute('width', this.width.toString());
-            this.textElement.setAttribute('height', this.height.toString());
+            this.textElement = document.createElementNS('http://www.w3.org/2000/svg', 'text');
+            this.textElement.setAttribute('x', (this.width / 2).toString());
+            this.textElement.setAttribute('y', (this.height / 2).toString());
+            this.textElement.setAttribute('text-anchor', 'middle');
+            this.textElement.setAttribute('dominant-baseline', 'middle');
+            this.textElement.setAttribute('pointer-events', 'auto'); // 确保能接收事件
             this._element.appendChild(this.textElement);
         }
+        this.textElement.setAttribute('display', 'block');
         return this.textElement;
     }
-    createNewForeignObjectText(content, font) {
-        if (font) {
-            font.fontFamily += ',msyh';
-        }
-        const bodyDiv = document.createElement('div');
-        bodyDiv.style.textAlign = font.textAlign ? font.textAlign : 'center';
-        bodyDiv.style.userSelect = 'none';
-        bodyDiv.style.display = 'table-cell';
-        bodyDiv.style.verticalAlign = 'middle';
-        if (isNil(content)) {
-            content = '';
-        }
-        let textArray = content.toString().split('\n');
-        textArray = textArray.map(item => {
-            return item.toString().replace(/\s/g, '&nbsp;');
-        });
-        const fragment = document.createDocumentFragment();
-        for (let index = 0; index < textArray.length; index++) {
-            const textDiv = document.createElement('div');
-            textDiv.innerHTML = textArray[index] ? textArray[index] : '&nbsp;';
-            let fontString = '';
-            if (font.isItalic) {
-                fontString += 'italic ';
-            }
-            if (font.isBold) {
-                fontString += 'bold ';
-            }
-            textDiv.style.wordBreak = 'break-word';
-            textDiv.style.color = font.color;
-            let lineHeight = 0;
-            lineHeight = parseInt(font.fontSize, 10) + 5;
-            fontString += font.fontSize + 'px/' + lineHeight + 'px ' + font.fontFamily;
-            textDiv.style.font = fontString;
-            if (font.isUnderline) {
-                textDiv.style.textDecoration = 'underline';
-            }
-            fragment.appendChild(textDiv);
-        }
-        bodyDiv.appendChild(fragment);
-        const contentDiv = document.createElement('div');
-        contentDiv.style.display = 'table';
-        contentDiv.style.width = '100%';
-        contentDiv.style.height = '100%';
-        contentDiv.appendChild(bodyDiv);
-        const containerDiv = document.createElement('div');
-        containerDiv.style.overflow = 'hidden';
-        containerDiv.style.width = this.width.toString() + 'px';
-        containerDiv.style.height = this.height.toString() + 'px';
-        containerDiv.appendChild(contentDiv);
-        return containerDiv;
-    }
     removeForeignObjectlement() {
         if (this.textElement) {
-            this._element.removeChild(this.textElement);
-            delete this.textElement;
+            this.textElement.setAttribute('display', 'none');
+            this.textElement.textContent = '';
         }
     }
     doFaultFlicker(textElement, stateId) {
-        if (this.version > 3 && this.faultFlickers) {
+        if (this.version != null && this.version > 3 && this.faultFlickers) {
             this.clearFlickerInterval(textElement);
             const faultFlicker = this.faultFlickers.find(t => t.id === stateId);
             if (faultFlicker && faultFlicker.faultFlicker) {
@@ -133,4 +172,140 @@ export class TextStateElement {
             }
         }
     }
+    /**
+     * 获取指定状态在当前语种下的字体样式
+     * fontStyleCultures 中保存的对象含 fontStyle 字符串但无 isBold/isItalic/fontFamily，
+     * 此处从 fontStyle 解析这三个字段后返回
+     */
+    getFontForState(stateId, defaultFont) {
+        if (!this.fontStyleCultures) {
+            return defaultFont;
+        }
+        const stateKey = stateId.toString();
+        if (!this.fontStyleCultures[stateKey]) {
+            return defaultFont;
+        }
+        const getTargetLanguage = () => {
+            var _a, _b, _c, _d, _e, _f;
+            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;
+            const defaultLanguage = ((_d = this.languageService) === null || _d === void 0 ? void 0 : _d.getDefaultLanguage()) || 'zh-CN';
+            if (currentLanguageId === null || currentLanguageId === undefined) {
+                return defaultLanguage;
+            }
+            return ((_f = (_e = this.guiContext) === null || _e === void 0 ? void 0 : _e.getLanguageCultureById) === null || _f === void 0 ? void 0 : _f.call(_e, currentLanguageId)) || defaultLanguage;
+        };
+        const targetLanguage = getTargetLanguage();
+        if (this.fontStyleCultures[stateKey][targetLanguage]) {
+            const culturedFont = this.fontStyleCultures[stateKey][targetLanguage];
+            if (culturedFont.fontStyle) {
+                const fs = culturedFont.fontStyle;
+                const isBold = fs.indexOf('bold') !== -1;
+                const isItalic = fs.indexOf('Italic') !== -1;
+                const parts = fs.split(' ');
+                const familyIndex = (isBold ? 1 : 0) + (isItalic ? 1 : 0) + 1;
+                const fontFamily = parts.length > familyIndex ? parts[familyIndex] : null;
+                return Object.assign(Object.assign({}, culturedFont), { isBold, isItalic, fontFamily });
+            }
+            return culturedFont;
+        }
+        return defaultFont;
+    }
+    /**
+     * 获取显示文本
+     * 支持三种格式：
+     * 1. 新格式：textData.cultures 在顶层（与 content 并列）
+     * 2. 中间格式：textData.content 为 { cultures: {...} }（已废弃，向下兼容）
+     * 3. 旧格式：textData.content 为字符串
+     */
+    getDisplayText(stateId, textData) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        const getTargetLanguage = () => {
+            var _a, _b, _c, _d, _e, _f;
+            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;
+            const defaultLanguage = ((_d = this.languageService) === null || _d === void 0 ? void 0 : _d.getDefaultLanguage()) || 'zh-CN';
+            if (currentLanguageId === null || currentLanguageId === undefined) {
+                return defaultLanguage;
+            }
+            return ((_f = (_e = this.guiContext) === null || _e === void 0 ? void 0 : _e.getLanguageCultureById) === null || _f === void 0 ? void 0 : _f.call(_e, currentLanguageId)) || defaultLanguage;
+        };
+        const defaultContent = textData === null || textData === void 0 ? void 0 : textData.content;
+        // 新格式：cultures 在 text 顶层
+        if (textData && textData.cultures && typeof textData.cultures === 'object') {
+            const targetLanguage = getTargetLanguage();
+            if (textData.cultures[targetLanguage]) {
+                return textData.cultures[targetLanguage];
+            }
+            else if (this.allowEmpty) {
+                return '';
+            }
+            else {
+                const language = ((_c = (_b = (_a = window.abp) === null || _a === void 0 ? void 0 : _a.localization) === null || _b === void 0 ? void 0 : _b.currentLanguage) === null || _c === void 0 ? void 0 : _c.name) || 'zh-Hans';
+                const isChinese = language === 'zh-Hans' || language === 'zh';
+                return isChinese ? '文本' : 'Text';
+            }
+        }
+        // 中间格式（兼容）：content 为 { cultures: {...} }
+        if (defaultContent && typeof defaultContent === 'object' && defaultContent.cultures) {
+            const targetLanguage = getTargetLanguage();
+            if (defaultContent.cultures[targetLanguage]) {
+                return defaultContent.cultures[targetLanguage];
+            }
+            else if (this.allowEmpty) {
+                return '';
+            }
+            else {
+                const language = ((_f = (_e = (_d = window.abp) === null || _d === void 0 ? void 0 : _d.localization) === null || _e === void 0 ? void 0 : _e.currentLanguage) === null || _f === void 0 ? void 0 : _f.name) || 'zh-Hans';
+                const isChinese = language === 'zh-Hans' || language === 'zh';
+                return isChinese ? '文本' : 'Text';
+            }
+        }
+        // 检查是否使用文本库
+        if (this.textLibrarySetting && this.textLibrarySetting.labelType === 'textLibrary') {
+            const textLibraryId = this.textLibrarySetting.selectedTextLibraryItem;
+            if (textLibraryId && this.textLibraryService) {
+                // 获取文本库数据
+                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) {
+                        // 获取当前语种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) {
+                                // 直接使用设备设置的语种，不再fallback
+                                targetLanguage = currentLanguage;
+                            }
+                            else {
+                                targetLanguage = defaultLanguage;
+                            }
+                        }
+                        // 返回对应语种的文本，如果没有则返回空字符串
+                        if (textEntry.cultures && textEntry.cultures[targetLanguage]) {
+                            const text = textEntry.cultures[targetLanguage];
+                            return text;
+                        }
+                        else {
+                            // 对应语种没有文本，返回空字符串
+                            return '';
+                        }
+                    }
+                }
+            }
+        }
+        // 处理字符串格式的 defaultContent
+        if (typeof defaultContent === 'string') {
+            return defaultContent;
+        }
+        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":18,"character":45}]},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","module":"../../../logger","name":"LoggerService","line":21,"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":23,"character":41}]}]}],"switchToState":[{"__symbolic":"method"}],"getforeignObjectElement":[{"__symbolic":"method"}],"createNewForeignObjectText":[{"__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":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},{"__symbolic":"reference","name":"boolean"},{"__symbolic":"error","message":"Expression form not supported","line":34,"character":45}]}],"switchToState":[{"__symbolic":"method"}],"subscribeLanguageChange":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}],"getforeignObjectElement":[{"__symbolic":"method"}],"removeForeignObjectlement":[{"__symbolic":"method"}],"doFaultFlicker":[{"__symbolic":"method"}],"clearFlickerInterval":[{"__symbolic":"method"}],"getFontForState":[{"__symbolic":"method"}],"getDisplayText":[{"__symbolic":"method"}]}}}}]