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

package/elements/main-element.js

@@ -29,7 +29,6 @@ import { VideoElement } from './video/video-element';
 import { WeatherElement } from './weather/weater-element';
 import { AirQualityElement } from './air-quality/air-quality-element';
 import { AlarmElement } from './alarm/alarm-element';
-import { ScrollAlarmElement } from './scroll-alarm/scroll-alarm-element';
 export class MainElement {
     constructor(injector, bsModalService, context, variableCommunicator, popupViewService, signalRAppId) {
         this.injector = injector;
@@ -134,9 +133,6 @@ export class MainElement {
                 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));
                     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));
-                    break;
             }
         });
         this.initBackground();
@@ -302,7 +298,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.dispose();
             }
         });

package/elements/main-element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"MainElement":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":56,"character":43},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":57,"character":41},{"__symbolic":"reference","module":"../gui/gui-context","name":"GuiContext","line":58,"character":34},{"__symbolic":"reference","module":"../communication","name":"VariableCommunicator","line":59,"character":47},{"__symbolic":"reference","module":"../view/popup-view.service","name":"PopupViewService","line":60,"character":43},null]}],"load":[{"__symbolic":"method"}],"uniformStretch":[{"__symbolic":"method"}],"changeVideoStyle":[{"__symbolic":"method"}],"horizontalStretch":[{"__symbolic":"method"}],"initElementState":[{"__symbolic":"method"}],"getVariableNames":[{"__symbolic":"method"}],"reportVariableStates":[{"__symbolic":"method"}],"getVirtualDeviceIdFromRect":[{"__symbolic":"method"}],"reportVariableValues":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}],"checkIsLoaded":[{"__symbolic":"method"}],"initBackground":[{"__symbolic":"method"}],"getImageEl":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"MainElement":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":55,"character":43},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":56,"character":41},{"__symbolic":"reference","module":"../gui/gui-context","name":"GuiContext","line":57,"character":34},{"__symbolic":"reference","module":"../communication","name":"VariableCommunicator","line":58,"character":47},{"__symbolic":"reference","module":"../view/popup-view.service","name":"PopupViewService","line":59,"character":43},null]}],"load":[{"__symbolic":"method"}],"uniformStretch":[{"__symbolic":"method"}],"changeVideoStyle":[{"__symbolic":"method"}],"horizontalStretch":[{"__symbolic":"method"}],"initElementState":[{"__symbolic":"method"}],"getVariableNames":[{"__symbolic":"method"}],"reportVariableStates":[{"__symbolic":"method"}],"getVirtualDeviceIdFromRect":[{"__symbolic":"method"}],"reportVariableValues":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}],"checkIsLoaded":[{"__symbolic":"method"}],"initBackground":[{"__symbolic":"method"}],"getImageEl":[{"__symbolic":"method"}]}}}}]

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/switch-indicator-light/switch-indicator-light-element.d.ts

@@ -24,6 +24,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);
     handleMouseUp(): void;
     private initOnDocMouseUpEvent;
@@ -36,4 +37,5 @@ export declare class SwitchIndicatorLightElement extends ConditionalEnableElemen
     private switchToState;
     private initGraphAndText;
     private checkState;
+    dispose(): void;
 }

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

@@ -208,7 +208,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);
@@ -249,4 +249,28 @@ export class SwitchIndicatorLightElement extends ConditionalEnableElement {
             throw new Error('The switch indicator light\'s states must greater than 2.');
         }
     }
+    dispose() {
+        // 清理 document 级别的事件监听器
+        if (this.onDocMouseUp) {
+            document.removeEventListener(this.isMobileMode ? 'touchend' : 'mouseup', this.onDocMouseUp);
+        }
+        // 清理定时器
+        if (this.restorationTimer) {
+            clearTimeout(this.restorationTimer);
+            this.restorationTimer = undefined;
+        }
+        // 清理 indicatorLightOperator 订阅
+        if (this.indicatorLightSubscription) {
+            this.indicatorLightSubscription.unsubscribe();
+        }
+        // 清理图形元素（释放 SVG 内存）
+        if (this.graphStateElement) {
+            this.graphStateElement.dispose();
+        }
+        // 清理文本元素
+        if (this.textStateElement) {
+            // TextStateElement 可能也需要 dispose，暂时先清理引用
+            this.textStateElement = null;
+        }
+    }
 }

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

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

package/package.json

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

