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

package/communication/variable/variable-communicator.d.ts

@@ -10,5 +10,7 @@ export interface VariableCommunicator {
     subscribeVariableState(variableName: string): Observable<VariableState>;
     subscribeVariableStates(variableNames: Array<string>): Observable<Array<VariableState>>;
     subscribeUserDeviceAlarms(appId: string): any;
+    registerSystemVariableHandler?(variableName: string, getValue: () => Promise<any>, setValue: (value: any) => Promise<void>): void;
+    notifySystemVariableChange?(variableName: string, value: any): void;
     dispose(): any;
 }

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

@@ -4,14 +4,17 @@ import { VariableCommunicator } from '../../communication';
 import { ConditionalDisplayElement } from '../base/conditional-display-element';
 import { AlarmModel } from '../../model/alarm/alarm.model';
 import { AlarmsStore, VariableStore } from '../../config';
+import { GuiContext } from '../../gui/gui-context';
 export declare class AlarmElement extends ConditionalDisplayElement {
     private readonly alarmsStore;
     private readonly systemTextLibraryService?;
     private readonly languageService?;
+    private readonly guiContext?;
     readonly model: AlarmModel;
     private readonly logger;
     readonly variableCommunicator: VariableCommunicator;
     private readonly timePeriods;
+    private languageChangeSubscription?;
     private elementStatus;
     private element;
     private refreshIntervalId;
@@ -26,8 +29,20 @@ export declare class AlarmElement extends ConditionalDisplayElement {
     private totalCount;
     private pageSize;
     private getAlarmDataId;
-    constructor(element: HTMLElement, injector: Injector, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, alarmsStore: AlarmsStore, signalRAppId: string, systemTextLibraryService?: SystemTextLibraryService, languageService?: LanguageService);
+    constructor(element: HTMLElement, injector: Injector, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, alarmsStore: AlarmsStore, signalRAppId: string, systemTextLibraryService?: SystemTextLibraryService, languageService?: LanguageService, guiContext?: GuiContext);
     dispose(): void;
+    /**
+     * 订阅语种变化事件
+     */
+    private subscribeLanguageChange;
+    /**
+     * 更新语种相关的文案（表头和时间段选择器）
+     */
+    private updateLanguageTexts;
+    /**
+     * 获取当前语种的 culture 代码
+     */
+    private getCurrentCulture;
     /**
      * 根据列索引获取表头翻译（从系统文本库获取多语种翻译）
      * 固定4项表头，按列索引顺序：告警名称、告警内容、告警等级、时间
@@ -35,7 +50,7 @@ export declare class AlarmElement extends ConditionalDisplayElement {
     private getHeaderTextByColumn;
     private getValidTimePeriods;
     /**
-     * 获取时间段文案（从系统文本库获取多语种翻译，fallback 使用 localization）
+     * 获取时间段文案（从系统文本库获取多语种翻译）
      */
     private getTimePeriodText;
     private getAlarmData;

package/elements/alarm/alarm-element.js

@@ -10,12 +10,13 @@ var AlaertElementStatus;
     AlaertElementStatus[AlaertElementStatus["Loading"] = 1] = "Loading"; // 加载中
 })(AlaertElementStatus || (AlaertElementStatus = {}));
 export class AlarmElement extends ConditionalDisplayElement {
-    constructor(element, injector, permissionChecker, variableCommunicator, variableStore, alarmsStore, signalRAppId, systemTextLibraryService, languageService) {
+    constructor(element, injector, permissionChecker, variableCommunicator, variableStore, alarmsStore, signalRAppId, systemTextLibraryService, languageService, guiContext) {
         var _a;
         super(element, permissionChecker, variableCommunicator, variableStore, signalRAppId);
         this.alarmsStore = alarmsStore;
         this.systemTextLibraryService = systemTextLibraryService;
         this.languageService = languageService;
+        this.guiContext = guiContext;
         this.elementStatus = AlaertElementStatus.Loading;
         this.displayOption = {
             dataLimit: 500,
@@ -43,6 +44,8 @@ export class AlarmElement extends ConditionalDisplayElement {
         this.timePeriods = this.getValidTimePeriods();
         this.pageSize = this.model.generalSetting.pageSize;
         localStorage.setItem('simulate-time', moment().valueOf() + '');
+        // 订阅语种变化事件
+        this.subscribeLanguageChange();
         if (this.model.filterSetting) {
             this.alarmNames = this.model.filterSetting.detailsData.map(item => item.name);
             this.currentTimePeriod = (_a = this.model.filterSetting) === null || _a === void 0 ? void 0 : _a.displayPeriod;
@@ -76,18 +79,84 @@ export class AlarmElement extends ConditionalDisplayElement {
         if (this.element) {
             this.element.tooltip.hidden(true);
         }
+        // 取消语种变化订阅
+        if (this.languageChangeSubscription) {
+            this.languageChangeSubscription.unsubscribe();
+            this.languageChangeSubscription = undefined;
+        }
         this.logger.debug(`[GUI]Dispose Alarm Table Refresh Interval:${d3.time.format('%x %X')(new Date())}`);
     }
+    /**
+     * 订阅语种变化事件
+     */
+    subscribeLanguageChange() {
+        if (this.guiContext && this.guiContext.languageChanged$) {
+            this.languageChangeSubscription = this.guiContext.languageChanged$.subscribe(() => {
+                // 只更新文案，不重新查询数据
+                this.updateLanguageTexts();
+            });
+        }
+    }
+    /**
+     * 更新语种相关的文案（表头和时间段选择器）
+     */
+    updateLanguageTexts() {
+        var _a;
+        // 更新表头文本
+        const headerCells = this.$element.find('table th');
+        for (let col = 0; col < 4 && col < headerCells.length; col++) {
+            headerCells.eq(col).text(this.getHeaderTextByColumn(col));
+        }
+        // 更新时间段选择器选项
+        if ((_a = this.model.filterSetting) === null || _a === void 0 ? void 0 : _a.alarmType) {
+            const selectElement = this.rootElement.select('select');
+            if (!selectElement.empty()) {
+                // 重新生成时间段数据
+                const updatedTimePeriods = this.getValidTimePeriods();
+                // 更新选项文本
+                const options = selectElement.selectAll('option');
+                options.each(function (_d, i) {
+                    if (i < updatedTimePeriods.length) {
+                        d3.select(this).text(updatedTimePeriods[i].name);
+                    }
+                });
+            }
+        }
+    }
+    /**
+     * 获取当前语种的 culture 代码
+     */
+    getCurrentCulture() {
+        var _a, _b, _c, _e, _f, _g;
+        // 获取当前语种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）
+        const defaultLanguage = ((_e = this.languageService) === null || _e === void 0 ? void 0 : _e.getDefaultLanguage()) || 'zh-CN';
+        if (currentLanguageId === null || currentLanguageId === undefined) {
+            // 设备未设置当前语种，使用默认语种
+            return defaultLanguage;
+        }
+        else {
+            // 设备已设置当前语种，获取对应的语种代码
+            const currentLanguage = (_g = (_f = this.guiContext) === null || _f === void 0 ? void 0 : _f.getLanguageCultureById) === null || _g === void 0 ? void 0 : _g.call(_f, currentLanguageId);
+            if (currentLanguage) {
+                return currentLanguage;
+            }
+            else {
+                // 无法获取语种代码，使用默认语种
+                return defaultLanguage;
+            }
+        }
+    }
     /**
      * 根据列索引获取表头翻译（从系统文本库获取多语种翻译）
      * 固定4项表头，按列索引顺序：告警名称、告警内容、告警等级、时间
      */
     getHeaderTextByColumn(columnIndex) {
-        var _a;
         if (columnIndex < 0 || columnIndex > 3) {
             return '';
         }
-        const currentCulture = ((_a = this.languageService) === null || _a === void 0 ? void 0 : _a.getDefaultLanguage()) || 'zh-CN';
+        const currentCulture = this.getCurrentCulture();
         const systemType = SYSTEM_TEXT_LIBRARY_TYPES.COMPONENT_BUILTIN;
         const headerKeys = [
             ALARM_TABLE_HEADER_KEYS.ALARM_NAME,
@@ -116,11 +185,10 @@ export class AlarmElement extends ConditionalDisplayElement {
         return timePeriods;
     }
     /**
-     * 获取时间段文案（从系统文本库获取多语种翻译，fallback 使用 localization）
+     * 获取时间段文案（从系统文本库获取多语种翻译）
      */
     getTimePeriodText(textKey) {
-        var _a;
-        const currentCulture = ((_a = this.languageService) === null || _a === void 0 ? void 0 : _a.getDefaultLanguage()) || 'zh-CN';
+        const currentCulture = this.getCurrentCulture();
         const systemType = SYSTEM_TEXT_LIBRARY_TYPES.COMPONENT_BUILTIN;
         if (this.systemTextLibraryService) {
             const translation = this.systemTextLibraryService.getSystemTextValue(systemType, textKey, currentCulture);

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

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"AlarmElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-display-element","name":"ConditionalDisplayElement","line":19,"character":34},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":52,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":53,"character":18},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":54,"character":27},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":55,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":56,"character":23},{"__symbolic":"reference","module":"../../config","name":"AlarmsStore","line":57,"character":38},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"../../service","name":"SystemTextLibraryService","line":59,"character":52},{"__symbolic":"reference","module":"../../service","name":"LanguageService","line":60,"character":43}]}],"dispose":[{"__symbolic":"method"}],"getHeaderTextByColumn":[{"__symbolic":"method"}],"getValidTimePeriods":[{"__symbolic":"method"}],"getTimePeriodText":[{"__symbolic":"method"}],"getAlarmData":[{"__symbolic":"method"}],"renderElement":[{"__symbolic":"method"}],"renderOperationArea":[{"__symbolic":"method"}],"updateTimeRange":[{"__symbolic":"method"}],"updateQueryTimeRange":[{"__symbolic":"method"}],"loadFirstPage":[{"__symbolic":"method"}],"loadNextPage":[{"__symbolic":"method"}],"loadPreviousPage":[{"__symbolic":"method"}],"loadLastPage":[{"__symbolic":"method"}],"setStatusAsNormal":[{"__symbolic":"method"}],"setStatusAsLoading":[{"__symbolic":"method"}],"renderStatus":[{"__symbolic":"method"}],"clearStatus":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"AlarmElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-display-element","name":"ConditionalDisplayElement","line":21,"character":34},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":55,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":56,"character":18},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":57,"character":27},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":58,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":59,"character":23},{"__symbolic":"reference","module":"../../config","name":"AlarmsStore","line":60,"character":38},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"../../service","name":"SystemTextLibraryService","line":62,"character":52},{"__symbolic":"reference","module":"../../service","name":"LanguageService","line":63,"character":43},{"__symbolic":"reference","module":"../../gui/gui-context","name":"GuiContext","line":64,"character":38}]}],"dispose":[{"__symbolic":"method"}],"subscribeLanguageChange":[{"__symbolic":"method"}],"updateLanguageTexts":[{"__symbolic":"method"}],"getCurrentCulture":[{"__symbolic":"method"}],"getHeaderTextByColumn":[{"__symbolic":"method"}],"getValidTimePeriods":[{"__symbolic":"method"}],"getTimePeriodText":[{"__symbolic":"method"}],"getAlarmData":[{"__symbolic":"method"}],"renderElement":[{"__symbolic":"method"}],"renderOperationArea":[{"__symbolic":"method"}],"updateTimeRange":[{"__symbolic":"method"}],"updateQueryTimeRange":[{"__symbolic":"method"}],"loadFirstPage":[{"__symbolic":"method"}],"loadNextPage":[{"__symbolic":"method"}],"loadPreviousPage":[{"__symbolic":"method"}],"loadLastPage":[{"__symbolic":"method"}],"setStatusAsNormal":[{"__symbolic":"method"}],"setStatusAsLoading":[{"__symbolic":"method"}],"renderStatus":[{"__symbolic":"method"}],"clearStatus":[{"__symbolic":"method"}]}}}}]

