@flexem/fc-gui 3.0.0-alpha.123 → 3.0.0-alpha.125

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

@@ -17,12 +17,15 @@ import { DisplayMode, GlobalSettings } from '../../settings';
 import { VariableUtil } from '../../utils/variable-util';
 import { VariableDefinition } from '../../communication/variable/variable-definition';
 export class SwitchIndicatorLightElement extends ConditionalEnableElement {
-    constructor(element, injector, modalService, variableCommunicator, graphStore, permissionChecker, operationRecordService, securityChecker, variableStore, localization, signalRAppId) {
+    constructor(element, injector, modalService, variableCommunicator, graphStore, permissionChecker, operationRecordService, securityChecker, variableStore, localization, signalRAppId, textLibraryService, languageService, guiContext) {
         super(element, permissionChecker, variableCommunicator, variableStore, localization, signalRAppId);
         this.modalService = modalService;
         this.graphStore = graphStore;
         this.operationRecordService = operationRecordService;
         this.securityChecker = securityChecker;
+        this.textLibraryService = textLibraryService;
+        this.languageService = languageService;
+        this.guiContext = guiContext;
         this.isBitRestoration = false; // 是否是 位设定且执行设置是复位
         this.isVerifiedForRestoration = false; // 位设定且执行设置是复位情况下，是否已经完成了验证
         this.isWriteRestorationDownValue = false;
@@ -208,7 +211,7 @@ export class SwitchIndicatorLightElement extends ConditionalEnableElement {
             default:
                 throw new Error(`Unknown switchType:${settings.type}`);
         }
-        this.indicatorLightSubscription = this.indicatorLightOperator.currentStateIdChanged.subscribe(statusIdValue => {
+        this.indicatorLightOperator.currentStateIdChanged.subscribe(statusIdValue => {
             this.currentStateIdChange(statusIdValue);
         });
         this.indicatorLightOperator.requestData(this.signalRAppId);
@@ -238,39 +241,37 @@ export class SwitchIndicatorLightElement extends ConditionalEnableElement {
             this.graphStateElement = new GraphStateElement(this.model.graphSetting, width, height, this.graphStore, this.logger, this.model.version, this.model.states);
             this.$element.append(this.graphStateElement.Element);
         }
-        this.textStateElement = new TextStateElement(this.model.states, width, height, this.logger, this.model.version, this.model.states);
+        this.textStateElement = new TextStateElement(this.model.states, width, height, this.logger, this.model.version, this.model.states, this.model.textLibrary, this.textLibraryService, this.languageService, this.guiContext);
         this.$element.append(this.textStateElement.Element);
     }
-    checkState() {
-        if (!this.model.states) {
-            throw new Error('The switch indicator light\'s states is undefined.');
-        }
-        if (this.model.states.length < 2) {
-            throw new Error('The switch indicator light\'s states must greater than 2.');
-        }
-    }
+    /**
+     * 释放资源
+     */
     dispose() {
-        // 清理 document 级别的事件监听器
-        if (this.onDocMouseUp) {
-            document.removeEventListener(this.isMobileMode ? 'touchend' : 'mouseup', this.onDocMouseUp);
+        // 释放文本元素资源（取消语种变化订阅等）
+        if (this.textStateElement) {
+            this.textStateElement.dispose();
         }
-        // 清理定时器
+        // 释放指示灯操作器资源
+        if (this.indicatorLightOperator) {
+            // indicatorLightOperator 可能有自己的dispose方法
+        }
+        // 清除定时器
         if (this.restorationTimer) {
             clearTimeout(this.restorationTimer);
             this.restorationTimer = undefined;
         }
-        // 清理 indicatorLightOperator 订阅
-        if (this.indicatorLightSubscription) {
-            this.indicatorLightSubscription.unsubscribe();
+        // 移除事件监听
+        if (this.onDocMouseUp) {
+            document.removeEventListener(this.isMobileMode ? 'touchend' : 'mouseup', this.onDocMouseUp);
         }
-        // 清理图形元素（释放 SVG 内存）
-        if (this.graphStateElement) {
-            this.graphStateElement.dispose();
+    }
+    checkState() {
+        if (!this.model.states) {
+            throw new Error('The switch indicator light\'s states is undefined.');
         }
-        // 清理文本元素
-        if (this.textStateElement) {
-            // TextStateElement 可能也需要 dispose，暂时先清理引用
-            this.textStateElement = null;
+        if (this.model.states.length < 2) {
+            throw new Error('The switch indicator light\'s states must greater than 2.');
         }
     }
 }

package/elements/switch-indicator-light/switch-indicator-light-element.metadata.json

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

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

@@ -3,11 +3,12 @@ import { BsModalService } from 'ngx-bootstrap/modal';
 import { Localization } from '../../localization';
 import { GraphStore, VariableStore } from '../../config';
 import { ViewOperationElementModel } from '../../model';
-import { PermissionChecker, OperationRecordService } from '../../service';
+import { PermissionChecker, OperationRecordService, TextLibraryService, LanguageService } from '../../service';
 import { VariableCommunicator } from '../../communication';
 import { ConditionalEnableElement } from '../base/conditional-enable-element';
 import { PopupViewService } from '../../view/popup-view.service';
 import { SecurityChecker } from '../../security';
+import { GuiContext } from '../../gui/gui-context';
 export declare class ViewOperationElement extends ConditionalEnableElement {
     private readonly modalService;
     private readonly graphStore;
@@ -16,13 +17,17 @@ export declare class ViewOperationElement extends ConditionalEnableElement {
     private readonly popupViewService;
     private readonly hostContainerId;
     private readonly el;
+    private readonly textLibraryService?;
+    private readonly languageService?;
+    private readonly guiContext?;
     protected model: ViewOperationElementModel;
     private readonly logger;
     private readonly viewService;
     private graphStateElement?;
+    private languageChangeSubscription?;
     private touchedScreenX;
     private touchedScreenY;
-    constructor(element: HTMLElement, injector: Injector, modalService: BsModalService, variableCommunicator: VariableCommunicator, variableStore: VariableStore, graphStore: GraphStore, permissionChecker: PermissionChecker, operationRecordService: OperationRecordService, securityChecker: SecurityChecker, localization: Localization, popupViewService: PopupViewService, hostContainerId: string, el: ElementRef, signalRAppId: string);
+    constructor(element: HTMLElement, injector: Injector, modalService: BsModalService, variableCommunicator: VariableCommunicator, variableStore: VariableStore, graphStore: GraphStore, permissionChecker: PermissionChecker, operationRecordService: OperationRecordService, securityChecker: SecurityChecker, localization: Localization, popupViewService: PopupViewService, hostContainerId: string, el: ElementRef, signalRAppId: string, textLibraryService?: TextLibraryService, languageService?: LanguageService, guiContext?: GuiContext);
     private initElement;
     private switchToState;
     private initGraph;
@@ -33,4 +38,20 @@ export declare class ViewOperationElement extends ConditionalEnableElement {
     private closeView;
     private moveView;
     private recordViewOperation;
+    /**
+     * 订阅语种变化事件
+     */
+    private subscribeLanguageChange;
+    /**
+     * 更新文本内容（支持文本库和语种切换）
+     */
+    private updateTextContent;
+    /**
+     * 获取显示文本
+     */
+    private getDisplayText;
+    /**
+     * 释放资源
+     */
+    dispose(): void;
 }

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

@@ -9,7 +9,7 @@ import { ConfirmOperationModalComponent } from '../../modal/confirm-operation/co
 import { VerifyPasswordModalComponent } from '../../modal/verify-password/verify-password-modal.component';
 import { ViewService } from '../../view/view.service';
 export class ViewOperationElement extends ConditionalEnableElement {
-    constructor(element, injector, modalService, variableCommunicator, variableStore, graphStore, permissionChecker, operationRecordService, securityChecker, localization, popupViewService, hostContainerId, el, signalRAppId) {
+    constructor(element, injector, modalService, variableCommunicator, variableStore, graphStore, permissionChecker, operationRecordService, securityChecker, localization, popupViewService, hostContainerId, el, signalRAppId, textLibraryService, languageService, guiContext) {
         super(element, permissionChecker, variableCommunicator, variableStore, localization, signalRAppId);
         this.modalService = modalService;
         this.graphStore = graphStore;
@@ -18,20 +18,27 @@ export class ViewOperationElement extends ConditionalEnableElement {
         this.popupViewService = popupViewService;
         this.hostContainerId = hostContainerId;
         this.el = el;
+        this.textLibraryService = textLibraryService;
+        this.languageService = languageService;
+        this.guiContext = guiContext;
         this.touchedScreenX = 0;
         this.touchedScreenY = 0;
         this.logger = injector.get(LOGGER_SERVICE_TOKEN);
         this.viewService = injector.get(ViewService);
         this.initElement();
+        this.subscribeLanguageChange();
     }
     initElement() {
         const width = this.model.size.width;
         const height = this.model.size.height;
         this.initGraph(width, height);
         this.rootElement.append('rect').attr('id', 'StateFrame').attr('width', width).attr('height', height).attr('fill', 'transparent');
+        // 初始化文本显示
         const $dateTimeText = this.$element.find('text').last();
         const fontStyle = this.model.label.font.fontStyle;
         $dateTimeText.css('font', fontStyle + ',msyh');
+        // 设置初始文本内容（支持文本库）
+        this.updateTextContent($dateTimeText);
         this.switchToState(0);
         this.rootElement.on('mousedown', () => {
             if (!this.isInitialized) {
@@ -199,4 +206,91 @@ export class ViewOperationElement extends ConditionalEnableElement {
             this.operationRecordService.record({ operationDescription: this.model.operationDescription });
         }
     }
+    /**
+     * 订阅语种变化事件
+     */
+    subscribeLanguageChange() {
+        // 只有使用文本库时才需要订阅语种变化
+        if (!this.model.textLibrary || this.model.textLibrary.labelType !== 'textLibrary') {
+            return;
+        }
+        if (this.guiContext && this.guiContext.languageChanged$) {
+            this.languageChangeSubscription = this.guiContext.languageChanged$.subscribe(() => {
+                // 更新文本内容
+                const $dateTimeText = this.$element.find('text').last();
+                this.updateTextContent($dateTimeText);
+            });
+        }
+    }
+    /**
+     * 更新文本内容（支持文本库和语种切换）
+     */
+    updateTextContent($textElement) {
+        const displayText = this.getDisplayText();
+        $textElement.text(displayText);
+    }
+    /**
+     * 获取显示文本
+     */
+    getDisplayText() {
+        var _a, _b, _c, _d, _e, _f;
+        // 检查是否使用文本库
+        if (this.model.textLibrary && this.model.textLibrary.labelType === 'textLibrary') {
+            const textLibraryId = this.model.textLibrary.selectedTextLibraryItem;
+            const textItem = this.model.textLibrary.selectedTextItem;
+            if (textLibraryId && textItem && this.textLibraryService) {
+                // 获取文本库数据
+                const textLibraryData = this.textLibraryService.getTextLibraryById(typeof textLibraryId === 'string' ? parseInt(textLibraryId, 10) : textLibraryId);
+                if (textLibraryData && textLibraryData.data) {
+                    // 查找对应的文本条目
+                    const textEntry = textLibraryData.data.find(entry => entry.key === textItem.toString());
+                    if (textEntry) {
+                        // 获取当前语种ID
+                        const currentLanguageId = (_c = (_b = (_a = this.guiContext) === null || _a === void 0 ? void 0 : _a.getCurrentLanguageId) === null || _b === void 0 ? void 0 : _b.call(_a)) !== null && _c !== void 0 ? _c : null;
+                        // 确定要使用的语种代码（culture）
+                        let targetLanguage;
+                        const defaultLanguage = ((_d = this.languageService) === null || _d === void 0 ? void 0 : _d.getDefaultLanguage()) || 'zh-CN';
+                        if (currentLanguageId === null || currentLanguageId === undefined) {
+                            // 设备未设置当前语种，使用默认语种
+                            targetLanguage = defaultLanguage;
+                        }
+                        else {
+                            // 设备已设置当前语种，获取对应的语种代码
+                            const currentLanguage = (_f = (_e = this.guiContext) === null || _e === void 0 ? void 0 : _e.getLanguageCultureById) === null || _f === void 0 ? void 0 : _f.call(_e, currentLanguageId);
+                            if (currentLanguage) {
+                                targetLanguage = currentLanguage;
+                            }
+                            else {
+                                // 无法获取语种代码，使用默认语种
+                                targetLanguage = defaultLanguage;
+                            }
+                        }
+                        // 返回对应语种的文本
+                        if (textEntry.cultures && textEntry.cultures[targetLanguage]) {
+                            return textEntry.cultures[targetLanguage];
+                        }
+                        // 如果没有对应语种，返回空字符串
+                        return '';
+                    }
+                }
+            }
+            // 文本库配置但未找到数据，返回空字符串
+            return '';
+        }
+        // 默认返回文本内容
+        return this.model.label.content || '';
+    }
+    /**
+     * 释放资源
+     */
+    dispose() {
+        // 取消语种变化订阅
+        if (this.languageChangeSubscription) {
+            this.languageChangeSubscription.unsubscribe();
+            this.languageChangeSubscription = undefined;
+        }
+        if (this.$element) {
+            this.$element.remove();
+        }
+    }
 }

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":20,"character":42},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":31,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":31,"character":48},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":32,"character":39},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":33,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":34,"character":23},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":35,"character":37},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":36,"character":27},{"__symbolic":"reference","module":"../../service","name":"OperationRecordService","line":37,"character":49},{"__symbolic":"reference","module":"../../security","name":"SecurityChecker","line":38,"character":42},{"__symbolic":"reference","module":"../../localization","name":"Localization","line":39,"character":22},{"__symbolic":"reference","module":"../../view/popup-view.service","name":"PopupViewService","line":40,"character":43},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"@angular/core","name":"ElementRef","line":42,"character":29},{"__symbolic":"reference","name":"string"}]}],"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"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"ViewOperationElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-enable-element","name":"ConditionalEnableElement","line":22,"character":42},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":34,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":34,"character":48},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":35,"character":39},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":36,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":37,"character":23},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":38,"character":37},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":39,"character":27},{"__symbolic":"reference","module":"../../service","name":"OperationRecordService","line":40,"character":49},{"__symbolic":"reference","module":"../../security","name":"SecurityChecker","line":41,"character":42},{"__symbolic":"reference","module":"../../localization","name":"Localization","line":42,"character":22},{"__symbolic":"reference","module":"../../view/popup-view.service","name":"PopupViewService","line":43,"character":43},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"@angular/core","name":"ElementRef","line":45,"character":29},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"../../service","name":"TextLibraryService","line":47,"character":46},{"__symbolic":"reference","module":"../../service","name":"LanguageService","line":48,"character":43},{"__symbolic":"reference","module":"../../gui/gui-context","name":"GuiContext","line":49,"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"}]}}}}]

package/gui/gui-context.d.ts

@@ -1,7 +1,8 @@
 import { ConfigStore } from '../config';
 import { VariableCommunicator } from '../communication';
 import { SecurityChecker } from '../security';
-import { VideoService, WeatherService, PermissionChecker, OperationRecordService, ReleasedVariableService } from '../service';
+import { VideoService, WeatherService, PermissionChecker, OperationRecordService, ReleasedVariableService, TextLibraryService, LanguageService, SystemTextLibraryService } from '../service';
+import { Subject } from 'rxjs';
 export interface GuiContext {
     readonly configStore: ConfigStore;
     readonly variableCommunicator: VariableCommunicator;
@@ -11,7 +12,15 @@ export interface GuiContext {
     readonly securityChecker: SecurityChecker;
     readonly videoService: VideoService;
     readonly weatherService: WeatherService;
+    readonly textLibraryService?: TextLibraryService;
+    readonly languageService?: LanguageService;
+    readonly systemTextLibraryService?: SystemTextLibraryService;
     readonly configureViewId?: number;
     readonly configureViewCode?: string;
-    dispose(): any;
+    readonly languageChanged$?: Subject<number | null>;
+    getCurrentLanguageId?(): number | null;
+    getDefaultLanguageId?(): number;
+    getLanguageCultureById?(languageId: number | null): string | null;
+    updateCurrentLanguageId?(languageId: number | null): Promise<void>;
+    dispose(): void;
 }

package/gui/gui-view.js

@@ -72,7 +72,23 @@ export class GuiView {
             this.openVariableStatesSubscription.unsubscribe();
         }
         this.openedVariableNames = this.mainElement.getVariableNames();
-        if (this.openedVariableNames.indexOf('设备状态') !== -1) {
+        // 分离系统变量和普通变量
+        const systemVariables = [];
+        const normalVariablesForState = [];
+        this.openedVariableNames.forEach(variableName => {
+            if (variableName === '当前语种ID') {
+                // 系统变量直接订阅，不需要等待状态
+                systemVariables.push(variableName);
+            }
+            else {
+                normalVariablesForState.push(variableName);
+            }
+        });
+        // 立即订阅系统变量
+        if (systemVariables.length > 0) {
+            this.normalOpenedVariableNames(systemVariables);
+        }
+        if (normalVariablesForState.indexOf('设备状态') !== -1) {
             if (this.requestVirtualDeviceState) {
                 this.requestVirtualDeviceState.unsubscribe();
             }
@@ -84,13 +100,13 @@ export class GuiView {
                 this.perViewVariableCommunicator.requestVirtualDeviceState().subscribe({
                     complete: () => { }
                 });
-            this.openedVariableNames = this.openedVariableNames.filter(name => name !== '设备状态');
+            normalVariablesForState.splice(normalVariablesForState.indexOf('设备状态'), 1);
         }
-        if (this.openedVariableNames.length === 0) {
+        if (normalVariablesForState.length === 0) {
             return;
         }
         this.openVariableStatesSubscription =
-            this.perViewVariableCommunicator.subscribeVariableStates(this.openedVariableNames).subscribe((states) => {
+            this.perViewVariableCommunicator.subscribeVariableStates(normalVariablesForState).subscribe((states) => {
                 this.mainElement.reportVariableStates(states);
                 const normalVariableNames = [];
                 each(states, v => {

package/modal/write-value/write-value-modal-args.d.ts

@@ -1,5 +1,6 @@
 import { NumericalOperation } from '../../model';
 import { ReleasedVariableService } from '../../service';
+import { GuiContext } from '../../gui/gui-context';
 export declare class WriteValueModalArgs {
     variableName: string;
     dataType: number;
@@ -10,5 +11,6 @@ export declare class WriteValueModalArgs {
     version: number;
     enableDataParsed: boolean;
     releasedVariableService: ReleasedVariableService;
-    constructor(variableName: string, dataType: number, fBoxDataType: number, integerDigits: number, fractionDigits: number, numericalOperation: NumericalOperation, version: number, enableDataParsed: boolean, releasedVariableService: ReleasedVariableService);
+    guiContext?: GuiContext;
+    constructor(variableName: string, dataType: number, fBoxDataType: number, integerDigits: number, fractionDigits: number, numericalOperation: NumericalOperation, version: number, enableDataParsed: boolean, releasedVariableService: ReleasedVariableService, guiContext?: GuiContext);
 }

package/modal/write-value/write-value-modal-args.js

@@ -1,5 +1,5 @@
 export class WriteValueModalArgs {
-    constructor(variableName, dataType, fBoxDataType, integerDigits, fractionDigits, numericalOperation, version, enableDataParsed, releasedVariableService) {
+    constructor(variableName, dataType, fBoxDataType, integerDigits, fractionDigits, numericalOperation, version, enableDataParsed, releasedVariableService, guiContext) {
         this.variableName = variableName;
         this.dataType = dataType;
         this.fBoxDataType = fBoxDataType;
@@ -9,5 +9,6 @@ export class WriteValueModalArgs {
         this.version = version;
         this.enableDataParsed = enableDataParsed;
         this.releasedVariableService = releasedVariableService;
+        this.guiContext = guiContext;
     }
 }

package/modal/write-value/write-value-modal-args.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"WriteValueModalArgs":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","module":"../../model","name":"NumericalOperation","line":10,"character":35},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"boolean"},{"__symbolic":"reference","module":"../../service","name":"ReleasedVariableService","line":13,"character":40}]}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"WriteValueModalArgs":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","module":"../../model","name":"NumericalOperation","line":11,"character":35},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"boolean"},{"__symbolic":"reference","module":"../../service","name":"ReleasedVariableService","line":14,"character":40},{"__symbolic":"reference","module":"../../gui/gui-context","name":"GuiContext","line":15,"character":28}]}]}}}}]

package/modal/write-value/write-value-modal.component.d.ts

@@ -42,6 +42,10 @@ export declare class WriteValueModalComponent implements OnInit {
     private setValueRangeAccordToDataParsed;
     getWriteValueRangeText(): string;
     save(): void;
+    /**
+     * 处理"当前语种ID"系统变量的保存
+     */
+    private handleCurrentLanguageIdSave;
     close(): void;
     validate(event?: any): void;
     private showValidationErrorInfo;

package/modal/write-value/write-value-modal.component.js

@@ -110,6 +110,11 @@ let WriteValueModalComponent = class WriteValueModalComponent {
                 value = this.formatWriteValue();
             }
         }
+        // 处理系统变量"当前语种ID"
+        if (this.variableName === '当前语种ID') {
+            this.handleCurrentLanguageIdSave(value);
+            return;
+        }
         if (!this.args.releasedVariableService) {
             this.onClosed({
                 value: value,
@@ -134,6 +139,26 @@ let WriteValueModalComponent = class WriteValueModalComponent {
             });
         });
     }
+    /**
+     * 处理"当前语种ID"系统变量的保存
+     */
+    handleCurrentLanguageIdSave(value) {
+        if (!this.args.guiContext || !this.args.guiContext.updateCurrentLanguageId) {
+            this.showValidationErrorInfo(this.localization.loadFailed);
+            this.isSubmitting = false;
+            return;
+        }
+        // 转换为数字类型
+        const languageId = value === '' || value == null ? null : Number(value);
+        // 调用 GuiContext 的更新方法
+        this.args.guiContext.updateCurrentLanguageId(languageId).then(() => {
+            // 更新成功，关闭弹窗
+            this.bsModalRef.hide();
+        }).catch(() => {
+            this.showValidationErrorInfo(this.localization.loadFailed);
+            this.isSubmitting = false;
+        });
+    }
     close() {
         this.bsModalRef.hide();
     }

package/modal/write-value/write-value-modal.component.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"WriteValueModalComponent":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Component","line":10,"character":1},"arguments":[{"selector":"writeValueModal","template":"<form #writeValueForm=\"ngForm\" novalidate (ngSubmit)=\"save()\" bs-modal-drag> <div class=\"modal-header\"> <h4 class=\"modal-title\"> <span>{{localization.setting}}</span> <span>{{variableName}}</span> </h4> <button type=\"button\" class=\"close pull-right\" aria-label=\"Close\" (click)=\"close()\"> <span aria-hidden=\"true\">&times;</span> </button> </div> <div class=\"modal-body\"> <span class=\"write-value-range\">{{localization.writeValueRange}}：</span> <div class=\"write-value-range\"> {{writeValueRangeText}} <span *ngIf=\"valueType\">({{valueType}})</span> </div> <input type=\"text\" name=\"valueInput\" autoFocus class=\"form-control write-value\" [(ngModel)]=\"value\" (keyup)=\"validate($event)\" autocomplete=\"off\"> <span class=\"help-block text-danger\" [hidden]=\"!validationError\">{{validationErrorText}}</span> </div> <div class=\"modal-footer\"> <button type=\"submit\" class=\"btn md-skip btn-primary btn-block\" [disabled]=\"validationError || isSubmitting\"> <ng-container *ngIf=\"!isSubmitting\">{{localization.submit}}</ng-container> <ng-container *ngIf=\"isSubmitting\">{{localization.submitting}}</ng-container> </button> </div> </form> ","styles":[".modal-header { padding: 10px; border-color: transparent; } .modal-body { position: relative; padding: 0px 5px !important; padding-top: 10px !important; } .modal-title { display: unset; margin-left: -6px; font-size: 16px !important; } .form-control { margin: 0 5%; float: none; width: 90%; } .modal-footer { padding: 10px 4px 20px 5px !important; text-align: right; border-color: transparent; } .text-danger { display: block; color: #ed6b75; font-size: 14px; margin: 5px 0px 0px 15px; } .btn-primary { background-color: #3B97FC; border-color: #3B97FC; padding: 5px 30px; width: 90%; margin: 0 5%; height: 32px; } .write-value-range { color: #7f939e; font-size: 14px; margin-left: 15px; } .write-value { padding-left: 8px; margin-left: 16px; height: 32px; } "]}]}],"members":{"invalidErrorText":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Output","line":44,"character":5}}]}],"__ctor__":[{"__symbolic":"constructor","parameterDecorators":[[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Inject","line":50,"character":9},"arguments":[{"__symbolic":"reference","module":"../../localization","name":"LOCALIZATION","line":50,"character":16}]}],null,null,null,null],"parameters":[{"__symbolic":"reference","module":"../../localization","name":"Localization","line":50,"character":51},{"__symbolic":"reference","module":"../../utils/data-type/data-type.service","name":"DataTypeService","line":51,"character":42},{"__symbolic":"reference","module":"../../utils/fraction-digit.service","name":"FractionDigitService","line":52,"character":47},{"__symbolic":"reference","module":"../../utils/numerical-operation.service","name":"NumericalOperationService","line":53,"character":52},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalRef","line":54,"character":37}]}],"ngOnInit":[{"__symbolic":"method"}],"initData":[{"__symbolic":"method"}],"setValueRangeAccordToDataParsed":[{"__symbolic":"method"}],"getWriteValueRangeText":[{"__symbolic":"method"}],"save":[{"__symbolic":"method"}],"close":[{"__symbolic":"method"}],"validate":[{"__symbolic":"method"}],"showValidationErrorInfo":[{"__symbolic":"method"}],"hideValidationErrorInfo":[{"__symbolic":"method"}],"getFractionDigits":[{"__symbolic":"method"}],"formatWriteValue":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"WriteValueModalComponent":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Component","line":10,"character":1},"arguments":[{"selector":"writeValueModal","template":"<form #writeValueForm=\"ngForm\" novalidate (ngSubmit)=\"save()\" bs-modal-drag> <div class=\"modal-header\"> <h4 class=\"modal-title\"> <span>{{localization.setting}}</span> <span>{{variableName}}</span> </h4> <button type=\"button\" class=\"close pull-right\" aria-label=\"Close\" (click)=\"close()\"> <span aria-hidden=\"true\">&times;</span> </button> </div> <div class=\"modal-body\"> <span class=\"write-value-range\">{{localization.writeValueRange}}：</span> <div class=\"write-value-range\"> {{writeValueRangeText}} <span *ngIf=\"valueType\">({{valueType}})</span> </div> <input type=\"text\" name=\"valueInput\" autoFocus class=\"form-control write-value\" [(ngModel)]=\"value\" (keyup)=\"validate($event)\" autocomplete=\"off\"> <span class=\"help-block text-danger\" [hidden]=\"!validationError\">{{validationErrorText}}</span> </div> <div class=\"modal-footer\"> <button type=\"submit\" class=\"btn md-skip btn-primary btn-block\" [disabled]=\"validationError || isSubmitting\"> <ng-container *ngIf=\"!isSubmitting\">{{localization.submit}}</ng-container> <ng-container *ngIf=\"isSubmitting\">{{localization.submitting}}</ng-container> </button> </div> </form> ","styles":[".modal-header { padding: 10px; border-color: transparent; } .modal-body { position: relative; padding: 0px 5px !important; padding-top: 10px !important; } .modal-title { display: unset; margin-left: -6px; font-size: 16px !important; } .form-control { margin: 0 5%; float: none; width: 90%; } .modal-footer { padding: 10px 4px 20px 5px !important; text-align: right; border-color: transparent; } .text-danger { display: block; color: #ed6b75; font-size: 14px; margin: 5px 0px 0px 15px; } .btn-primary { background-color: #3B97FC; border-color: #3B97FC; padding: 5px 30px; width: 90%; margin: 0 5%; height: 32px; } .write-value-range { color: #7f939e; font-size: 14px; margin-left: 15px; } .write-value { padding-left: 8px; margin-left: 16px; height: 32px; } "]}]}],"members":{"invalidErrorText":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Output","line":44,"character":5}}]}],"__ctor__":[{"__symbolic":"constructor","parameterDecorators":[[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Inject","line":50,"character":9},"arguments":[{"__symbolic":"reference","module":"../../localization","name":"LOCALIZATION","line":50,"character":16}]}],null,null,null,null],"parameters":[{"__symbolic":"reference","module":"../../localization","name":"Localization","line":50,"character":51},{"__symbolic":"reference","module":"../../utils/data-type/data-type.service","name":"DataTypeService","line":51,"character":42},{"__symbolic":"reference","module":"../../utils/fraction-digit.service","name":"FractionDigitService","line":52,"character":47},{"__symbolic":"reference","module":"../../utils/numerical-operation.service","name":"NumericalOperationService","line":53,"character":52},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalRef","line":54,"character":37}]}],"ngOnInit":[{"__symbolic":"method"}],"initData":[{"__symbolic":"method"}],"setValueRangeAccordToDataParsed":[{"__symbolic":"method"}],"getWriteValueRangeText":[{"__symbolic":"method"}],"save":[{"__symbolic":"method"}],"handleCurrentLanguageIdSave":[{"__symbolic":"method"}],"close":[{"__symbolic":"method"}],"validate":[{"__symbolic":"method"}],"showValidationErrorInfo":[{"__symbolic":"method"}],"hideValidationErrorInfo":[{"__symbolic":"method"}],"getFractionDigits":[{"__symbolic":"method"}],"formatWriteValue":[{"__symbolic":"method"}]}}}}]

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

@@ -1,3 +1,8 @@
+export interface TextLibrarySetting {
+    readonly labelType: 'text' | 'textLibrary';
+    readonly selectedTextLibraryItem?: string | number;
+    readonly selectedTextItem?: string | number;
+}
 export interface FontSettingModel {
     readonly text: string;
     readonly stroke: string;
@@ -5,4 +10,5 @@ export interface FontSettingModel {
     readonly fontSize: string;
     readonly isUnderline: boolean;
     readonly textAlign: string;
+    readonly textLibrary?: TextLibrarySetting;
 }

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

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

package/model/historical-curve/historical-curve.data-settings.d.ts

@@ -1,9 +1,26 @@
 import { HistroicalCurveChannelModel } from './historical-curve-chanel.model';
+/**
+ * 单个历史数据条目的运行时配置
+ */
+export interface HistoricalCurveDataItem {
+    /** 历史数据条目名称 */
+    readonly dataName: string;
+    /** 该条目的通道列表 */
+    readonly channels: Array<HistroicalCurveChannelModel>;
+}
 export interface HistoricalCurveDataSettings {
     readonly dataSourceCode: number;
     /**
-     * 历史数据名称
+     * 【旧格式-兼容】历史数据名称，单条目模式
      */
     readonly dataName: string;
+    /**
+     * 【旧格式-兼容】通道列表，单条目模式
+     */
     readonly channels: Array<HistroicalCurveChannelModel>;
+    /**
+     * 【新格式】多个历史数据条目配置
+     * 如果此字段有值，优先使用此字段
+     */
+    readonly dataItems?: Array<HistoricalCurveDataItem>;
 }

package/model/historical-curve/historical-curve.data-settings.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"HistoricalCurveDataSettings":{"__symbolic":"interface"}}}]
+[{"__symbolic":"module","version":4,"metadata":{"HistoricalCurveDataItem":{"__symbolic":"interface"},"HistoricalCurveDataSettings":{"__symbolic":"interface"}}}]

package/model/scroll-alarm/scroll-alarm.model.d.ts

@@ -0,0 +1,21 @@
+import { ConditionalDynamicDisplayModel } from '../base/conditional-dynamic-display-model';
+import { Point, Size } from '../shared';
+import { DynamicDisplayModel } from '../shared/dynamic-display/dynamic-display-model';
+export interface ScrollAlarmModel extends ConditionalDynamicDisplayModel {
+    readonly version: number;
+    readonly size: Size;
+    readonly location: Point;
+    readonly generalSetting?: any;
+    readonly filterSetting?: any;
+    readonly widths: number[];
+    readonly heights: number[];
+    readonly columLabels: string[];
+    readonly levelText: string[];
+    readonly scrollSetting?: {
+        readonly scrollInterval?: number;
+        readonly scrollDirection?: 'vertical' | 'horizontal';
+        readonly pauseOnHover?: boolean;
+        readonly autoPlay?: boolean;
+    };
+    readonly dynamicSetting?: DynamicDisplayModel;
+}

package/model/scroll-alarm/scroll-alarm.model.metadata.json

@@ -0,0 +1 @@
+[{"__symbolic":"module","version":4,"metadata":{"ScrollAlarmModel":{"__symbolic":"interface"}}}]

package/model/switch-indicator-light/switch-indicator-light.d.ts

@@ -5,6 +5,7 @@ import { ConditionalEnableModel } from '../base/conditional-enable-model';
 import { ConditionItemModel, GraphSetting, Point, Size } from '../shared';
 import { DynamicDisplayModel } from '../shared/dynamic-display/dynamic-display-model';
 import { SecurityModel } from '../base/security-model';
+import { TextLibrarySetting } from '../base/font-setting-model';
 export interface SwitchIndicatorLight extends ConditionalEnableModel, SecurityModel {
     /**
        * @type {(number)}
@@ -30,4 +31,5 @@ export interface SwitchIndicatorLight extends ConditionalEnableModel, SecurityMo
     readonly isAwaysEnable?: boolean;
     readonly enableItems?: ConditionItemModel[];
     readonly fixedPositionType?: number;
+    readonly textLibrary?: TextLibrarySetting;
 }

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

@@ -2,12 +2,14 @@ import { Size, Text, GraphSetting } from '../shared';
 import { ConditionalEnableModel } from '../base/conditional-enable-model';
 import { SecurityModel } from '../base';
 import { ViewOperationType } from './view-operation-type';
+import { TextLibrarySetting } from '../base/font-setting-model';
 export interface ViewOperationElementModel extends ConditionalEnableModel, SecurityModel {
     /**
      * 版本 2 : 动态行为调整
      * 版本 3 ：使能控制调整
      * 版本 4 ：新增操作记录
-     * 版本 5 ：新增页面操作类型，之前类型都为“切换页面”
+     * 版本 5 ：新增页面操作类型，之前类型都为"切换页面"
+     * 版本 6 ：新增文本库支持
      */
     readonly version?: number;
     readonly viewIndex?: number;
@@ -16,4 +18,8 @@ export interface ViewOperationElementModel extends ConditionalEnableModel, Secur
     readonly useGraph: boolean;
     readonly graphSetting: GraphSetting;
     readonly operationType: ViewOperationType;
+    /**
+     * 文本库配置（版本6新增）
+     */
+    readonly textLibrary?: TextLibrarySetting;
 }

package/package.json

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