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

package/communication/variable/variable-state-enum.d.ts

@@ -3,5 +3,6 @@ export declare enum VariableStateEnum {
     Offline = 1,
     Unbind = 3,
     DataNormal = 9,
+    InvalidMonitor = 10,
     Abnormal = 99
 }

package/communication/variable/variable-state-enum.js

@@ -4,5 +4,6 @@ export var VariableStateEnum;
     VariableStateEnum[VariableStateEnum["Offline"] = 1] = "Offline";
     VariableStateEnum[VariableStateEnum["Unbind"] = 3] = "Unbind";
     VariableStateEnum[VariableStateEnum["DataNormal"] = 9] = "DataNormal";
+    VariableStateEnum[VariableStateEnum["InvalidMonitor"] = 10] = "InvalidMonitor";
     VariableStateEnum[VariableStateEnum["Abnormal"] = 99] = "Abnormal";
 })(VariableStateEnum || (VariableStateEnum = {}));

package/communication/variable/variable-state-enum.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"VariableStateEnum":{"Normal":0,"Offline":1,"Unbind":3,"DataNormal":9,"Abnormal":99}}}]
+[{"__symbolic":"module","version":4,"metadata":{"VariableStateEnum":{"Normal":0,"Offline":1,"Unbind":3,"DataNormal":9,"InvalidMonitor":10,"Abnormal":99}}}]

package/config/variable/variable-store.d.ts

@@ -4,4 +4,5 @@ export interface VariableStore {
      * 老数据转换
      */
     getVariableName(input: GetVariableNameArgs): string;
+    getAllVariableNames?(): string[];
 }

package/elements/base/state-control-element.js

