@flexem/fc-gui 3.0.0-alpha.62 → 3.0.0-alpha.63

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

@@ -2,14 +2,12 @@ import { Observable } from 'rxjs';
 import { VariableValue } from './variable-value';
 import { VariableState } from './variable-state';
 export interface VariableCommunicator {
-    historyAlarmChanged: any;
     openVariable(variableName: string, appId: string): Observable<VariableValue>;
     openVariables(variableNames: Array<string>, appId: string): Observable<Array<VariableValue>>;
     write(variableName: string, value: any): Observable<VariableValue>;
     writeWordByBit(variableName: string, index: number, value: number): Observable<VariableValue>;
     subscribeVariableState(variableName: string): Observable<VariableState>;
     subscribeVariableStates(variableNames: Array<string>): Observable<Array<VariableState>>;
-    subscribeUserDeviceAlarms(appId: string): Observable<any>;
-    unSubscribeUserDeviceAlarms(appId: string): any;
+    subscribeUserDeviceAlarms(appId: string): any;
     dispose(): any;
 }

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

@@ -23,7 +23,6 @@ export declare class AlarmElement extends ConditionalDisplayElement {
     private totalCount;
     private pageSize;
     constructor(element: HTMLElement, injector: Injector, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, alarmsStore: AlarmsStore, signalRAppId: string);
-    ngOnDestroy(): void;
     dispose(): void;
     private getValidTimePeriods;
     private init;

package/elements/alarm/alarm-element.js

@@ -81,11 +81,6 @@ export class AlarmElement extends ConditionalDisplayElement {
         }
         this.init();
     }
-    ngOnDestroy() {
-        if (!this.model.filterSetting.alarmType) {
-            this.variableCommunicator.unSubscribeUserDeviceAlarms(this.signalRAppId);
-        }
-    }
     dispose() {
         clearInterval(this.refreshIntervalId);
         if (this.element) {
@@ -221,7 +216,7 @@ export class AlarmElement extends ConditionalDisplayElement {
         }
         this.element.appendChild(table);
         this.$element.append(this.element);
-        this.renderOperationArea(this.model.size.width, elementHeight);
+        this.renderOperationArea(this.model.size.width, elementHeight - 39);
     }
     renderOperationArea(chartWidth, chartHeight) {
         const operationArea = this.rootElement.append('g').attr('transform', `translate(0,${chartHeight + this.displayOption.operationAreaMarginTop})`)

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

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"AlarmElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-display-element","name":"ConditionalDisplayElement","line":17,"character":34},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":48,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":49,"character":18},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":50,"character":27},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":51,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":52,"character":23},{"__symbolic":"reference","module":"../../config","name":"AlarmsStore","line":53,"character":38},{"__symbolic":"reference","name":"string"}]}],"ngOnDestroy":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}],"getValidTimePeriods":[{"__symbolic":"method"}],"init":[{"__symbolic":"method"}],"renderElement":[{"__symbolic":"method"}],"renderOperationArea":[{"__symbolic":"method"}],"updateTimeRange":[{"__symbolic":"method"}],"updateQueryTimeRange":[{"__symbolic":"method"}],"loadFirstPage":[{"__symbolic":"method"}],"loadNextPage":[{"__symbolic":"method"}],"loadPreviousPage":[{"__symbolic":"method"}],"loadLastPage":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"AlarmElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-display-element","name":"ConditionalDisplayElement","line":17,"character":34},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":48,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":49,"character":18},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":50,"character":27},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":51,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":52,"character":23},{"__symbolic":"reference","module":"../../config","name":"AlarmsStore","line":53,"character":38},{"__symbolic":"reference","name":"string"}]}],"dispose":[{"__symbolic":"method"}],"getValidTimePeriods":[{"__symbolic":"method"}],"init":[{"__symbolic":"method"}],"renderElement":[{"__symbolic":"method"}],"renderOperationArea":[{"__symbolic":"method"}],"updateTimeRange":[{"__symbolic":"method"}],"updateQueryTimeRange":[{"__symbolic":"method"}],"loadFirstPage":[{"__symbolic":"method"}],"loadNextPage":[{"__symbolic":"method"}],"loadPreviousPage":[{"__symbolic":"method"}],"loadLastPage":[{"__symbolic":"method"}]}}}}]

package/elements/per-view-variable-communicator.d.ts

@@ -6,7 +6,7 @@ export declare class PerViewVariableCommunicator implements VariableCommunicator
     private observers;
     private variableValuesChangedSubscriptions;
     private variableStatesChangedSubscription;
-    historyAlarmChanged: any;
+    private alarmSubscription;
     constructor(variableCommunicator: VariableCommunicator);
     openVariable(variableName: string, appId: string): Observable<VariableValue>;
     openVariables(variableNames: Array<string>, appId?: string): Observable<Array<VariableValue>>;