package/elements/base/readable-element.js

@@ -79,11 +79,7 @@ export class ReadableElement extends ConditionalEnableElement {
                 this.changeStates();
             }
         });
-        if (value.systemName !== '设备状态' && (this.state === State.Normal || this.state === State.Disable
-            || value.variableName === this.minVariableName
-            || value.variableName === this.maxVariableName)) {
-            this.updateVariableValue(value.value, value.variableName);
-        }
+        // 处理系统变量"设备状态"
         if (value.systemName === '设备状态') {
             let name = value.customStatus;
             const language = ((_b = (_a = window.abp.localization) === null || _a === void 0 ? void 0 : _a.currentLanguage) === null || _b === void 0 ? void 0 : _b.name) || ((_d = (_c = this.localization.localizationService) === null || _c === void 0 ? void 0 : _c.translate) === null || _d === void 0 ? void 0 : _d.currentLang);
@@ -106,6 +102,19 @@ export class ReadableElement extends ConditionalEnableElement {
                 }
             }
             this.updateVariableValue(name, '设备状态');
+            return; // 处理完"设备状态"后直接返回
+        }
+        // 处理系统变量"当前语种ID"
+        if (value.variableName === '当前语种ID') {
+            // 直接使用变量值（数字或null）
+            this.updateVariableValue(value.value, value.variableName);
+            return;
+        }
+        // 处理普通变量
+        if (this.state === State.Normal || this.state === State.Disable
+            || value.variableName === this.minVariableName
+            || value.variableName === this.maxVariableName) {
+            this.updateVariableValue(value.value, value.variableName);
         }
     }
 }

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

