@flexem/fc-gui 3.0.0-alpha.156 → 3.0.0-alpha.157

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

@@ -7,6 +7,11 @@ export declare class TextElementModal {
     private isVariableText?;
     get Element(): SVGElement;
     constructor(content: string, font: Font, width: number, height: number, isVariableText?: boolean);
+    /**
+     * 更新字体样式
+     * @param font 新的字体样式
+     */
+    updateFont(font: Font): void;
     /**
      * 更新文本内容
      * @param content 新的文本内容

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

@@ -17,6 +17,13 @@ export class TextElementModal {
     get Element() {
         return this._element;
     }
+    /**
+     * 更新字体样式
+     * @param font 新的字体样式
+     */
+    updateFont(font) {
+        this.font = font;
+    }
     /**
      * 更新文本内容
      * @param content 新的文本内容

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":15,"character":39},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"boolean"}]}],"updateText":[{"__symbolic":"method"}],"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

@@ -16,6 +16,7 @@ export declare class TextStateElement {
     private readonly languageService?;
     private readonly guiContext?;
     private readonly allowEmpty;
+    private readonly fontStyleCultures?;
     private textElement;
     private _element;
     get Element(): SVGElement;
@@ -23,7 +24,11 @@ export declare class TextStateElement {
     private faultFlickerInterval;
     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);
+    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;
     /**
      * 订阅语种变化事件
@@ -38,6 +43,10 @@ export declare class TextStateElement {
     private removeForeignObjectlement;
     private doFaultFlicker;
     private clearFlickerInterval;
+    /**
+     * 获取指定状态在当前语种下的字体样式
+     */
+    private getFontForState;
     /**
      * 获取显示文本
      * 支持三种格式：

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, guiContext, allowEmpty = false) {
+    constructor(textStates, width, height, logger, version, faultFlickers, textLibrarySetting, textLibraryService, languageService, guiContext, allowEmpty = false, fontStyleCultures) {
         this.textStates = textStates;
         this.width = width;
         this.height = height;
@@ -12,6 +12,7 @@ export class TextStateElement {
         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');
@@ -36,7 +37,7 @@ export class TextStateElement {
             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.');
@@ -158,6 +159,32 @@ export class TextStateElement {
             }
         }
     }
+    /**
+     * 获取指定状态在当前语种下的字体样式
+     */
+    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]) {
+            return this.fontStyleCultures[stateKey][targetLanguage];
+        }
+        return defaultFont;
+    }
     /**
      * 获取显示文本
      * 支持三种格式：

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":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"}]}],"switchToState":[{"__symbolic":"method"}],"subscribeLanguageChange":[{"__symbolic":"method"}],"dispose":[{"__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},{"__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"}]}}}}]

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

@@ -27,6 +27,10 @@ export declare class HyperlinkElement extends ConditionalDynamicDisplayElement {
      */
     private reRenderText;
     private initGraphAndText;