@@ -65,26 +65,34 @@ export class StateControlElement extends ConditionalDynamicDisplayElement {
             case VariableStateEnum.Abnormal:
                 currentState = State.Abnormal;
                 break;
+            case VariableStateEnum.InvalidMonitor:
+                currentState = State.InvalidMonitor;
+                break;
         }
         return currentState;
     }
     changeState(state) {
         switch (state) {
+            case State.InvalidMonitor:
+                this.state = State.InvalidMonitor;
+                break;
             case State.Unbind:
-                this.state = State.Unbind;
+                if (this.state !== State.InvalidMonitor) {
+                    this.state = State.Unbind;
+                }
                 break;
             case State.Offline:
-                if (this.state !== State.Unbind) {
+                if (this.state !== State.Unbind && this.state !== State.InvalidMonitor) {
                     this.state = State.Offline;
                 }
                 break;
             case State.Loading:
-                if (this.state !== State.Unbind && this.state !== State.Offline) {
+                if (this.state !== State.Unbind && this.state !== State.Offline && this.state !== State.InvalidMonitor) {
                     this.state = State.Loading;
                 }
                 break;
             case State.Abnormal:
-                if (this.state !== State.Unbind && this.state !== State.Offline && this.state !== State.Loading) {
+                if (this.state !== State.Unbind && this.state !== State.Offline && this.state !== State.Loading && this.state !== State.InvalidMonitor) {
                     this.state = State.Abnormal;
                 }
                 break;
@@ -123,6 +131,11 @@ export class StateControlElement extends ConditionalDynamicDisplayElement {
                 title = this.localization.disable;
                 stroke = '#ff4444';
                 break;
+            case State.InvalidMonitor:
+                url = 'assets/img/loading.svg';
+                title = this.localization.invalidMonitor;
+                stroke = '#226abc';
+                break;
             default:
                 url = 'assets/img/loading.svg';
                 title = this.localization.loading;

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

@@ -2,7 +2,7 @@ import { LOGGER_SERVICE_TOKEN } from '../../logger';
 import * as d3 from 'd3-selection';
 import { isUndefined } from 'lodash';
 import { IndicatorLightType, SwitchType, State, BitSwitchOperation } from '../../model';
-import { VariableState } from '../../communication';
+import { VariableState, VariableStateEnum } from '../../communication';
 import { ConditionalEnableElement } from '../base/conditional-enable-element';
 import { GraphStateElement } from '../shared/graph/graph-state-element';
 import { TextStateElement } from '../shared/text/text-state-element';
@@ -195,11 +195,18 @@ export class SwitchIndicatorLightElement extends ConditionalEnableElement {
         }
     }
     initIndictorLightOperator() {
+        var _a, _b, _c, _d;
         const settings = this.model.indicatorLightSettings;
         if (settings.settings.variableName) {
             const variable = new VariableDefinition(settings.settings.variableName, settings.settings.variableGroupName, settings.settings.dataSourceCode, settings.settings.variableVersion);
-            this.addElementState(new VariableState(VariableUtil.getConvertedVariableName(this.variableStore, variable), undefined));
+            const convertedName = VariableUtil.getConvertedVariableName(this.variableStore, variable);
+            this.addElementState(new VariableState(convertedName, undefined));
             this.initState();
+            const validNames = (_d = (_c = (_b = (_a = this.guiContext) === null || _a === void 0 ? void 0 : _a.configStore) === null || _b === void 0 ? void 0 : _b.variableStore) === null || _c === void 0 ? void 0 : _c.getAllVariableNames) === null || _d === void 0 ? void 0 : _d.call(_c);
+            if (validNames && !validNames.includes(convertedName)) {
+                this.updateElementStates([new VariableState(convertedName, VariableStateEnum.InvalidMonitor)]);
+                return;
+            }
         }
         switch (settings.type) {
             case IndicatorLightType.Bit:
@@ -246,7 +253,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/gui/gui-view.js

@@ -2,7 +2,7 @@ import { LOGGER_SERVICE_TOKEN } from '../logger';
 import * as d3 from 'd3-selection';
 import { each, forEach } from 'lodash';
 import { map } from 'rxjs/operators';
-import { VariableStateEnum } from '../communication';
+import { VariableStateEnum, VariableState } from '../communication';
 import { MainElement } from '../elements/main-element';
 import { PerViewVariableCommunicator } from '../elements/per-view-variable-communicator';
 import { ViewPopupBackdropType, ViewPopupLocationType } from '../model';
@@ -64,6 +64,7 @@ export class GuiView {
         this.logger.debug('[GUI] View loaded.');
     }
     loadElementState() {
+        var _a, _b;
         if (!this.mainElement) {
             return;
         }
@@ -108,6 +109,20 @@ export class GuiView {
                 });
             normalVariablesForState.splice(normalVariablesForState.indexOf('设备状态'), 1);
         }
+        const validVariableNames = (_b = (_a = this.context.configStore.variableStore).getAllVariableNames) === null || _b === void 0 ? void 0 : _b.call(_a);
+        if (validVariableNames) {
+            const invalidVariables = normalVariablesForState.filter(name => !validVariableNames.includes(name));
+            if (invalidVariables.length > 0) {
+                const unbindStates = invalidVariables.map(name => new VariableState(name, VariableStateEnum.InvalidMonitor));
+                this.mainElement.reportVariableStates(unbindStates);
+                invalidVariables.forEach(name => {
+                    const idx = normalVariablesForState.indexOf(name);
+                    if (idx !== -1) {
+                        normalVariablesForState.splice(idx, 1);
+                    }
+                });
+            }
+        }
         if (normalVariablesForState.length === 0) {
             return;
         }

package/localization/localization.service.d.ts

@@ -29,6 +29,7 @@ export interface Localization {
     offline: any;
     abnormal: any;
     disable: any;
+    invalidMonitor: any;
     permissiontip: any;
     conditionIsNotMetTip: any;
     chartNoData: any;

package/localization/localization.service.js

@@ -29,6 +29,7 @@ export const DefaultLocalization = {
     offline: 'Offline',
     abnormal: 'Data abnormal',
     disable: 'Disable',
+    invalidMonitor: 'Element binding monitor point is invalid',
     permissiontip: 'You have no permission to operate.',
     conditionIsNotMetTip: 'Operation conditions not met or variable anomalies.',
     chartNoData: 'No Data Available',

package/localization/localization.service.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"LOCALIZATION":{"__symbolic":"new","expression":{"__symbolic":"reference","module":"@angular/core","name":"InjectionToken","line":2,"character":32},"arguments":["fc.gui.loc"]},"Localization":{"__symbolic":"interface"},"DefaultLocalization":{"loadFailed":"Load failed.","setting":"Setting","submit":"Submit","submitting":"Submitting···","numericalValueRequired":"Numerical value can't be emtpy","invalidNumericalValue":"Numerical value is not valid","writeValueTimeout":"Write value error: Timeout","binaryType":"Binary","decimalType":"Decimal","hexadecimalType":"Hexadecimal","stringType":"String","numericalValueTooLong":"Numerical value too long","fractionDigitsMustLessThan":"Fraction digits must be less than ","canNotBeNegative":"Can not be negative","valueOutOfRange":"Numerical value is out of range","timeout":"timeout","confirmOperationPrompt":"Are you sure you want to perform this operation?","confirm":"Yes","cancel":"Cancel","characterInputRequired":"Character input can't be empty","character":"(Character)","characterOutofRange":"Character length is out of range","writeValueRange":"Write value range","loading":"Loading","unbind":"Unbind","offline":"Offline","abnormal":"Data abnormal","disable":"Disable","permissiontip":"You have no permission to operate.","conditionIsNotMetTip":"Operation conditions not met or variable anomalies.","chartNoData":"No Data Available","lastThirtyMinutes":"Last thirty minutes","lastOneHour":"Last one hour","lastEightHour":"Last eight hours","lastTwentyFourHours":"Last 24 hours","lastSevenDays":"Last 7 days","lastThirtyDays":"Last 30 days","lastOneYear":"Last 1 year","grouped":"Grouped","stacked":"Stacked","passwordVerify":"Password verifiers","passwordError":"Password error","password":"Password","passwordToolTip":"Password error, please re-enter","passwordRequired":"Password can't be empty","invalidVideoAddress":"Invalid video address","unconfiguredVideoAddress":"Unconfigured Video Address","weatherNotSupport":"Location not supported","weatherNotAddress":"Address not configured","weatherNotAvailable":"Address not yet available","airQualityNotSupport":"Location not supported","airQualityNotAddress":"Address not configured","airQualityNotAvailable":"Address not yet available"}}}]
+[{"__symbolic":"module","version":4,"metadata":{"LOCALIZATION":{"__symbolic":"new","expression":{"__symbolic":"reference","module":"@angular/core","name":"InjectionToken","line":2,"character":32},"arguments":["fc.gui.loc"]},"Localization":{"__symbolic":"interface"},"DefaultLocalization":{"loadFailed":"Load failed.","setting":"Setting","submit":"Submit","submitting":"Submitting···","numericalValueRequired":"Numerical value can't be emtpy","invalidNumericalValue":"Numerical value is not valid","writeValueTimeout":"Write value error: Timeout","binaryType":"Binary","decimalType":"Decimal","hexadecimalType":"Hexadecimal","stringType":"String","numericalValueTooLong":"Numerical value too long","fractionDigitsMustLessThan":"Fraction digits must be less than ","canNotBeNegative":"Can not be negative","valueOutOfRange":"Numerical value is out of range","timeout":"timeout","confirmOperationPrompt":"Are you sure you want to perform this operation?","confirm":"Yes","cancel":"Cancel","characterInputRequired":"Character input can't be empty","character":"(Character)","characterOutofRange":"Character length is out of range","writeValueRange":"Write value range","loading":"Loading","unbind":"Unbind","offline":"Offline","abnormal":"Data abnormal","disable":"Disable","invalidMonitor":"Element binding monitor point is invalid","permissiontip":"You have no permission to operate.","conditionIsNotMetTip":"Operation conditions not met or variable anomalies.","chartNoData":"No Data Available","lastThirtyMinutes":"Last thirty minutes","lastOneHour":"Last one hour","lastEightHour":"Last eight hours","lastTwentyFourHours":"Last 24 hours","lastSevenDays":"Last 7 days","lastThirtyDays":"Last 30 days","lastOneYear":"Last 1 year","grouped":"Grouped","stacked":"Stacked","passwordVerify":"Password verifiers","passwordError":"Password error","password":"Password","passwordToolTip":"Password error, please re-enter","passwordRequired":"Password can't be empty","invalidVideoAddress":"Invalid video address","unconfiguredVideoAddress":"Unconfigured Video Address","weatherNotSupport":"Location not supported","weatherNotAddress":"Address not configured","weatherNotAvailable":"Address not yet available","airQualityNotSupport":"Location not supported","airQualityNotAddress":"Address not configured","airQualityNotAvailable":"Address not yet available"}}}]

package/localization/localization.service.zh_CN.js

@@ -27,6 +27,7 @@ export const Localization_zh_CN = {
     offline: '离线',
     abnormal: '数据异常',
     disable: '禁用',
+    invalidMonitor: '元件绑定的监控点无效',
     permissiontip: '您无权限执行此操作',
     conditionIsNotMetTip: '操作条件不满足或逻辑控制变量异常',
     chartNoData: '无数据',