@@ -139,8 +139,8 @@ export class StateControlElement extends ConditionalDynamicDisplayElement {
         if (!this.currentRect.length) {
             return;
         }
-        // 元件绑定设备状态时不需要在右上角显示状态
-        if (this.$element[0].dataset.model.includes('设备状态'))
+        // 元件绑定设备状态或当前语种ID时不需要在右上角显示状态
+        if (this.$element[0].dataset.model.includes('设备状态') || this.$element[0].dataset.model.includes('当前语种ID'))
             return;
         const document = this.$element[0].ownerDocument;
         const imgObj = document.createElementNS('http://www.w3.org/2000/svg', 'image');

package/elements/historical-curve/historical-curve.element.d.ts

@@ -4,14 +4,17 @@ import { HistoricalCurveModel } from '../../model/historical-curve/historical-cu
 import { PermissionChecker, SystemTextLibraryService, LanguageService } from '../../service';
 import { ConditionalDisplayElement } from '../base/conditional-display-element';
 import { Injector } from '@angular/core';
+import { GuiContext } from '../../gui/gui-context';
 export declare class HistoricalCurveElement extends ConditionalDisplayElement {
     private readonly historyDataStore;
     private readonly systemTextLibraryService?;
     private readonly languageService?;
+    private readonly guiContext?;
     readonly model: HistoricalCurveModel;
     private readonly logger;
     private readonly localization;
     private readonly timePeriods;
+    private languageChangeSubscription?;
     private readonly displayOption;
     /**
      * 当前时间段的开始时间
@@ -39,13 +42,25 @@ export declare class HistoricalCurveElement extends ConditionalDisplayElement {
     private resizeEventListener;
     private isAndroid;
     private needResize;
-    constructor(element: HTMLElement, injector: Injector, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, historyDataStore: HistoryDataStore, signalRAppId: string, systemTextLibraryService?: SystemTextLibraryService, languageService?: LanguageService);
+    constructor(element: HTMLElement, injector: Injector, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, historyDataStore: HistoryDataStore, signalRAppId: string, systemTextLibraryService?: SystemTextLibraryService, languageService?: LanguageService, guiContext?: GuiContext);
     dispose(): void;
     private initKeyboardListener;
     private setNeedResize;
+    /**
+     * 订阅语种变化事件
+     */
+    private subscribeLanguageChange;
+    /**
+     * 更新语种相关的文案（时间段选择器）
+     */
+    private updateLanguageTexts;
+    /**
+     * 获取当前语种的 culture 代码
+     */
+    private getCurrentCulture;
     private getValidTimePeriods;
     /**
-     * 获取时间段文案（从系统文本库获取多语种翻译，fallback 使用 localization）
+     * 获取时间段文案（从系统文本库获取多语种翻译）
      */
     private getTimePeriodText;
     private updateTimeRange;

package/elements/historical-curve/historical-curve.element.js

@@ -13,11 +13,12 @@ import { GlobalSettings, DisplayMode } from '../../settings';
 import { CurveType } from '../../model/historical-curve/curve-type';
 import { AxisRangeType } from '../../model/historical-curve/historical-curve-axis-settings';
 export class HistoricalCurveElement extends ConditionalDisplayElement {
-    constructor(element, injector, permissionChecker, variableCommunicator, variableStore, historyDataStore, signalRAppId, systemTextLibraryService, languageService) {
+    constructor(element, injector, permissionChecker, variableCommunicator, variableStore, historyDataStore, signalRAppId, systemTextLibraryService, languageService, guiContext) {
         super(element, permissionChecker, variableCommunicator, variableStore, signalRAppId);
         this.historyDataStore = historyDataStore;
         this.systemTextLibraryService = systemTextLibraryService;
         this.languageService = languageService;
+        this.guiContext = guiContext;
         this.displayOption = {
             dataLimit: 500,
             dataZoomHeight: 32,
@@ -59,6 +60,8 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
         }
         this.loadFirstPage();
         this.initKeyboardListener();
+        // 订阅语种变化事件
+        this.subscribeLanguageChange();
     }
     dispose() {
         clearInterval(this.refreshIntervalId);
@@ -72,6 +75,11 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
             window.removeEventListener('native.keyboardshow', this.setNeedResize);
             window.removeEventListener('native.keyboardhide', this.setNeedResize);
         }
+        // 取消语种变化订阅
+        if (this.languageChangeSubscription) {
+            this.languageChangeSubscription.unsubscribe();
+            this.languageChangeSubscription = undefined;
+        }
         this.logger.debug(`[GUI]Dispose Histoical Curve Refresh Interval:${d3.time.format('%x %X')(new Date())}`);
     }
     initKeyboardListener() {
@@ -81,6 +89,59 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
             window.addEventListener('native.keyboardhide', this.setNeedResize);
         }
     }
+    /**
+     * 订阅语种变化事件
+     */
+    subscribeLanguageChange() {
+        if (this.guiContext && this.guiContext.languageChanged$) {
+            this.languageChangeSubscription = this.guiContext.languageChanged$.subscribe(() => {
+                // 只更新时间段选择器的文案，不重新查询数据
+                this.updateLanguageTexts();
+            });
+        }
+    }
+    /**
+     * 更新语种相关的文案（时间段选择器）
+     */
+    updateLanguageTexts() {
+        const selectElement = this.rootElement.select('select');
+        if (!selectElement.empty()) {
+            // 重新生成时间段数据
+            const updatedTimePeriods = this.getValidTimePeriods();
+            // 更新选项文本
+            const options = selectElement.selectAll('option');
+            options.each(function (_d, i) {
+                if (i < updatedTimePeriods.length) {
+                    d3.select(this).text(updatedTimePeriods[i].name);
+                }
+            });
+        }
+    }
+    /**
+     * 获取当前语种的 culture 代码
+     */
+    getCurrentCulture() {
+        var _a, _b, _c, _e, _f, _g;
+        // 获取当前语种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）
+        const defaultLanguage = ((_e = this.languageService) === null || _e === void 0 ? void 0 : _e.getDefaultLanguage()) || 'zh-CN';
+        if (currentLanguageId === null || currentLanguageId === undefined) {
+            // 设备未设置当前语种，使用默认语种
+            return defaultLanguage;
+        }
+        else {
+            // 设备已设置当前语种，获取对应的语种代码
+            const currentLanguage = (_g = (_f = this.guiContext) === null || _f === void 0 ? void 0 : _f.getLanguageCultureById) === null || _g === void 0 ? void 0 : _g.call(_f, currentLanguageId);
+            if (currentLanguage) {
+                return currentLanguage;
+            }
+            else {
+                // 无法获取语种代码，使用默认语种
+                return defaultLanguage;
+            }
+        }
+    }
     getValidTimePeriods() {
         const timePeriods = new Array();
         timePeriods.push({ key: 6, name: this.getTimePeriodText(TIME_PERIOD_KEYS.LAST_THIRTY_MINUTES) });
@@ -93,11 +154,10 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
         return timePeriods;
     }
     /**
-     * 获取时间段文案（从系统文本库获取多语种翻译，fallback 使用 localization）
+     * 获取时间段文案（从系统文本库获取多语种翻译）
      */
     getTimePeriodText(textKey) {
-        var _a;
-        const currentCulture = ((_a = this.languageService) === null || _a === void 0 ? void 0 : _a.getDefaultLanguage()) || 'zh-CN';
+        const currentCulture = this.getCurrentCulture();
         const systemType = SYSTEM_TEXT_LIBRARY_TYPES.COMPONENT_BUILTIN;
         if (this.systemTextLibraryService) {
             const translation = this.systemTextLibraryService.getSystemTextValue(systemType, textKey, currentCulture);

package/elements/historical-curve/historical-curve.element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"HistoricalCurveElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-display-element","name":"ConditionalDisplayElement","line":21,"character":44},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":68,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":69,"character":18},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":70,"character":27},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":71,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":72,"character":23},{"__symbolic":"reference","module":"../../config","name":"HistoryDataStore","line":73,"character":43},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"../../service","name":"SystemTextLibraryService","line":75,"character":52},{"__symbolic":"reference","module":"../../service","name":"LanguageService","line":76,"character":43}]}],"dispose":[{"__symbolic":"method"}],"initKeyboardListener":[{"__symbolic":"method"}],"getValidTimePeriods":[{"__symbolic":"method"}],"getTimePeriodText":[{"__symbolic":"method"}],"updateTimeRange":[{"__symbolic":"method"}],"updateQueryTimeRange":[{"__symbolic":"method"}],"reRenderElement":[{"__symbolic":"method"}],"renderElement":[{"__symbolic":"method"}],"handleQueryResult":[{"__symbolic":"method"}],"setupTooltipAutoHide":[{"__symbolic":"method"}],"renderChart":[{"__symbolic":"method"}],"initPoint":[{"__symbolic":"method"}],"getLineChart":[{"__symbolic":"method"}],"getMultiBarWithFocusChart":[{"__symbolic":"method"}],"renderCommonProperty":[{"__symbolic":"method"}],"renderOperationArea":[{"__symbolic":"method"}],"timeFormat":[{"__symbolic":"method"}],"loadFirstPage":[{"__symbolic":"method"}],"loadNextPage":[{"__symbolic":"method"}],"loadPreviousPage":[{"__symbolic":"method"}],"loadLastPage":[{"__symbolic":"method"}],"initElementStatus":[{"__symbolic":"method"}],"updateElementStatus":[{"__symbolic":"method"}],"setStatusAsUnbound":[{"__symbolic":"method"}],"setStatusAsLoading":[{"__symbolic":"method"}],"setStatusAsLoadFailed":[{"__symbolic":"method"}],"renderStatus":[{"__symbolic":"method"}],"clearStatus":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"HistoricalCurveElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-display-element","name":"ConditionalDisplayElement","line":23,"character":44},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":71,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":72,"character":18},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":73,"character":27},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":74,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":75,"character":23},{"__symbolic":"reference","module":"../../config","name":"HistoryDataStore","line":76,"character":43},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"../../service","name":"SystemTextLibraryService","line":78,"character":52},{"__symbolic":"reference","module":"../../service","name":"LanguageService","line":79,"character":43},{"__symbolic":"reference","module":"../../gui/gui-context","name":"GuiContext","line":80,"character":38}]}],"dispose":[{"__symbolic":"method"}],"initKeyboardListener":[{"__symbolic":"method"}],"subscribeLanguageChange":[{"__symbolic":"method"}],"updateLanguageTexts":[{"__symbolic":"method"}],"getCurrentCulture":[{"__symbolic":"method"}],"getValidTimePeriods":[{"__symbolic":"method"}],"getTimePeriodText":[{"__symbolic":"method"}],"updateTimeRange":[{"__symbolic":"method"}],"updateQueryTimeRange":[{"__symbolic":"method"}],"reRenderElement":[{"__symbolic":"method"}],"renderElement":[{"__symbolic":"method"}],"handleQueryResult":[{"__symbolic":"method"}],"setupTooltipAutoHide":[{"__symbolic":"method"}],"renderChart":[{"__symbolic":"method"}],"initPoint":[{"__symbolic":"method"}],"getLineChart":[{"__symbolic":"method"}],"getMultiBarWithFocusChart":[{"__symbolic":"method"}],"renderCommonProperty":[{"__symbolic":"method"}],"renderOperationArea":[{"__symbolic":"method"}],"timeFormat":[{"__symbolic":"method"}],"loadFirstPage":[{"__symbolic":"method"}],"loadNextPage":[{"__symbolic":"method"}],"loadPreviousPage":[{"__symbolic":"method"}],"loadLastPage":[{"__symbolic":"method"}],"initElementStatus":[{"__symbolic":"method"}],"updateElementStatus":[{"__symbolic":"method"}],"setStatusAsUnbound":[{"__symbolic":"method"}],"setStatusAsLoading":[{"__symbolic":"method"}],"setStatusAsLoadFailed":[{"__symbolic":"method"}],"renderStatus":[{"__symbolic":"method"}],"clearStatus":[{"__symbolic":"method"}]}}}}]