package/shared/gui-consts.d.ts

@@ -28,6 +28,5 @@ export declare class GuiConsts {
         weatherKey: string;
         airQualityKey: string;
         alarmKey: string;
-        scrollAlarmKey: string;
     };
 }

package/shared/gui-consts.js

@@ -28,6 +28,5 @@ GuiConsts.components = {
     tableKey: 'Table',
     weatherKey: 'Weather',
     airQualityKey: 'AirQualityIndex',
-    alarmKey: 'Alarm',
-    scrollAlarmKey: 'ScrollAlarm'
+    alarmKey: 'Alarm'
 };

package/shared/gui-consts.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"GuiConsts":{"__symbolic":"class","statics":{"components":{"imageKey":"Image","numericalDisplayKey":"NumericalDisplay","textKey":"Text","hyperlinkKey":"Hyperlink","meterKey":"Meter","pipeKey":"Pipe","switchIndicatorLightKey":"SwitchIndicatorLight","barGraphKey":"BarGraph","toggleViewKey":"ToggleView","characterKey":"Character","straightLineKey":"StraightLine","polyLineKey":"PolyLine","rectangleKey":"Rectangle","sectorkey":"Sector","ellipseKey":"Ellipse","datetimeDisplayKey":"DatetimeDisplay","historicalCurveKey":"HistoricalCurve","ringGraphKey":"RingGraph","viewOperationElement":"ViewOperation","polygonKey":"Polygon","videokey":"Video","tableKey":"Table","weatherKey":"Weather","airQualityKey":"AirQualityIndex","alarmKey":"Alarm","scrollAlarmKey":"ScrollAlarm"}}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"GuiConsts":{"__symbolic":"class","statics":{"components":{"imageKey":"Image","numericalDisplayKey":"NumericalDisplay","textKey":"Text","hyperlinkKey":"Hyperlink","meterKey":"Meter","pipeKey":"Pipe","switchIndicatorLightKey":"SwitchIndicatorLight","barGraphKey":"BarGraph","toggleViewKey":"ToggleView","characterKey":"Character","straightLineKey":"StraightLine","polyLineKey":"PolyLine","rectangleKey":"Rectangle","sectorkey":"Sector","ellipseKey":"Ellipse","datetimeDisplayKey":"DatetimeDisplay","historicalCurveKey":"HistoricalCurve","ringGraphKey":"RingGraph","viewOperationElement":"ViewOperation","polygonKey":"Polygon","videokey":"Video","tableKey":"Table","weatherKey":"Weather","airQualityKey":"AirQualityIndex","alarmKey":"Alarm"}}}}}]

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

@@ -1,50 +0,0 @@
-import { Injector } from '@angular/core';
-import { PermissionChecker } from '../../service';
-import { VariableCommunicator } from '../../communication';
-import { ConditionalDynamicDisplayElement } from '../base/conditional-dynamic-display-element';
-import { ScrollAlarmModel } from '../../model/scroll-alarm/scroll-alarm.model';
-import { AlarmsStore, VariableStore } from '../../config';
-export declare class ScrollAlarmElement extends ConditionalDynamicDisplayElement {
-    private readonly alarmsStore;
-    readonly model: ScrollAlarmModel;
-    private readonly logger;
-    readonly variableCommunicator: VariableCommunicator;
-    private elementStatus;
-    private element;
-    private scrollIntervalId;
-    private alarmNames;
-    private startTime;
-    private endTime;
-    private getAlarmDataId;
-    private isScrolling;
-    private isDisposed;
-    private currentPage;
-    private maxResultCount;
-    private displayedItems;
-    private pageWidths;
-    private totalWidth;
-    private container;
-    private allAlarmsContainer;
-    private currentLeft;
-    private autoCycle;
-    private hasMoreData;
-    private isLoadingNextPage;
-    private headerFont;
-    private fontString;
-    constructor(element: HTMLElement, injector: Injector, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, alarmsStore: AlarmsStore, signalRAppId: string);
-    dispose(): void;
-    private getAlarmData;
-    private initDisplayContainer;
-    private renderNewPage;
-    private removeOldestPage;
-    private resetToFirstPage;
-    private scrollContent;
-    private initScrolling;
-    private pauseScroll;
-    private resumeScroll;
-    private updateQueryTimeRange;
-    private setStatusAsNormal;
-    private setStatusAsLoading;
-    private renderStatus;
-    private clearStatus;
-}