+    /**
+     * 获取当前语种的字体样式
+     */
+    private getFontStyle;
     /**
      * 获取显示文本
      * 如果配置了文本库，则从文本库中获取对应语种的文本

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

@@ -56,9 +56,9 @@ export class HyperlinkElement extends ConditionalDynamicDisplayElement {
         if (!this.textElementModal || !this.model.size) {
             return;
         }
-        // 获取新的显示文本
         const displayText = this.getDisplayText();
-        // 直接更新文本内容，而不是重新创建元素
+        const font = this.getFontStyle();
+        this.textElementModal.updateFont(font);
         this.textElementModal.updateText(displayText);
     }
     initGraphAndText() {
@@ -72,7 +72,39 @@ export class HyperlinkElement extends ConditionalDynamicDisplayElement {
             graphStateElement.switchToState(0);
             this.$element.prepend(graphStateElement.Element);
         }
-        const font = {
+        const font = this.getFontStyle();
+        // 获取显示文本（支持文本库）
+        const displayText = this.getDisplayText();
+        this.textElementModal = new TextElementModal(displayText, font, width, height);
+        this.$element.append(this.textElementModal.Element);
+    }
+    /**
+     * 获取当前语种的字体样式
+     */
+    getFontStyle() {
+        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.model.fontStyleCultures && this.model.fontStyleCultures[targetLanguage]) {
+            const style = this.model.fontStyleCultures[targetLanguage];
+            return {
+                isUnderline: style.isUnderline,
+                isBold: this.isBold(style.fontStyle),
+                isItalic: this.isItalic(style.fontStyle),
+                fontSize: style.fontSize,
+                fontFamily: this.fontFamily(style.fontStyle),
+                color: style.fontColor,
+                textAlign: style.textAlign
+            };
+        }
+        return {
             isUnderline: this.model.isUnderline,
             isBold: this.isBold(this.model.font),
             isItalic: this.isItalic(this.model.font),
@@ -81,10 +113,6 @@ export class HyperlinkElement extends ConditionalDynamicDisplayElement {
             color: this.model.stroke,
             textAlign: this.model.textAlign
         };
-        // 获取显示文本（支持文本库）
-        const displayText = this.getDisplayText();
-        this.textElementModal = new TextElementModal(displayText, font, width, height);
-        this.$element.append(this.textElementModal.Element);
     }
     /**
      * 获取显示文本

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":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"}]}}}}]
+[{"__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"}],"getFontStyle":[{"__symbolic":"method"}],"getDisplayText":[{"__symbolic":"method"}]}}}}]

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

@@ -26,6 +26,10 @@ export declare class TextElement extends ConditionalDynamicDisplayElement {
      * 重新渲染文本
      */
     private reRenderText;
+    /**
+     * 获取当前语种的字体样式
+     */
+    private getFontStyle;
     /**
      * 获取显示文本
      * 如果配置了文本库，则从文本库中获取对应语种的文本

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

@@ -20,15 +20,7 @@ export class TextElement extends ConditionalDynamicDisplayElement {
                 graphStateElement.switchToState(0);
                 this.$element.prepend(graphStateElement.Element);
             }
-            const font = {
-                isUnderline: this.model.isUnderline,
-                isBold: this.isBold(this.model.font),
-                isItalic: this.isItalic(this.model.font),
-                fontSize: this.model.fontSize,
-                fontFamily: this.fontFamily(this.model.font),
-                color: this.model.stroke,
-                textAlign: this.model.textAlign
-            };
+            const font = this.getFontStyle();
             // 获取显示文本（支持文本库）
             const displayText = this.getDisplayText();
             this.textElementModal = new TextElementModal(displayText, font, width, height);
@@ -72,11 +64,52 @@ export class TextElement extends ConditionalDynamicDisplayElement {
         if (!this.textElementModal || !this.model.size) {
             return;
         }
-        // 获取新的显示文本
+        // 获取新的显示文本和样式
         const displayText = this.getDisplayText();
-        // 直接更新文本内容，而不是重新创建元素
+        const font = this.getFontStyle();
+        // 更新样式和文本内容
+        this.textElementModal.updateFont(font);
         this.textElementModal.updateText(displayText);
     }
+    /**
+     * 获取当前语种的字体样式
+     */
+    getFontStyle() {
+        // 获取目标语种
+        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.model.fontStyleCultures && this.model.fontStyleCultures[targetLanguage]) {
+            const style = this.model.fontStyleCultures[targetLanguage];
+            return {
+                isUnderline: style.isUnderline,
+                isBold: this.isBold(style.fontStyle),
+                isItalic: this.isItalic(style.fontStyle),
+                fontSize: style.fontSize,
+                fontFamily: this.fontFamily(style.fontStyle),
+                color: style.fontColor,
+                textAlign: style.textAlign
+            };
+        }
+        // 回退到全局样式
+        return {
+            isUnderline: this.model.isUnderline,
+            isBold: this.isBold(this.model.font),
+            isItalic: this.isItalic(this.model.font),
+            fontSize: this.model.fontSize,
+            fontFamily: this.fontFamily(this.model.font),
+            color: this.model.stroke,
+            textAlign: this.model.textAlign
+        };
+    }
     /**
      * 获取显示文本
      * 如果配置了文本库，则从文本库中获取对应语种的文本

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":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"}]}}}}]
+[{"__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"}],"getFontStyle":[{"__symbolic":"method"}],"getDisplayText":[{"__symbolic":"method"}],"handleTextValue":[{"__symbolic":"method"}],"initGraph":[{"__symbolic":"method"}]}}}}]

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

@@ -246,7 +246,7 @@ export class SwitchIndicatorLightElement extends ConditionalEnableElement {
             this.graphStateElement = new GraphStateElement(this.model.graphSetting, width, height, this.graphStore, this.logger, this.model.version, this.model.states);
             this.$element.append(this.graphStateElement.Element);
         }
-        this.textStateElement = new TextStateElement(this.model.states, width, height, this.logger, this.model.version, this.model.states, this.model.textLibrary, this.textLibraryService, this.languageService, this.guiContext, true);
+        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.model.fontStyleCultures);
         this.$element.append(this.textStateElement.Element);
     }
     /**

package/elements/view-operation/view-operation.element.d.ts

@@ -43,6 +43,10 @@ export declare class ViewOperationElement extends ConditionalEnableElement {
      * 订阅语种变化事件
      */
     private subscribeLanguageChange;