package/elements/main-element.js

@@ -61,7 +61,7 @@ export class MainElement {
             const category = $(element).data('model').category;
             switch (category) {
                 case GuiConsts.components.numericalDisplayKey:
-                    const numericalDisplayElement = new NumericalDisplayElement(element, this.injector, this.bsModalService, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.graphStore, this.context.operationRecordService, this.context.releasedVariableService, this.context.securityChecker, this.context.configStore.variableStore, this.injector.get(LOCALIZATION), this.signalRAppId);
+                    const numericalDisplayElement = new NumericalDisplayElement(element, this.injector, this.bsModalService, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.graphStore, this.context.operationRecordService, this.context.releasedVariableService, this.context.securityChecker, this.context.configStore.variableStore, this.injector.get(LOCALIZATION), this.signalRAppId, this.context);
                     this.elements.push(numericalDisplayElement);
                     break;
                 case GuiConsts.components.imageKey:
@@ -74,23 +74,23 @@ export class MainElement {
                     this.elements.push(new PipeElement(element, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.injector.get(LOCALIZATION), this.signalRAppId));
                     break;
                 case GuiConsts.components.switchIndicatorLightKey:
-                    this.elements.push(new SwitchIndicatorLightElement(element, this.injector, this.bsModalService, this.variableCommunicator, this.context.configStore.graphStore, this.context.permissionChecker, this.context.operationRecordService, this.context.securityChecker, this.context.configStore.variableStore, this.injector.get(LOCALIZATION), this.signalRAppId, this.context.textLibraryService, this.context.languageService));
+                    this.elements.push(new SwitchIndicatorLightElement(element, this.injector, this.bsModalService, this.variableCommunicator, this.context.configStore.graphStore, this.context.permissionChecker, this.context.operationRecordService, this.context.securityChecker, this.context.configStore.variableStore, this.injector.get(LOCALIZATION), this.signalRAppId, this.context.textLibraryService, this.context.languageService, this.context));
                     break;
                 case GuiConsts.components.barGraphKey:
                     this.elements.push(new BarGraphElement(element, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.injector.get(LOCALIZATION), this.signalRAppId));
                     break;
                 case GuiConsts.components.toggleViewKey:
                 case GuiConsts.components.viewOperationElement:
-                    this.elements.push(new ViewOperationElement(element, this.injector, this.bsModalService, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.graphStore, this.context.permissionChecker, this.context.operationRecordService, this.context.securityChecker, this.injector.get(LOCALIZATION), this.popupViewService, guiOptions.hostContainerId, guiOptions.el, this.signalRAppId));
+                    this.elements.push(new ViewOperationElement(element, this.injector, this.bsModalService, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.graphStore, this.context.permissionChecker, this.context.operationRecordService, this.context.securityChecker, this.injector.get(LOCALIZATION), this.popupViewService, guiOptions.hostContainerId, guiOptions.el, this.signalRAppId, this.context.textLibraryService, this.context.languageService, this.context));
                     break;
                 case GuiConsts.components.characterKey:
                     this.elements.push(new CharacterDisplayElement(element, this.injector, this.bsModalService, this.variableCommunicator, this.context.configStore.graphStore, this.context.permissionChecker, this.context.operationRecordService, this.context.securityChecker, this.context.configStore.variableStore, this.injector.get(LOCALIZATION), this.signalRAppId));
                     break;
                 case GuiConsts.components.textKey:
-                    this.elements.push(new TextElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.graphStore, this.signalRAppId, this.context.textLibraryService, this.context.languageService));
+                    this.elements.push(new TextElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.graphStore, this.signalRAppId, this.context.textLibraryService, this.context.languageService, this.context));
                     break;
                 case GuiConsts.components.hyperlinkKey:
-                    this.elements.push(new HyperlinkElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.graphStore, this.signalRAppId, this.context.textLibraryService, this.context.languageService));
+                    this.elements.push(new HyperlinkElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.graphStore, this.signalRAppId, this.context.textLibraryService, this.context.languageService, this.context));
                     break;
                 case GuiConsts.components.straightLineKey:
                     this.elements.push(new StraightLineElement(element, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.signalRAppId));
