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

package/config/history-data/get-history-data-args.d.ts

@@ -1,14 +1,5 @@
 import * as moment from 'moment';
 import { HistoricalCurveTimeRange } from './historical-curve.time-range';
-/**
- * 单个历史数据条目查询参数
- */
-export interface HistoryDataItemArgs {
-    /** 历史数据条目名称 */
-    dataItemName: string;
-    /** 该条目下的通道名称列表 */
-    channelNames: Array<string>;
-}
 export declare class GetHistoryDataArgs {
     readonly dataSourceCode: number;
     readonly dataItemName: string;
@@ -17,17 +8,15 @@ export declare class GetHistoryDataArgs {
     readonly endTime: moment.Moment;
     readonly limit: number;
     readonly rangeType: HistoricalCurveTimeRange;
-    readonly historyDataItems?: Array<HistoryDataItemArgs>;
     /**
      * 获取历史数据参数
      * @param dataSourceCode 数据源编码
-     * @param dataItemName 历史数据条目名称（单条目模式，兼容旧版）
-     * @param channelNames 通道名称（单条目模式，兼容旧版）
+     * @param dataItemName 历史数据条目名称
+     * @param channelNames 通道名称
      * @param startTime 开始时间
      * @param endTime 结束时间
      * @param limit 获取数据数量，为负数则倒叙
      * @param rangeType 区间类型
-     * @param historyDataItems 多条目模式：多个历史数据条目及其通道配置
      */
-    constructor(dataSourceCode: number, dataItemName: string, channelNames: Array<string>, startTime: moment.Moment, endTime: moment.Moment, limit: number, rangeType: HistoricalCurveTimeRange, historyDataItems?: Array<HistoryDataItemArgs>);
+    constructor(dataSourceCode: number, dataItemName: string, channelNames: Array<string>, startTime: moment.Moment, endTime: moment.Moment, limit: number, rangeType: HistoricalCurveTimeRange);
 }

package/config/history-data/get-history-data-args.js

@@ -2,15 +2,14 @@ export class GetHistoryDataArgs {
     /**
      * 获取历史数据参数
      * @param dataSourceCode 数据源编码
-     * @param dataItemName 历史数据条目名称（单条目模式，兼容旧版）
-     * @param channelNames 通道名称（单条目模式，兼容旧版）
+     * @param dataItemName 历史数据条目名称
+     * @param channelNames 通道名称
      * @param startTime 开始时间
      * @param endTime 结束时间
      * @param limit 获取数据数量，为负数则倒叙
      * @param rangeType 区间类型
-     * @param historyDataItems 多条目模式：多个历史数据条目及其通道配置
      */
-    constructor(dataSourceCode, dataItemName, channelNames, startTime, endTime, limit, rangeType, historyDataItems) {
+    constructor(dataSourceCode, dataItemName, channelNames, startTime, endTime, limit, rangeType) {
         this.dataSourceCode = dataSourceCode;
         this.dataItemName = dataItemName;
         this.channelNames = channelNames;
@@ -18,6 +17,5 @@ export class GetHistoryDataArgs {
         this.endTime = endTime;
         this.limit = limit;
         this.rangeType = rangeType;
-        this.historyDataItems = historyDataItems;
     }
 }

package/config/history-data/get-history-data-args.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"HistoryDataItemArgs":{"__symbolic":"interface"},"GetHistoryDataArgs":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","name":"any"}]},{"__symbolic":"reference","module":"moment","name":"Moment","line":28,"character":28},{"__symbolic":"reference","module":"moment","name":"Moment","line":29,"character":26},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","module":"./historical-curve.time-range","name":"HistoricalCurveTimeRange","line":31,"character":28},{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","name":"any"}]}]}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"GetHistoryDataArgs":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","name":"string"}]},{"__symbolic":"reference","module":"moment","name":"Moment","line":17,"character":28},{"__symbolic":"reference","module":"moment","name":"Moment","line":18,"character":26},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","module":"./historical-curve.time-range","name":"HistoricalCurveTimeRange","line":20,"character":28}]}]}}}}]

package/config/history-data/history-data.model.d.ts