+    /**
+     * 获取当前语种的字体样式
+     */
+    private getFontStyle;
     /**
      * 更新文本内容（支持文本库和语种切换）
      */

package/elements/view-operation/view-operation.element.js

@@ -37,7 +37,7 @@ export class ViewOperationElement extends ConditionalEnableElement {
         this.$element.find('text').remove();
         this.initGraph(width, height);
         this.rootElement.append('rect').attr('id', 'StateFrame').attr('width', width).attr('height', height).attr('fill', 'transparent');
-        const font = Object.assign(Object.assign({}, this.model.label.font), { fontFamily: this.model.label.font.fontFamily || 'msyh' });
+        const font = this.getFontStyle();
         this.textElementModal = new TextElementModal(this.getDisplayText(), font, width, height);
         this.$element.append(this.textElementModal.Element);
         this.switchToState(0);
@@ -217,11 +217,41 @@ export class ViewOperationElement extends ConditionalEnableElement {
             });
         }
     }
+    /**
+     * 获取当前语种的字体样式
+     */
+    getFontStyle() {
+        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.model.fontStyleCultures && this.model.fontStyleCultures[targetLanguage]) {
+            const style = this.model.fontStyleCultures[targetLanguage];
+            return {
+                isUnderline: style.isUnderline,
+                isBold: style.isBold,
+                isItalic: style.isItalic,
+                fontSize: style.fontSize,
+                fontFamily: style.fontFamily || 'msyh',
+                color: style.color,
+                textAlign: style.textAlign
+            };
+        }
+        return Object.assign(Object.assign({}, this.model.label.font), { fontFamily: this.model.label.font.fontFamily || 'msyh' });
+    }
     /**
      * 更新文本内容（支持文本库和语种切换）
      */
     updateTextContent() {
         if (this.textElementModal) {
+            const font = this.getFontStyle();
+            this.textElementModal.updateFont(font);
             this.textElementModal.updateText(this.getDisplayText());
         }
     }