@@ -14,7 +14,6 @@ export declare class PerViewVariableCommunicator implements VariableCommunicator
     writeWordByBit(variableName: string, index: number, value: number): Observable<VariableValue>;
     subscribeVariableState(variableName: string): Observable<VariableState>;
     subscribeVariableStates(variableNames: string[]): Observable<Array<VariableState>>;
-    subscribeUserDeviceAlarms(appId?: string): Observable<any>;
-    unSubscribeUserDeviceAlarms(appId?: string): void;
+    subscribeUserDeviceAlarms(appId?: string): Observable<VariableState[]>;
     dispose(): void;
 }

package/elements/per-view-variable-communicator.js

@@ -6,8 +6,8 @@ export class PerViewVariableCommunicator {
         this.observers = new Map();
         this.variableValuesChangedSubscriptions = new Array();
         this.variableStatesChangedSubscription = new Array();
+        this.alarmSubscription = new Array();
         this._rawVariableCommunicator = variableCommunicator;
-        this.historyAlarmChanged = variableCommunicator.historyAlarmChanged;
     }
     openVariable(variableName, appId) {
         return this.openVariables([variableName], appId).pipe(map(values => values[0]));
@@ -40,14 +40,14 @@ export class PerViewVariableCommunicator {
         });
     }
     subscribeUserDeviceAlarms(appId = '') {
-        this._rawVariableCommunicator.subscribeUserDeviceAlarms(appId);
-        return this._rawVariableCommunicator.historyAlarmChanged;
-    }
-    unSubscribeUserDeviceAlarms(appId = '') {
-        this._rawVariableCommunicator.unSubscribeUserDeviceAlarms(appId);
+        return new Observable(subscriber => {
+            const subscription = this._rawVariableCommunicator.subscribeUserDeviceAlarms(appId).subscribe(values => subscriber.next(values), error => subscriber.error(error), () => subscriber.complete());
+            this.alarmSubscription.push(subscription);
+        });
     }
     dispose() {
         forEach(this.variableValuesChangedSubscriptions, s => s.unsubscribe());
         forEach(this.variableStatesChangedSubscription, s => s.unsubscribe());
+        forEach(this.alarmSubscription, s => s.unsubscribe());
     }
 }

package/elements/per-view-variable-communicator.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"PerViewVariableCommunicator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"../communication","name":"VariableCommunicator","line":16,"character":38}]}],"openVariable":[{"__symbolic":"method"}],"openVariables":[{"__symbolic":"method"}],"write":[{"__symbolic":"method"}],"writeWordByBit":[{"__symbolic":"method"}],"subscribeVariableState":[{"__symbolic":"method"}],"subscribeVariableStates":[{"__symbolic":"method"}],"subscribeUserDeviceAlarms":[{"__symbolic":"method"}],"unSubscribeUserDeviceAlarms":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"PerViewVariableCommunicator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"../communication","name":"VariableCommunicator","line":15,"character":38}]}],"openVariable":[{"__symbolic":"method"}],"openVariables":[{"__symbolic":"method"}],"write":[{"__symbolic":"method"}],"writeWordByBit":[{"__symbolic":"method"}],"subscribeVariableState":[{"__symbolic":"method"}],"subscribeVariableStates":[{"__symbolic":"method"}],"subscribeUserDeviceAlarms":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}]}}}}]

package/package.json

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

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

@@ -17,8 +17,10 @@ export declare class RemoteVariableCommunicator implements VariableCommunicator
     private variableStateCache;
     private variableStatesToBeOpened;
     private variableStatesToBeClosed;
-    historyAlarmChanged: any;
+    private alarmObservers;
+    private alarmChangedSubscription;
     constructor(remoteVariableProtocol: RemoteVariableProtocol, logger: LoggerService);
+    private doAlarmChanged;
     private doVariableValuesChanged;
     private doVariableStatesChanged;
     subscribeVariableStates(variableNames: string[]): Observable<VariableState[]>;
@@ -27,7 +29,6 @@ export declare class RemoteVariableCommunicator implements VariableCommunicator
     openVariable(variableName: string, appId?: string): Observable<VariableValue>;
     write(variableName: string, value: any): Observable<VariableValue>;
     writeWordByBit(variableName: string, index: number, value: number): Observable<VariableValue>;
-    subscribeUserDeviceAlarms(appId?: string): Observable<any>;
-    unSubscribeUserDeviceAlarms(appId?: string): void;
+    subscribeUserDeviceAlarms(appId?: string): Observable<any[]>;
     dispose(): void;
 }

package/remote/communication/variable/remote-variable-communicator.js

