@flexem/fc-gui 3.0.0-alpha.136 → 3.0.0-alpha.138

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

@@ -42,10 +42,6 @@ export class HyperlinkElement extends ConditionalDynamicDisplayElement {
      * 当设备的语种ID改变时，重新渲染文本
      */
     subscribeLanguageChange() {
-        // 只有使用文本库时才需要订阅语种变化
-        if (!this.model.textLibrary || this.model.textLibrary.labelType !== 'textLibrary') {
-            return;
-        }
         if (this.guiContext && this.guiContext.languageChanged$) {
             this.languageChangeSubscription = this.guiContext.languageChanged$.subscribe(() => {
                 // 重新渲染文本
@@ -96,7 +92,7 @@ export class HyperlinkElement extends ConditionalDynamicDisplayElement {
      * 否则返回默认文本
      */
     getDisplayText() {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         // 检查是否使用文本库
         if (this.model.textLibrary && this.model.textLibrary.labelType === 'textLibrary') {
             const textLibraryId = this.model.textLibrary.selectedTextLibraryItem;
@@ -140,7 +136,41 @@ export class HyperlinkElement extends ConditionalDynamicDisplayElement {
             // 文本库配置但未找到数据，返回空字符串
             return '';
         }
-        // 默认返回文本内容
-        return this.model.text || '';
+        // 处理自定义文本（支持多语种）
+        if (this.model.text) {
+            // 检查是否为多语种格式
+            if (typeof this.model.text === 'object' && this.model.text.cultures) {
+                // 新格式：多语种对象
+                // 获取当前语种ID
+                const currentLanguageId = (_j = (_h = (_g = this.guiContext) === null || _g === void 0 ? void 0 : _g.getCurrentLanguageId) === null || _h === void 0 ? void 0 : _h.call(_g)) !== null && _j !== void 0 ? _j : null;
+                // 确定要使用的语种代码（culture）
+                let targetLanguage;
+                const defaultLanguage = ((_k = this.languageService) === null || _k === void 0 ? void 0 : _k.getDefaultLanguage()) || 'zh-CN';
+                if (currentLanguageId === null || currentLanguageId === undefined) {
+                    // 设备未设置当前语种，使用默认语种
+                    targetLanguage = defaultLanguage;
+                }
+                else {
+                    // 设备已设置当前语种，获取对应的语种代码
+                    const currentLanguage = (_m = (_l = this.guiContext) === null || _l === void 0 ? void 0 : _l.getLanguageCultureById) === null || _m === void 0 ? void 0 : _m.call(_l, currentLanguageId);
+                    if (currentLanguage) {
+                        targetLanguage = currentLanguage;
+                    }
+                    else {
+                        targetLanguage = defaultLanguage;
+                    }
+                }
+                // 返回对应语种的文本，如果没有则根据当前语言环境显示默认文本
+                // 获取当前语言环境
+                const language = ((_q = (_p = (_o = window.abp) === null || _o === void 0 ? void 0 : _o.localization) === null || _p === void 0 ? void 0 : _p.currentLanguage) === null || _q === void 0 ? void 0 : _q.name) || 'zh-Hans';
+                const isChinese = language === 'zh-Hans' || language === 'zh';
+                return this.model.text.cultures[targetLanguage] || (isChinese ? '超链接' : 'Hyperlink');
+            }
+            else if (typeof this.model.text === 'string') {
+                // 旧格式：字符串
+                return this.model.text;
+            }
+        }
+        return '';
     }
 }

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

@@ -29,6 +29,7 @@ export declare class TextElement extends ConditionalDynamicDisplayElement {
     /**
      * 获取显示文本
      * 如果配置了文本库，则从文本库中获取对应语种的文本
+     * 如果是多语种自定义文本，则根据当前语种ID获取对应语种的文本
      * 否则返回默认文本
      */
     private getDisplayText;

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

@@ -58,10 +58,6 @@ export class TextElement extends ConditionalDynamicDisplayElement {
      * 当设备的语种ID改变时，重新渲染文本
      */
     subscribeLanguageChange() {
-        // 只有使用文本库时才需要订阅语种变化
-        if (!this.model.textLibrary || this.model.textLibrary.labelType !== 'textLibrary') {
-            return;
-        }
         if (this.guiContext && this.guiContext.languageChanged$) {
             this.languageChangeSubscription = this.guiContext.languageChanged$.subscribe(() => {
                 // 重新渲染文本
@@ -84,10 +80,11 @@ export class TextElement extends ConditionalDynamicDisplayElement {
     /**
      * 获取显示文本
      * 如果配置了文本库，则从文本库中获取对应语种的文本
+     * 如果是多语种自定义文本，则根据当前语种ID获取对应语种的文本
      * 否则返回默认文本
      */
     getDisplayText() {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         // 检查是否使用文本库
         if (this.model.textLibrary && this.model.textLibrary.labelType === 'textLibrary') {
             const textLibraryId = this.model.textLibrary.selectedTextLibraryItem;
@@ -131,8 +128,42 @@ export class TextElement extends ConditionalDynamicDisplayElement {
             // 文本库配置但未找到数据，返回空字符串
             return '';
         }
-        // 默认返回文本内容
-        return this.model.text || '';
+        // 处理自定义文本（支持多语种）
+        if (this.model.text) {
+            // 检查是否为多语种格式
+            if (typeof this.model.text === 'object' && this.model.text.cultures) {
+                // 新格式：多语种对象
+                // 获取当前语种ID
+                const currentLanguageId = (_j = (_h = (_g = this.guiContext) === null || _g === void 0 ? void 0 : _g.getCurrentLanguageId) === null || _h === void 0 ? void 0 : _h.call(_g)) !== null && _j !== void 0 ? _j : null;
+                // 确定要使用的语种代码（culture）
+                let targetLanguage;
+                const defaultLanguage = ((_k = this.languageService) === null || _k === void 0 ? void 0 : _k.getDefaultLanguage()) || 'zh-CN';
+                if (currentLanguageId === null || currentLanguageId === undefined) {
+                    // 设备未设置当前语种，使用默认语种
+                    targetLanguage = defaultLanguage;
+                }
+                else {
+                    // 设备已设置当前语种，获取对应的语种代码
+                    const currentLanguage = (_m = (_l = this.guiContext) === null || _l === void 0 ? void 0 : _l.getLanguageCultureById) === null || _m === void 0 ? void 0 : _m.call(_l, currentLanguageId);
+                    if (currentLanguage) {
+                        targetLanguage = currentLanguage;
+                    }
+                    else {
+                        targetLanguage = defaultLanguage;
+                    }
+                }
+                // 返回对应语种的文本，如果没有则根据当前语言环境显示默认文本
+                // 获取当前语言环境
+                const language = ((_q = (_p = (_o = window.abp) === null || _o === void 0 ? void 0 : _o.localization) === null || _p === void 0 ? void 0 : _p.currentLanguage) === null || _q === void 0 ? void 0 : _q.name) || 'zh-Hans';
+                const isChinese = language === 'zh-Hans' || language === 'zh';
+                return this.model.text.cultures[targetLanguage] || (isChinese ? '文本' : 'Text');
+            }
+            else if (typeof this.model.text === 'string') {
+                // 旧格式：字符串
+                return this.model.text;
+            }
+        }
+        return '';
     }
     handleTextValue() {
         const allText = this.$element.find('text');

package/elements/switch-indicator-light/switch-indicator-light-element.d.ts

@@ -28,6 +28,7 @@ export declare class SwitchIndicatorLightElement extends ConditionalEnableElemen
     private restorationTimer;
     private isWriteRestorationDownValue;
     private onDocMouseUp;
+    private indicatorLightSubscription;
     constructor(element: HTMLElement, injector: Injector, modalService: BsModalService, variableCommunicator: VariableCommunicator, graphStore: GraphStore, permissionChecker: PermissionChecker, operationRecordService: OperationRecordService, securityChecker: SecurityChecker, variableStore: VariableStore, localization: Localization, signalRAppId: string, textLibraryService?: TextLibraryService, languageService?: LanguageService, guiContext?: GuiContext);
     handleMouseUp(): void;
     private initOnDocMouseUpEvent;

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

@@ -211,7 +211,7 @@ export class SwitchIndicatorLightElement extends ConditionalEnableElement {
             default:
                 throw new Error(`Unknown switchType:${settings.type}`);
         }
-        this.indicatorLightOperator.currentStateIdChanged.subscribe(statusIdValue => {
+        this.indicatorLightSubscription = this.indicatorLightOperator.currentStateIdChanged.subscribe(statusIdValue => {
             this.currentStateIdChange(statusIdValue);
         });
         this.indicatorLightOperator.requestData(this.signalRAppId);
@@ -241,7 +241,7 @@ export class SwitchIndicatorLightElement extends ConditionalEnableElement {
             this.graphStateElement = new GraphStateElement(this.model.graphSetting, width, height, this.graphStore, this.logger, this.model.version, this.model.states);
             this.$element.append(this.graphStateElement.Element);
         }
-        this.textStateElement = new TextStateElement(this.model.states, width, height, this.logger, this.model.version, this.model.states, this.model.textLibrary, this.textLibraryService, this.languageService, this.guiContext);
+        this.textStateElement = new TextStateElement(this.model.states, width, height, this.logger, this.model.version, this.model.states, this.model.textLibrary, this.textLibraryService, this.languageService, this.guiContext, true);
         this.$element.append(this.textStateElement.Element);
     }
     /**
@@ -265,6 +265,19 @@ export class SwitchIndicatorLightElement extends ConditionalEnableElement {
         if (this.onDocMouseUp) {
             document.removeEventListener(this.isMobileMode ? 'touchend' : 'mouseup', this.onDocMouseUp);
         }
+        // 清理 indicatorLightOperator 订阅
+        if (this.indicatorLightSubscription) {
+            this.indicatorLightSubscription.unsubscribe();
+        }
+        // 清理图形元素（释放 SVG 内存）
+        if (this.graphStateElement) {
+            this.graphStateElement.dispose();
+        }
+        // 清理文本元素
+        if (this.textStateElement) {
+            // TextStateElement 可能也需要 dispose，暂时先清理引用
+            this.textStateElement = null;
+        }
     }
     checkState() {
         if (!this.model.states) {

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":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"}]}}}}]
+[{"__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":52,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":53,"character":18},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":54,"character":39},{"__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":"PermissionChecker","line":57,"character":27},{"__symbolic":"reference","module":"../../service","name":"OperationRecordService","line":58,"character":49},{"__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":"../../service","name":"TextLibraryService","line":63,"character":46},{"__symbolic":"reference","module":"../../service","name":"LanguageService","line":64,"character":43},{"__symbolic":"reference","module":"../../gui/gui-context","name":"GuiContext","line":65,"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.js

@@ -210,10 +210,6 @@ export class ViewOperationElement extends ConditionalEnableElement {
      * 订阅语种变化事件
      */
     subscribeLanguageChange() {
-        // 只有使用文本库时才需要订阅语种变化
-        if (!this.model.textLibrary || this.model.textLibrary.labelType !== 'textLibrary') {
-            return;
-        }
         if (this.guiContext && this.guiContext.languageChanged$) {
             this.languageChangeSubscription = this.guiContext.languageChanged$.subscribe(() => {
                 // 更新文本内容
@@ -233,7 +229,7 @@ export class ViewOperationElement extends ConditionalEnableElement {
      * 获取显示文本
      */
     getDisplayText() {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         // 检查是否使用文本库
         if (this.model.textLibrary && this.model.textLibrary.labelType === 'textLibrary') {
             const textLibraryId = this.model.textLibrary.selectedTextLibraryItem;
@@ -277,8 +273,39 @@ export class ViewOperationElement extends ConditionalEnableElement {
             // 文本库配置但未找到数据，返回空字符串
             return '';
         }
-        // 默认返回文本内容
-        return this.model.label.content || '';
+        // 处理自定义文本（支持多语种）
+        if (this.model.label && this.model.label.content) {
+            // 检查是否为多语种格式
+            if (typeof this.model.label.content === 'object' && this.model.label.content.cultures) {
+                // 新格式：多语种对象
+                // 获取当前语种ID
+                const currentLanguageId = (_j = (_h = (_g = this.guiContext) === null || _g === void 0 ? void 0 : _g.getCurrentLanguageId) === null || _h === void 0 ? void 0 : _h.call(_g)) !== null && _j !== void 0 ? _j : null;
+                // 确定要使用的语种代码（culture）
+                let targetLanguage;
+                const defaultLanguage = ((_k = this.languageService) === null || _k === void 0 ? void 0 : _k.getDefaultLanguage()) || 'zh-CN';
+                if (currentLanguageId === null || currentLanguageId === undefined) {
+                    // 设备未设置当前语种，使用默认语种
+                    targetLanguage = defaultLanguage;
+                }
+                else {
+                    // 设备已设置当前语种，获取对应的语种代码
+                    const currentLanguage = (_m = (_l = this.guiContext) === null || _l === void 0 ? void 0 : _l.getLanguageCultureById) === null || _m === void 0 ? void 0 : _m.call(_l, currentLanguageId);
+                    if (currentLanguage) {
+                        targetLanguage = currentLanguage;
+                    }
+                    else {
+                        targetLanguage = defaultLanguage;
+                    }
+                }
+                // toggle-view 找不到语种内容时默认为空字符串
+                return this.model.label.content.cultures[targetLanguage] || '';
+            }
+            else if (typeof this.model.label.content === 'string') {
+                // 旧格式：字符串
+                return this.model.label.content;
+            }
+        }
+        return '';
     }
     /**
      * 释放资源

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

@@ -3,8 +3,13 @@ export interface TextLibrarySetting {
     readonly selectedTextLibraryItem?: string | number;
     readonly selectedTextItem?: string | number;
 }
+export interface TextCultures {
+    readonly cultures: {
+        [languageCode: string]: string;
+    };
+}
 export interface FontSettingModel {
-    readonly text: string;
+    readonly text: string | TextCultures;
     readonly stroke: string;
     readonly font: string;
     readonly fontSize: string;

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

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

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

@@ -1,26 +1,9 @@
 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":{"HistoricalCurveDataItem":{"__symbolic":"interface"},"HistoricalCurveDataSettings":{"__symbolic":"interface"}}}]
+[{"__symbolic":"module","version":4,"metadata":{"HistoricalCurveDataSettings":{"__symbolic":"interface"}}}]

package/package.json

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