package/elements/view-operation/view-operation.element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"ViewOperationElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-enable-element","name":"ConditionalEnableElement","line":23,"character":42},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":36,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":36,"character":48},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":37,"character":39},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":38,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":39,"character":23},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":40,"character":37},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":41,"character":27},{"__symbolic":"reference","module":"../../service","name":"OperationRecordService","line":42,"character":49},{"__symbolic":"reference","module":"../../security","name":"SecurityChecker","line":43,"character":42},{"__symbolic":"reference","module":"../../localization","name":"Localization","line":44,"character":22},{"__symbolic":"reference","module":"../../view/popup-view.service","name":"PopupViewService","line":45,"character":43},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"@angular/core","name":"ElementRef","line":47,"character":29},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"../../service","name":"TextLibraryService","line":49,"character":46},{"__symbolic":"reference","module":"../../service","name":"LanguageService","line":50,"character":43},{"__symbolic":"reference","module":"../../gui/gui-context","name":"GuiContext","line":51,"character":38}]}],"initElement":[{"__symbolic":"method"}],"switchToState":[{"__symbolic":"method"}],"initGraph":[{"__symbolic":"method"}],"checkElementPassword":[{"__symbolic":"method"}],"executeViewOperation":[{"__symbolic":"method"}],"toggleView":[{"__symbolic":"method"}],"popView":[{"__symbolic":"method"}],"closeView":[{"__symbolic":"method"}],"moveView":[{"__symbolic":"method"}],"recordViewOperation":[{"__symbolic":"method"}],"subscribeLanguageChange":[{"__symbolic":"method"}],"updateTextContent":[{"__symbolic":"method"}],"getDisplayText":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"ViewOperationElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-enable-element","name":"ConditionalEnableElement","line":23,"character":42},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":36,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":36,"character":48},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":37,"character":39},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":38,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":39,"character":23},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":40,"character":37},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":41,"character":27},{"__symbolic":"reference","module":"../../service","name":"OperationRecordService","line":42,"character":49},{"__symbolic":"reference","module":"../../security","name":"SecurityChecker","line":43,"character":42},{"__symbolic":"reference","module":"../../localization","name":"Localization","line":44,"character":22},{"__symbolic":"reference","module":"../../view/popup-view.service","name":"PopupViewService","line":45,"character":43},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"@angular/core","name":"ElementRef","line":47,"character":29},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"../../service","name":"TextLibraryService","line":49,"character":46},{"__symbolic":"reference","module":"../../service","name":"LanguageService","line":50,"character":43},{"__symbolic":"reference","module":"../../gui/gui-context","name":"GuiContext","line":51,"character":38}]}],"initElement":[{"__symbolic":"method"}],"switchToState":[{"__symbolic":"method"}],"initGraph":[{"__symbolic":"method"}],"checkElementPassword":[{"__symbolic":"method"}],"executeViewOperation":[{"__symbolic":"method"}],"toggleView":[{"__symbolic":"method"}],"popView":[{"__symbolic":"method"}],"closeView":[{"__symbolic":"method"}],"moveView":[{"__symbolic":"method"}],"recordViewOperation":[{"__symbolic":"method"}],"subscribeLanguageChange":[{"__symbolic":"method"}],"getFontStyle":[{"__symbolic":"method"}],"updateTextContent":[{"__symbolic":"method"}],"getDisplayText":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}]}}}}]

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

@@ -8,6 +8,15 @@ export interface TextCultures {
         [languageCode: string]: string;
     };
 }
+export interface FontStyleCultures {
+    readonly [languageCode: string]: {
+        readonly fontSize: string;
+        readonly fontStyle: string;
+        readonly fontColor: string;
+        readonly isUnderline: boolean;
+        readonly textAlign: string;
+    };
+}
 export interface FontSettingModel {
     readonly text: string | TextCultures;
     readonly stroke: string;
@@ -16,4 +25,5 @@ export interface FontSettingModel {
     readonly isUnderline: boolean;
     readonly textAlign: string;
     readonly textLibrary?: TextLibrarySetting;
+    readonly fontStyleCultures?: FontStyleCultures;
 }

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

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

package/package.json

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