@@ -10,7 +10,7 @@ export class RemoteVariableCommunicator {
         this.appIdVariablesMap = new Map();
         this.variableStateObservers = new Map();
         this.variableStateCache = new Map();
-        this.historyAlarmChanged = remoteVariableProtocol.historyAlarmChanged;
+        this.alarmObservers = [];
         this.variableValueCache = new StringifyingMap(k => JSON.stringify(k));
         this.connectedSubscription = this.remoteVariableProtocol.connected.subscribe(() => {
             const variableNamesToStart = [];
@@ -24,6 +24,17 @@ export class RemoteVariableCommunicator {
         });
         this.doVariableStatesChanged();
         this.doVariableValuesChanged();
+        this.doAlarmChanged();
+    }
+    doAlarmChanged() {
+        if (this.alarmChangedSubscription !== undefined) {
+            this.alarmChangedSubscription.unsubscribe();
+        }
+        this.alarmChangedSubscription = this.remoteVariableProtocol.historyAlarmChanged.subscribe((alarmWithAppId) => {
+            each(this.alarmObservers, ob => {
+                ob.next(alarmWithAppId);
+            });
+        });
     }
     doVariableValuesChanged() {
         if (this.variableValuesChangedSubscription !== undefined) {
@@ -205,17 +216,20 @@ export class RemoteVariableCommunicator {
         });
     }
     subscribeUserDeviceAlarms(appId = '') {
-        this.remoteVariableProtocol.subscribeUserDeviceAlarms(appId);
-        return this.remoteVariableProtocol.historyAlarmChanged;
-    }
-    unSubscribeUserDeviceAlarms(appId = '') {
-        this.remoteVariableProtocol.unSubscribeUserDeviceAlarms(appId);
+        return new Observable(observer => {
+            this.alarmObservers.push(observer);
+            this.remoteVariableProtocol.subscribeUserDeviceAlarms(appId);
+            return () => {
+                this.remoteVariableProtocol.unSubscribeUserDeviceAlarms(appId);
+            };
+        });
     }
     dispose() {
         // TODO调用所有的ob.complete()。
         this.connectedSubscription.unsubscribe();
         this.variableStatesChangedSubscription.unsubscribe();
         this.variableValuesChangedSubscription.unsubscribe();
+        this.alarmChangedSubscription.unsubscribe();
         if (this.logger && this.logger.isDebugEnabled()) {
             this.logger.debug('[VariableCommunicator] RemoteVariableCommunicator disposed.');
         }

package/remote/communication/variable/remote-variable-communicator.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"RemoteVariableCommunicator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"./remote-variable-protocol","name":"RemoteVariableProtocol","line":26,"character":57},{"__symbolic":"reference","module":"../../../logger","name":"LoggerService","line":26,"character":106}]}],"doVariableValuesChanged":[{"__symbolic":"method"}],"doVariableStatesChanged":[{"__symbolic":"method"}],"subscribeVariableStates":[{"__symbolic":"method"}],"subscribeVariableState":[{"__symbolic":"method"}],"openVariables":[{"__symbolic":"method"}],"openVariable":[{"__symbolic":"method"}],"write":[{"__symbolic":"method"}],"writeWordByBit":[{"__symbolic":"method"}],"subscribeUserDeviceAlarms":[{"__symbolic":"method"}],"unSubscribeUserDeviceAlarms":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"RemoteVariableCommunicator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"./remote-variable-protocol","name":"RemoteVariableProtocol","line":27,"character":57},{"__symbolic":"reference","module":"../../../logger","name":"LoggerService","line":27,"character":106}]}],"doAlarmChanged":[{"__symbolic":"method"}],"doVariableValuesChanged":[{"__symbolic":"method"}],"doVariableStatesChanged":[{"__symbolic":"method"}],"subscribeVariableStates":[{"__symbolic":"method"}],"subscribeVariableState":[{"__symbolic":"method"}],"openVariables":[{"__symbolic":"method"}],"openVariable":[{"__symbolic":"method"}],"write":[{"__symbolic":"method"}],"writeWordByBit":[{"__symbolic":"method"}],"subscribeUserDeviceAlarms":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}]}}}}]

package/remote/communication/variable/remote-variable-protocol.d.ts

@@ -11,6 +11,6 @@ export interface RemoteVariableProtocol {
     writeVariableWordByBit(variableName: string, index: number, value: number): Observable<void>;
     subscribeVariableStates(variableNames: string[]): Observable<void>;
     unsubscribeVariableStates(variableNames: string[]): Observable<void>;
-    subscribeUserDeviceAlarms(appId: string): Observable<void>;
-    unSubscribeUserDeviceAlarms(appId: string): Observable<void>;
+    subscribeUserDeviceAlarms(appId: string): any;
+    unSubscribeUserDeviceAlarms(appId: string): any;
 }