@@ -3,11 +3,5 @@ export declare class HistoryDataModel {
     readonly error: string;
     readonly isUnbind: boolean;
     readonly values: Array<HistoryDataValue>;
-    readonly historyDataItems?: Array<HistoryDataItemModel>;
-    constructor(error: string, isUnbind: boolean, values: Array<HistoryDataValue>, historyDataItems?: Array<HistoryDataItemModel>);
-}
-export declare class HistoryDataItemModel {
-    readonly itemName: string;
-    readonly rows: Array<HistoryDataValue>;
-    constructor(itemName: string, rows: Array<HistoryDataValue>);
+    constructor(error: string, isUnbind: boolean, values: Array<HistoryDataValue>);
 }

package/config/history-data/history-data.model.js

@@ -1,15 +1,7 @@
 export class HistoryDataModel {
-    constructor(error, isUnbind, values, historyDataItems // 新增：多条目独立数据
-    ) {
+    constructor(error, isUnbind, values) {
         this.error = error;
         this.isUnbind = isUnbind;
         this.values = values;
-        this.historyDataItems = historyDataItems;
-    }
-}
-export class HistoryDataItemModel {
-    constructor(itemName, rows) {
-        this.itemName = itemName;
-        this.rows = rows;
     }
 }

package/config/history-data/history-data.model.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"HistoryDataModel":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","name":"boolean"},{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","module":"./history-data-value","name":"HistoryDataValue","line":6,"character":31}]},{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","module":"./history-data-value","name":"HistoryDataValue","line":6,"character":31}]}]}]}},"HistoryDataItemModel":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","module":"./history-data-value","name":"HistoryDataValue","line":6,"character":31}]}]}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"HistoryDataModel":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","name":"boolean"},{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","module":"./history-data-value","name":"HistoryDataValue","line":3,"character":91}]}]}]}}}}]

package/config/history-data/index.d.ts

@@ -1,4 +1,4 @@
 export { HistoryDataStore } from './history-data.store';
-export { HistoryDataModel, HistoryDataItemModel } from './history-data.model';
+export { HistoryDataModel } from './history-data.model';
 export { HistoryDataValue } from './history-data-value';
 export { GetHistoryDataArgs } from './get-history-data-args';

package/config/history-data/index.js

@@ -1,3 +1,3 @@
-export { HistoryDataModel, HistoryDataItemModel } from './history-data.model';
+export { HistoryDataModel } from './history-data.model';
 export { HistoryDataValue } from './history-data-value';
 export { GetHistoryDataArgs } from './get-history-data-args';

package/config/history-data/index.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{},"exports":[{"from":"./history-data.store","export":["HistoryDataStore"]},{"from":"./history-data.model","export":["HistoryDataModel","HistoryDataItemModel"]},{"from":"./history-data-value","export":["HistoryDataValue"]},{"from":"./get-history-data-args","export":["GetHistoryDataArgs"]}]}]
+[{"__symbolic":"module","version":4,"metadata":{},"exports":[{"from":"./history-data.store","export":["HistoryDataStore"]},{"from":"./history-data.model","export":["HistoryDataModel"]},{"from":"./history-data-value","export":["HistoryDataValue"]},{"from":"./get-history-data-args","export":["GetHistoryDataArgs"]}]}]

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