@@ -111,7 +111,7 @@ export class MainElement {
                     this.elements.push(new DatetimeDisplayElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.graphStore, this.signalRAppId));
                     break;
                 case GuiConsts.components.historicalCurveKey:
-                    this.elements.push(new HistoricalCurveElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.historyDataStore, this.signalRAppId, this.context.systemTextLibraryService, this.context.languageService));
+                    this.elements.push(new HistoricalCurveElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.historyDataStore, this.signalRAppId, this.context.systemTextLibraryService, this.context.languageService, this.context));
                     break;
                 case GuiConsts.components.ringGraphKey:
                     this.elements.push(new RingGraphElement(element, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.injector.get(LOCALIZATION), this.signalRAppId));
@@ -132,7 +132,7 @@ export class MainElement {
                     this.elements.push(new AirQualityElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.weatherService, this.signalRAppId));
                     break;
                 case GuiConsts.components.alarmKey:
-                    this.elements.push(new AlarmElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.alarmsStore, this.signalRAppId, this.context.systemTextLibraryService, this.context.languageService));
+                    this.elements.push(new AlarmElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.alarmsStore, this.signalRAppId, this.context.systemTextLibraryService, this.context.languageService, this.context));
                     break;
                 case GuiConsts.components.scrollAlarmKey:
                     this.elements.push(new ScrollAlarmElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.alarmsStore, this.signalRAppId));

