@flexem/fc-gui 3.0.0-alpha.127 → 3.0.0-alpha.129

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

@@ -3,5 +3,11 @@ export declare class HistoryDataModel {
     readonly error: string;
     readonly isUnbind: boolean;
     readonly values: Array<HistoryDataValue>;
-    constructor(error: string, isUnbind: boolean, 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>);
 }

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

@@ -1,7 +1,15 @@
 export class HistoryDataModel {
-    constructor(error, isUnbind, values) {
+    constructor(error, isUnbind, values, historyDataItems // 新增：多条目独立数据
+    ) {
         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":3,"character":91}]}]}]}}}}]
+[{"__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}]}]}]}}}}]

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

@@ -1,4 +1,4 @@
 export { HistoryDataStore } from './history-data.store';
-export { HistoryDataModel } from './history-data.model';
+export { HistoryDataModel, HistoryDataItemModel } 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 } from './history-data.model';
+export { HistoryDataModel, HistoryDataItemModel } 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"]},{"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","HistoryDataItemModel"]},{"from":"./history-data-value","export":["HistoryDataValue"]},{"from":"./get-history-data-args","export":["GetHistoryDataArgs"]}]}]

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

@@ -13,7 +13,7 @@ export declare class AlarmElement extends ConditionalDisplayElement {
     readonly model: AlarmModel;
     private readonly logger;
     readonly variableCommunicator: VariableCommunicator;
-    private readonly timePeriods;
+    private timePeriods;
     private languageChangeSubscription?;
     private elementStatus;
     private element;

package/elements/alarm/alarm-element.js

@@ -41,7 +41,6 @@ export class AlarmElement extends ConditionalDisplayElement {
         this.setStatusAsLoading();
         this.logger = injector.get(LOGGER_SERVICE_TOKEN);
         this.variableCommunicator = variableCommunicator;
-        this.timePeriods = this.getValidTimePeriods();
         this.pageSize = this.model.generalSetting.pageSize;
         localStorage.setItem('simulate-time', moment().valueOf() + '');
         // 订阅语种变化事件
@@ -113,6 +112,7 @@ export class AlarmElement extends ConditionalDisplayElement {
             if (!selectElement.empty()) {
                 // 重新生成时间段数据
                 const updatedTimePeriods = this.getValidTimePeriods();
+                this.timePeriods = updatedTimePeriods;
                 // 更新选项文本
                 const options = selectElement.selectAll('option');
                 options.each(function (_d, i) {
@@ -203,6 +203,7 @@ export class AlarmElement extends ConditionalDisplayElement {
         this.setStatusAsLoading();
         clearTimeout(this.getAlarmDataId);
         this.getAlarmDataId = setTimeout(() => {
+            this.timePeriods = this.getValidTimePeriods();
             if (this.model.filterSetting.alarmType) {
                 this.updateQueryTimeRange();
                 const input = new GetAlarmsArgs(this.alarmNames, this.startTime, this.endTime, this.pageSize, this.page * this.pageSize);

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

@@ -13,7 +13,7 @@ export declare class HistoricalCurveElement extends ConditionalDisplayElement {
     readonly model: HistoricalCurveModel;
     private readonly logger;
     private readonly localization;
-    private readonly timePeriods;
+    private timePeriods;
     private languageChangeSubscription?;
     private readonly displayOption;
     /**
@@ -70,6 +70,11 @@ export declare class HistoricalCurveElement extends ConditionalDisplayElement {
     private handleQueryResult;
     setupTooltipAutoHide(chart: any): void;
     private renderChart;
+    /**
+     * 【新格式】多条目独立数据的曲线渲染
+     * 每个条目独立保持自己的时间戳，不会出现时间戳混乱的问题
+     */
+    private renderChartWithMultiItems;
     initPoint(): void;
     private getLineChart;
     private getMultiBarWithFocusChart;

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

@@ -41,7 +41,6 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
         };
         this.logger = injector.get(LOGGER_SERVICE_TOKEN);
         this.localization = injector.get(LOCALIZATION);
-        this.timePeriods = this.getValidTimePeriods();
         this.updateTimeRange(this.model.displaySetting.displayTimePeriod);
         this.refreshIntervalId = setInterval(() => {
             this.loadFirstPage();
@@ -108,6 +107,7 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
         if (!selectElement.empty()) {
             // 重新生成时间段数据
             const updatedTimePeriods = this.getValidTimePeriods();
+            this.timePeriods = updatedTimePeriods;
             // 更新选项文本
             const options = selectElement.selectAll('option');
             options.each(function (_d, i) {
@@ -232,7 +232,51 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
         }
     }
     handleQueryResult(result) {
-        if (result.error) {
+        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);
+            }
+            // 如果有错误信息,在控制台输出警告
+            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 {
@@ -243,6 +287,7 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
             else {
                 this.updateElementStatus(HistoricalCurveElementStatus.Normal);
             }
+            // 【旧格式】单条目数据，使用原有渲染方式
             if (result.values.length) {
                 this.currentStartTime = moment(first(result.values).time);
                 this.currentEndTime = moment(last(result.values).time);
@@ -276,31 +321,61 @@ 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();
-        // 【新格式】多条目模式：曲线名称使用"条目名-通道名"格式
-        if (this.model.dataSetting.dataItems && this.model.dataSetting.dataItems.length > 0) {
-            let channelIndex = 0;
-            each(this.model.dataSetting.dataItems, dataItem => {
-                each(dataItem.channels, channel => {
-                    const values = new Array();
-                    each(result, v => values.push({ x: moment(v.time).local().toDate().valueOf(), y: v.values[channelIndex] }));
-                    // 使用"条目名-通道名"格式
-                    const displayName = `${dataItem.dataName}-${channel.name}`;
-                    data.push({ key: displayName, area: channel.projectEnabled, values: values });
-                    channelIndex++;
-                });
-            });
-        }
-        // 【旧格式】单条目模式：同样使用"条目名-通道名"格式
-        else {
-            const dataItemName = this.model.dataSetting.dataName;
-            each(this.model.dataSetting.channels, (channel, key) => {
+        // 【旧格式】单条目模式：只显示通道名
+        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;
+        nv.addGraph(() => {
+            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(result, v => values.push({ x: moment(v.time).local().toDate().valueOf(), y: v.values[key] }));
-                // 使用"条目名-通道名"格式
-                const displayName = `${dataItemName}-${channel.name}`;
+                // 每个条目使用自己的时间戳和数据
+                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 });
             });
-        }
+        });
         this.data = data;
         nv.addGraph(() => {
             let chart;

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"}],"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"}],"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"}]}}}}]

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

@@ -213,6 +213,14 @@ export class NumericalDisplayElement extends ReadableElement {
                 this.recordValue = result.value;
                 const writeValue = this.dataTypeService.formatToDecimal(this.model.version, result.value, this.model.dataType);
                 this.showValue = result.showValue;
+                // 如果是系统变量"当前语种ID"，只更新显示，不执行变量写入和操作记录
+                if (this.writeVariableName === '当前语种ID') {
+                    // 直接更新显示值
+                    this.displayText = this.showValue;
+                    this.updateDisplayText(this.formatDisplayTextUnit(this.displayText));
+                    this.writeValueMmodalRef.hide();
+                    return;
+                }
                 if (this.displayText !== this.showValue || result.variableRwType === variableRwTypeEnum.witer) {
                     if (this.numericalOperation || result.enableNumericalOperation || result.isNumericalOperation || result.variableRwType === variableRwTypeEnum.witer) {
                         this.recordOperation(result.value);

package/package.json

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