@@ -67,14 +67,8 @@ export declare class HistoricalCurveElement extends ConditionalDisplayElement {
     private updateQueryTimeRange;
     private reRenderElement;
     private renderElement;
-    private handleQueryResult;
     setupTooltipAutoHide(chart: any): void;
     private renderChart;
-    /**
-     * 【新格式】多条目独立数据的曲线渲染
-     * 每个条目独立保持自己的时间戳，不会出现时间戳混乱的问题
-     */
-    private renderChartWithMultiItems;
     initPoint(): void;
     private getLineChart;
     private getMultiBarWithFocusChart;

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

@@ -215,95 +215,30 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
         if (!this.model.dataSetting) {
             return;
         }
+        const dataItemName = this.model.dataSetting.dataName;
         const dataSourceCode = this.model.dataSetting.dataSourceCode;
+        const channelNames = this.model.dataSetting.channels.map(c => c.name);
         this.updateElementStatus(HistoricalCurveElementStatus.Loading);
-        // 【新格式】如果有多条目配置，使用多条目查询
-        if (this.model.dataSetting.dataItems && this.model.dataSetting.dataItems.length > 0) {
-            const historyDataItems = this.model.dataSetting.dataItems.map(item => ({
-                dataItemName: item.dataName,
-                channelNames: item.channels.map(c => c.name)
-            }));
-            // 使用第一个条目的信息作为兼容参数
-            const firstItem = this.model.dataSetting.dataItems[0];
-            const input = new GetHistoryDataArgs(dataSourceCode, firstItem.dataName, firstItem.channels.map(c => c.name), startTime, endTime, limit, rangeType, historyDataItems // 传递多条目参数
-            );
-            this.historyDataStore.getHistoryData(input).subscribe(result => {
-                this.handleQueryResult(result);
-            });
-        }
-        // 【旧格式】单条目模式
-        else {
-            const dataItemName = this.model.dataSetting.dataName;
-            const channelNames = this.model.dataSetting.channels.map(c => c.name);
-            const input = new GetHistoryDataArgs(dataSourceCode, dataItemName, channelNames, startTime, endTime, limit, rangeType);
-            this.historyDataStore.getHistoryData(input).subscribe(result => {
-                this.handleQueryResult(result);
-            });
-        }
-    }
-    handleQueryResult(result) {
-        this.timePeriods = this.getValidTimePeriods();
-        // 【新格式】多条目模式下的错误处理
-        if (result.historyDataItems && result.historyDataItems.length > 0) {
-            // 只要有条目正常返回(即使没有数据),就走正常逻辑
-            // 这样可以确保即使部分条目失败,只要有条目成功返回,就显示正常状态
-            this.clearStatus();
-            if (result.isUnbind) {
-                this.updateElementStatus(HistoricalCurveElementStatus.Unbound);
-            }
-            else {
-                this.updateElementStatus(HistoricalCurveElementStatus.Normal);
-            }
-            // 如果有错误信息,在控制台输出警告
+        const input = new GetHistoryDataArgs(dataSourceCode, dataItemName, channelNames, startTime, endTime, limit, rangeType);
+        this.historyDataStore.getHistoryData(input).subscribe(result => {
             if (result.error) {
-                this.logger.warn(`[历史曲线] 部分条目查询失败: ${result.error}`);
-            }
-            // 检查是否有任何条目有数据
-            const hasAnyData = result.historyDataItems.some(item => item.rows && item.rows.length > 0);
-            if (hasAnyData) {
-                // 有数据,计算所有条目的最小和最大时间，确保时间轴覆盖所有数据
-                let globalMinTime = null;
-                let globalMaxTime = null;
-                result.historyDataItems.forEach(item => {
-                    if (item.rows && item.rows.length > 0) {
-                        const itemMinTime = moment(first(item.rows).time);
-                        const itemMaxTime = moment(last(item.rows).time);
-                        if (!globalMinTime || itemMinTime.isBefore(globalMinTime)) {
-                            globalMinTime = itemMinTime;
-                        }
-                        if (!globalMaxTime || itemMaxTime.isAfter(globalMaxTime)) {
-                            globalMaxTime = itemMaxTime;
-                        }
-                    }
-                });
-                // 设置全局时间范围
-                if (globalMinTime && globalMaxTime) {
-                    this.currentStartTime = globalMinTime;
-                    this.currentEndTime = globalMaxTime;
-                }
-            }
-            // 无论是否有数据,都渲染曲线(没有数据会显示空曲线)
-            this.chartElement = this.renderChartWithMultiItems(result.historyDataItems);
-        }
-        // 【旧格式】单条目模式的错误处理
-        else if (result.error) {
-            this.updateElementStatus(HistoricalCurveElementStatus.LoadFailed, result.error);
-        }
-        else {
-            this.clearStatus();
-            if (result.isUnbind) {
-                this.updateElementStatus(HistoricalCurveElementStatus.Unbound);
+                this.updateElementStatus(HistoricalCurveElementStatus.LoadFailed, result.error);
             }
             else {
-                this.updateElementStatus(HistoricalCurveElementStatus.Normal);
-            }
-            // 【旧格式】单条目数据，使用原有渲染方式
-            if (result.values.length) {
-                this.currentStartTime = moment(first(result.values).time);
-                this.currentEndTime = moment(last(result.values).time);
+                this.clearStatus();
+                if (result.isUnbind) {
+                    this.updateElementStatus(HistoricalCurveElementStatus.Unbound);
+                }
+                else {
+                    this.updateElementStatus(HistoricalCurveElementStatus.Normal);
+                }
+                if (result.values.length) {
+                    this.currentStartTime = moment(first(result.values).time);
+                    this.currentEndTime = moment(last(result.values).time);
+                }
+                this.chartElement = this.renderChart(result.values);
             }
-            this.chartElement = this.renderChart(result.values);
-        }
+        });
     }
     setupTooltipAutoHide(chart) {
         const chartContainer = this.rootElement.select('.nv-focus').node();
@@ -331,58 +266,10 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
         const chartWidth = this.model.displaySetting.size.width;
         const chartHeight = this.model.displaySetting.size.height - this.displayOption.operationAreaHeight - this.displayOption.operationAreaMarginTop;
         const data = new Array();
-        // 【旧格式】单条目模式：只显示通道名
         each(this.model.dataSetting.channels, (channel, key) => {
             const values = new Array();
             each(result, v => values.push({ x: moment(v.time).local().toDate().valueOf(), y: v.values[key] }));
-            const displayName = channel.name;
-            data.push({ key: displayName, area: channel.projectEnabled, values: values });
-        });
-        this.data = data;
-        let chart;
-        if (this.model.displaySetting.curveType === CurveType.BarGroup || this.model.displaySetting.curveType === CurveType.BarStack) {
-            chart = this.getMultiBarWithFocusChart(chartWidth, chartHeight, data);
-        }
-        else {
-            chart = this.getLineChart(chartWidth, chartHeight, data);
-        }
-        // 设置 tooltip 自动隐藏逻辑
-        this.setupTooltipAutoHide(chart);
-        return chart;
-    }
-    /**
-     * 【新格式】多条目独立数据的曲线渲染
-     * 每个条目独立保持自己的时间戳，不会出现时间戳混乱的问题
-     */
-    renderChartWithMultiItems(historyDataItems) {
-        const chartWidth = this.model.displaySetting.size.width;
-        const chartHeight = this.model.displaySetting.size.height - this.displayOption.operationAreaHeight - this.displayOption.operationAreaMarginTop;
-        const data = new Array();
-        // 创建一个 Map 用于快速查找条目数据
-        const itemDataMap = new Map();
-        each(historyDataItems, item => {
-            if (item && item.itemName) {
-                itemDataMap.set(item.itemName, item.rows || []);
-            }
-        });
-        // 判断是否只有一个条目
-        const isSingleItem = this.model.dataSetting.dataItems && this.model.dataSetting.dataItems.length === 1;
-        // 为每个条目的每个通道创建独立的曲线
-        each(this.model.dataSetting.dataItems, (dataItem) => {
-            const itemName = dataItem.dataName;
-            // 通过 itemName 匹配数据，而不是通过索引
-            const itemRows = itemDataMap.get(itemName) || [];
-            each(dataItem.channels, (channel, channelIdx) => {
-                const values = new Array();
-                // 每个条目使用自己的时间戳和数据
-                each(itemRows, row => {
-                    const value = row.values && row.values[channelIdx] !== undefined ? row.values[channelIdx] : null;
-                    values.push({ x: moment(row.time).local().toDate().valueOf(), y: value });
-                });
-                // 只有多个条目时才使用"条目名-通道名"格式，单条目时只显示通道名
-                const displayName = isSingleItem ? channel.name : `${itemName}-${channel.name}`;
-                data.push({ key: displayName, area: channel.projectEnabled, values: values });
-            });
+            data.push({ key: channel.name, area: channel.projectEnabled, values: values });
         });
         this.data = data;
         let chart;
@@ -402,22 +289,8 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
                 .find('.nv-legend')
                 .find('.nv-series');
             let hiddenCount = 0;
-            // 获取所有通道（支持多条目和单条目模式）
-            const allChannels = [];
-            if (this.model.dataSetting.dataItems && this.model.dataSetting.dataItems.length > 0) {
-                // 【新格式】多条目模式：收集所有条目的所有通道
-                each(this.model.dataSetting.dataItems, dataItem => {
-                    each(dataItem.channels, channel => {
-                        allChannels.push(channel);
-                    });
-                });
-            }
-            else {
-                // 【旧格式】单条目模式
-                allChannels.push(...this.model.dataSetting.channels);
-            }
             for (let i = 0; i < this.data.length; i++) {
-                const channel = allChannels[i];
+                const channel = this.model.dataSetting.channels[i];
                 if (legendList.eq(i).children().eq(0).css('fill-opacity') === '1') {
                     const pointList = this.$element
                         .find('.nv-scatterWrap')
@@ -559,21 +432,7 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
         }
         chart.width(chartWidth);
         chart.height(chartHeight);
-        // 获取所有通道的颜色（支持多条目和单条目模式）
-        let channelColors = [];
-        if (this.model.dataSetting.dataItems && this.model.dataSetting.dataItems.length > 0) {
-            // 【新格式】多条目模式：收集所有条目的所有通道颜色
-            each(this.model.dataSetting.dataItems, dataItem => {
-                each(dataItem.channels, channel => {
-                    channelColors.push(channel.connectorColor);
-                });
-            });
-        }
-        else {
-            // 【旧格式】单条目模式
-            channelColors = this.model.dataSetting.channels.map(c => c.connectorColor);
-        }
-        chart.color(channelColors);
+        chart.color(this.model.dataSetting.channels.map(c => c.connectorColor));
         this.rootElement.append('g').datum(data).call(chart);
         this.rootElement.selectAll('.nv-noData').attr('x', chartWidth / 2).attr('y', chartHeight / 2 + this.displayOption.operationAreaHeight);
         this.resizeEventListener = nv.utils.windowResize(() => {

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":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"}],"renderChartWithMultiItems":[{"__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"}],"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

@@ -302,7 +302,7 @@ export class MainElement {
         each(this.elements, e => {
             if (e instanceof HistoricalCurveElement || e instanceof VideoElement
                 || e instanceof WeatherElement || e instanceof NumericalDisplayElement || e instanceof TextElement
-                || e instanceof AirQualityElement || e instanceof ScrollAlarmElement) {
+                || e instanceof AirQualityElement || e instanceof SwitchIndicatorLightElement || e instanceof ScrollAlarmElement) {
                 e.dispose();
             }
         });

package/elements/shared/graph/graph-state-element.d.ts

@@ -24,4 +24,5 @@ export declare class GraphStateElement {
     private removeImageElement;
     private doFaultFlicker;
     private clearFlickerInterval;
+    dispose(): void;
 }

package/elements/shared/graph/graph-state-element.js

@@ -42,12 +42,19 @@ export class GraphStateElement {
         }
     }
     changeGraph(stateId, graphResult) {
+        // 检查元素是否已被销毁
+        if (!this._element) {
+            return;
+        }
         if (!graphResult.failed) {
             const graph = graphResult.graph;
             switch (graph.graphType) {
                 case GraphType.Image:
                 case GraphType.SVG:
                     const imageElement = this.getImageElement();
+                    if (!imageElement) {
+                        return;
+                    }
                     imageElement.setAttributeNS('http://www.w3.org/1999/xlink', 'href', graph.source);
                     this.doFaultFlicker(imageElement, stateId);
                     break;
@@ -63,6 +70,10 @@ export class GraphStateElement {
     }
     getImageElement() {
         if (!this.imageElement) {
+            // 检查 _element 是否已被销毁
+            if (!this._element) {
+                return null;
+            }
             this.imageElement = document.createElementNS('http://www.w3.org/2000/svg', 'image');
             this.imageElement.setAttribute('width', this.width + '');
             this.imageElement.setAttribute('height', this.height + '');
@@ -74,7 +85,7 @@ export class GraphStateElement {
         return this.imageElement;
     }
     removeImageElement() {
-        if (this.imageElement) {
+        if (this.imageElement && this._element) {
             this._element.removeChild(this.imageElement);
             delete this.imageElement;
         }
@@ -107,4 +118,22 @@ export class GraphStateElement {
             }
         }
     }
+    dispose() {
+        // 清理定时器
+        if (this.faultFlickerInterval) {
+            clearInterval(this.faultFlickerInterval);
+            this.faultFlickerInterval = undefined;
+        }
+        // 移除图片元素
+        this.removeImageElement();
+        // 清理图形缓存
+        if (this.graphs) {
+            this.graphs.clear();
+        }
+        // 清理 SVG 元素
+        if (this._element && this._element.parentNode) {
+            this._element.parentNode.removeChild(this._element);
+        }
+        this._element = null;
+    }
 }

package/elements/shared/graph/graph-state-element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"GraphStateElement":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"../../../model","name":"GraphSetting","line":21,"character":47},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","module":"../../../config","name":"GraphStore","line":24,"character":37},{"__symbolic":"reference","module":"../../../logger","name":"LoggerService","line":25,"character":33},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","module":"../../../model/switch-indicator-light/indicator-light-fault-flicker","name":"IndicatorLightFaultFlicker","line":27,"character":41}]}]}],"switchToState":[{"__symbolic":"method"}],"changeGraph":[{"__symbolic":"method"}],"getImageElement":[{"__symbolic":"method"}],"removeImageElement":[{"__symbolic":"method"}],"doFaultFlicker":[{"__symbolic":"method"}],"clearFlickerInterval":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"GraphStateElement":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"../../../model","name":"GraphSetting","line":21,"character":47},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","module":"../../../config","name":"GraphStore","line":24,"character":37},{"__symbolic":"reference","module":"../../../logger","name":"LoggerService","line":25,"character":33},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","module":"../../../model/switch-indicator-light/indicator-light-fault-flicker","name":"IndicatorLightFaultFlicker","line":27,"character":41}]}]}],"switchToState":[{"__symbolic":"method"}],"changeGraph":[{"__symbolic":"method"}],"getImageElement":[{"__symbolic":"method"}],"removeImageElement":[{"__symbolic":"method"}],"doFaultFlicker":[{"__symbolic":"method"}],"clearFlickerInterval":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}]}}}}]

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