package/elements/numerical-display/numerical-display-element.d.ts

@@ -4,15 +4,17 @@ import { GraphStore, VariableStore } from '../../config';
 import { Localization } from '../../localization';
 import { NumericalDisplay } from '../../model';
 import { PermissionChecker, OperationRecordService, ReleasedVariableService } from '../../service';
-import { VariableCommunicator } from '../../communication';
+import { VariableCommunicator, VariableValue } from '../../communication';
 import { ReadableElement } from '../base/readable-element';
 import { SecurityChecker } from '../../security';
+import { GuiContext } from '../../gui/gui-context';
 export declare class NumericalDisplayElement extends ReadableElement {
     private readonly modalService;
     private readonly graphStore;
     private readonly operationRecordService;
     private readonly releasedVariableService;
     private readonly securityChecker;
+    private readonly guiContext?;
     private readonly dataTypeService;
     private readonly fractionDigitService;
     private readonly accessPermissionService;
@@ -28,8 +30,13 @@ export declare class NumericalDisplayElement extends ReadableElement {
     private numericalOperation;
     private restorationTimer;
     get writeVariableName(): string;
-    constructor(element: HTMLElement, injector: Injector, modalService: BsModalService, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, graphStore: GraphStore, operationRecordService: OperationRecordService, releasedVariableService: ReleasedVariableService, securityChecker: SecurityChecker, variableStore: VariableStore, localization: Localization, signalRAppId: string);
+    constructor(element: HTMLElement, injector: Injector, modalService: BsModalService, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, graphStore: GraphStore, operationRecordService: OperationRecordService, releasedVariableService: ReleasedVariableService, securityChecker: SecurityChecker, variableStore: VariableStore, localization: Localization, signalRAppId: string, guiContext?: GuiContext);
     dispose(): void;
+    /**
+     * 重写父类方法，处理"当前语种ID"系统变量
+     * 当值为null时，显示默认语种ID
+     */
+    reportValueChanged(value: VariableValue): void;
     initElement(): any;
     private checkElementPassword;
     private initVariableText;

package/elements/numerical-display/numerical-display-element.js

@@ -18,13 +18,14 @@ var variableRwTypeEnum;
     variableRwTypeEnum[variableRwTypeEnum["readWiter"] = 6] = "readWiter";
 })(variableRwTypeEnum || (variableRwTypeEnum = {}));
 export class NumericalDisplayElement extends ReadableElement {
-    constructor(element, injector, modalService, permissionChecker, variableCommunicator, graphStore, operationRecordService, releasedVariableService, securityChecker, variableStore, localization, signalRAppId) {
+    constructor(element, injector, modalService, permissionChecker, variableCommunicator, graphStore, operationRecordService, releasedVariableService, securityChecker, variableStore, localization, signalRAppId, guiContext) {
         super(element, permissionChecker, variableCommunicator, variableStore, localization, signalRAppId);
         this.modalService = modalService;
         this.graphStore = graphStore;
         this.operationRecordService = operationRecordService;
         this.releasedVariableService = releasedVariableService;
         this.securityChecker = securityChecker;
+        this.guiContext = guiContext;
         this.displayText = '';
         this.enableDataParsed = false;
         this.logger = injector.get(LOGGER_SERVICE_TOKEN);
@@ -57,6 +58,25 @@ export class NumericalDisplayElement extends ReadableElement {
             this.$element.remove();
         }
     }
+    /**
+     * 重写父类方法，处理"当前语种ID"系统变量
+     * 当值为null时，显示默认语种ID
+     */
+    reportValueChanged(value) {
+        var _a, _b, _c;
+        // 处理系统变量"当前语种ID"
+        if (value.variableName === '当前语种ID') {
+            let displayValue = value.value;
+            // 如果值为null，使用默认语种ID
+            if (displayValue === null || displayValue === undefined) {
+                displayValue = (_c = (_b = (_a = this.guiContext) === null || _a === void 0 ? void 0 : _a.getDefaultLanguageId) === null || _b === void 0 ? void 0 : _b.call(_a)) !== null && _c !== void 0 ? _c : 0;
+            }
+            this.updateVariableValue(displayValue);
+            return;
+        }
+        // 其他变量调用父类方法
+        super.reportValueChanged(value);
+    }
     initElement() {
         const { rootElement } = this;
         rootElement.selectAll('*').remove();
@@ -180,7 +200,7 @@ export class NumericalDisplayElement extends ReadableElement {
         if (null == this.writeVariableName) {
             return;
         }
-        const args = new WriteValueModalArgs(this.writeVariableName, this.model.dataType, this.model.fBoxDataType, this.model.integerDigits, this.model.fractionDigits, this.numericalOperationService.getNumericalOperations(this.model), this.model.version, this.enableDataParsed, this.releasedVariableService);
+        const args = new WriteValueModalArgs(this.writeVariableName, this.model.dataType, this.model.fBoxDataType, this.model.integerDigits, this.model.fractionDigits, this.numericalOperationService.getNumericalOperations(this.model), this.model.version, this.enableDataParsed, this.releasedVariableService, this.guiContext);
         this.writeValueMmodalRef = this.modalService.show(WriteValueModalComponent, {
             initialState: { args: args }, backdrop: 'static', class: 'gui-modal-dialog-position', animated: false
         });

package/elements/numerical-display/numerical-display-element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"NumericalDisplayElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/readable-element","name":"ReadableElement","line":28,"character":45},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":50,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":51,"character":18},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":52,"character":39},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":53,"character":27},{"__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":"OperationRecordService","line":56,"character":49},{"__symbolic":"reference","module":"../../service","name":"ReleasedVariableService","line":57,"character":50},{"__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"}]}],"dispose":[{"__symbolic":"method"}],"initElement":[{"__symbolic":"method"}],"checkElementPassword":[{"__symbolic":"method"}],"initVariableText":[{"__symbolic":"method"}],"initGraphAndText":[{"__symbolic":"method"}],"doWriteValue":[{"__symbolic":"method"}],"recordOperation":[{"__symbolic":"method"}],"changeStates":[{"__symbolic":"method"}],"updateVariableValue":[{"__symbolic":"method"}],"updateDisplayText":[{"__symbolic":"method"}],"rebuildTextElement":[{"__symbolic":"method"}],"formatNumericalDisplayText":[{"__symbolic":"method"}],"formatFloatDisplayText":[{"__symbolic":"method"}],"isNumeric":[{"__symbolic":"method"}],"formatDisplayTextUnit":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"NumericalDisplayElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/readable-element","name":"ReadableElement","line":29,"character":45},"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":"../../service","name":"PermissionChecker","line":54,"character":27},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":55,"character":30},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":56,"character":37},{"__symbolic":"reference","module":"../../service","name":"OperationRecordService","line":57,"character":49},{"__symbolic":"reference","module":"../../service","name":"ReleasedVariableService","line":58,"character":50},{"__symbolic":"reference","module":"../../security","name":"SecurityChecker","line":59,"character":42},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":60,"character":23},{"__symbolic":"reference","module":"../../localization","name":"Localization","line":61,"character":22},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"../../gui/gui-context","name":"GuiContext","line":63,"character":38}]}],"dispose":[{"__symbolic":"method"}],"reportValueChanged":[{"__symbolic":"method"}],"initElement":[{"__symbolic":"method"}],"checkElementPassword":[{"__symbolic":"method"}],"initVariableText":[{"__symbolic":"method"}],"initGraphAndText":[{"__symbolic":"method"}],"doWriteValue":[{"__symbolic":"method"}],"recordOperation":[{"__symbolic":"method"}],"changeStates":[{"__symbolic":"method"}],"updateVariableValue":[{"__symbolic":"method"}],"updateDisplayText":[{"__symbolic":"method"}],"rebuildTextElement":[{"__symbolic":"method"}],"formatNumericalDisplayText":[{"__symbolic":"method"}],"formatFloatDisplayText":[{"__symbolic":"method"}],"isNumeric":[{"__symbolic":"method"}],"formatDisplayTextUnit":[{"__symbolic":"method"}]}}}}]

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

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