@@ -15,6 +15,7 @@ export declare class TextStateElement {
     private readonly textLibraryService?;
     private readonly languageService?;
     private readonly guiContext?;
+    private readonly allowEmpty;
     private textElement;
     private _element;
     get Element(): SVGElement;
@@ -22,7 +23,7 @@ export declare class TextStateElement {
     private faultFlickerInterval;
     private currentStateId;
     private languageChangeSubscription?;
-    constructor(textStates: TextState[], width: number, height: number, logger: LoggerService, version?: number, faultFlickers?: IndicatorLightFaultFlicker[], textLibrarySetting?: TextLibrarySetting, textLibraryService?: TextLibraryService, languageService?: LanguageService, guiContext?: GuiContext);
+    constructor(textStates: TextState[], width: number, height: number, logger: LoggerService, version?: number, faultFlickers?: IndicatorLightFaultFlicker[], textLibrarySetting?: TextLibrarySetting, textLibraryService?: TextLibraryService, languageService?: LanguageService, guiContext?: GuiContext, allowEmpty?: boolean);
     switchToState(stateId: number): void;
     /**
      * 订阅语种变化事件
@@ -40,6 +41,7 @@ export declare class TextStateElement {
     /**
      * 获取显示文本
      * 如果配置了文本库，则根据状态ID和当前语种ID从文本库中获取对应语种的文本
+     * 如果是多语种自定义文本，则根据当前语种ID获取对应语种的文本
      * 否则返回默认文本
      */
     private getDisplayText;

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

@@ -1,6 +1,6 @@
 import { Flicker } from '../../../model';
 export class TextStateElement {
-    constructor(textStates, width, height, logger, version, faultFlickers, textLibrarySetting, textLibraryService, languageService, guiContext) {
+    constructor(textStates, width, height, logger, version, faultFlickers, textLibrarySetting, textLibraryService, languageService, guiContext, allowEmpty = false) {
         this.textStates = textStates;
         this.width = width;
         this.height = height;
@@ -11,6 +11,7 @@ export class TextStateElement {
         this.textLibraryService = textLibraryService;
         this.languageService = languageService;
         this.guiContext = guiContext;
+        this.allowEmpty = allowEmpty;
         this.faultFlickerStatus = false;
         this.faultFlickerInterval = undefined;
         this._element = document.createElementNS('http://www.w3.org/2000/svg', 'g');
@@ -79,10 +80,6 @@ export class TextStateElement {
      * 当设备的语种ID改变时，重新渲染当前状态的文本
      */
     subscribeLanguageChange() {
-        // 只有使用文本库时才需要订阅语种变化
-        if (!this.textLibrarySetting || this.textLibrarySetting.labelType !== 'textLibrary') {
-            return;
-        }
         if (this.guiContext && this.guiContext.languageChanged$) {
             this.languageChangeSubscription = this.guiContext.languageChanged$.subscribe(() => {
                 // 如果当前有状态，重新渲染
@@ -156,10 +153,11 @@ export class TextStateElement {
     /**
      * 获取显示文本
      * 如果配置了文本库，则根据状态ID和当前语种ID从文本库中获取对应语种的文本
+     * 如果是多语种自定义文本，则根据当前语种ID获取对应语种的文本
      * 否则返回默认文本
      */
     getDisplayText(stateId, defaultContent) {
-        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.textLibrarySetting && this.textLibrarySetting.labelType === 'textLibrary') {
             const textLibraryId = this.textLibrarySetting.selectedTextLibraryItem;
@@ -200,12 +198,59 @@ export class TextStateElement {
                             return '';
                         }
                     }
+                    // 文本库中未找到对应的状态ID（可能是"其他"状态）
+                    // 继续检查 defaultContent 中是否有多语种数据
+                }
+            }
+            // 文本库模式下，如果文本库中没有找到数据，继续尝试从 defaultContent 获取
+            // 这样可以支持"其他"状态的多语种显示
+        }
+        // 处理自定义文本（支持多语种）
+        if (defaultContent) {
+            // 检查是否为多语种格式
+            if (typeof defaultContent === 'object' && defaultContent.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;
+                    }
+                }
+                // 返回对应语种的文本
+                // 如果没有对应语种的内容：
+                // - allowEmpty=true（开关指示灯）：返回空字符串
+                // - allowEmpty=false（文本元件）：返回默认文本
+                if (defaultContent.cultures[targetLanguage]) {
+                    return defaultContent.cultures[targetLanguage];
                 }
+                else if (this.allowEmpty) {
+                    return '';
+                }
+                else {
+                    // 获取当前语言环境，显示默认文本
+                    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 isChinese ? '文本' : 'Text';
+                }
+            }
+            else if (typeof defaultContent === 'string') {
+                // 旧格式：字符串
+                return defaultContent;
             }
-            // 文本库配置但未找到数据，返回空字符串
-            return '';
         }
-        // 默认返回文本内容
-        return defaultContent || '';
+        return '';
     }
 }

package/elements/shared/text/text-state-element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"TextStateElement":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","module":"./text-state.model","name":"TextState","line":23,"character":45}]},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","module":"../../../logger","name":"LoggerService","line":26,"character":33},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","module":"../../../model/switch-indicator-light/indicator-light-fault-flicker","name":"IndicatorLightFaultFlicker","line":28,"character":41}]},{"__symbolic":"reference","module":"../../../model/base/font-setting-model","name":"TextLibrarySetting","line":29,"character":46},{"__symbolic":"reference","module":"../../../service","name":"TextLibraryService","line":30,"character":46},{"__symbolic":"reference","module":"../../../service","name":"LanguageService","line":31,"character":43},{"__symbolic":"reference","module":"../../../gui/gui-context","name":"GuiContext","line":32,"character":38}]}],"switchToState":[{"__symbolic":"method"}],"subscribeLanguageChange":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}],"getforeignObjectElement":[{"__symbolic":"method"}],"removeForeignObjectlement":[{"__symbolic":"method"}],"doFaultFlicker":[{"__symbolic":"method"}],"clearFlickerInterval":[{"__symbolic":"method"}],"getDisplayText":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"TextStateElement":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","module":"./text-state.model","name":"TextState","line":23,"character":45}]},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","module":"../../../logger","name":"LoggerService","line":26,"character":33},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","module":"../../../model/switch-indicator-light/indicator-light-fault-flicker","name":"IndicatorLightFaultFlicker","line":28,"character":41}]},{"__symbolic":"reference","module":"../../../model/base/font-setting-model","name":"TextLibrarySetting","line":29,"character":46},{"__symbolic":"reference","module":"../../../service","name":"TextLibraryService","line":30,"character":46},{"__symbolic":"reference","module":"../../../service","name":"LanguageService","line":31,"character":43},{"__symbolic":"reference","module":"../../../gui/gui-context","name":"GuiContext","line":32,"character":38},{"__symbolic":"reference","name":"boolean"}]}],"switchToState":[{"__symbolic":"method"}],"subscribeLanguageChange":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}],"getforeignObjectElement":[{"__symbolic":"method"}],"removeForeignObjectlement":[{"__symbolic":"method"}],"doFaultFlicker":[{"__symbolic":"method"}],"clearFlickerInterval":[{"__symbolic":"method"}],"getDisplayText":[{"__symbolic":"method"}]}}}}]