@flexem/fc-gui 3.0.0-alpha.70 → 3.0.0-alpha.72

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

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

package/elements/alarm/alarm-element.js

@@ -4,8 +4,6 @@ import { GetAlarmsArgs } from '../../config';
 import * as moment from 'moment';
 import { LOGGER_SERVICE_TOKEN } from '../../logger';
 import { LOCALIZATION } from '../../localization';
-import { find, isNil, pull, remove } from 'lodash';
-import { AlarmState } from './alarm-state-enum';
 export class AlarmElement extends ConditionalDisplayElement {
     constructor(element, injector, permissionChecker, variableCommunicator, variableStore, alarmsStore, signalRAppId) {
         var _a;
@@ -47,40 +45,13 @@ export class AlarmElement extends ConditionalDisplayElement {
                 }, this.model.filterSetting.refreshCycle * 60 * 1000);
             }
             else {
-                variableCommunicator.subscribeUserDeviceAlarms(signalRAppId).subscribe(alarmWithAppId => {
-                    if (alarmWithAppId.appId !== this.signalRAppId) {
-                        return;
-                    }
-                    const alarm = alarmWithAppId.alarm;
-                    if (!find(this.alarmNames, itemName => itemName === alarm.name)) {
-                        return;
-                    }
-                    const currentAlarm = this.currentAlarmList.find(re => re.name === alarm.name);
-                    if (alarm.state === AlarmState.AlarmStateTriggered.valueOf()) {
-                        if (!isNil(currentAlarm)) {
+                variableCommunicator.subscribeUserDeviceAlarms(signalRAppId).subscribe(alarms => {
+                    alarms.forEach(alarm => {
+                        if (this.alarmNames.indexOf(alarm.name) !== -1) {
+                            this.init();
                             return;
                         }
-                        pull(this.currentAlarmList, this.currentAlarmList.find(record => alarm.name === record.name));
-                        this.currentAlarmList.unshift(alarm);
-                        this.totalCount += 1;
-                    }
-                    else {
-                        if (isNil(currentAlarm)) {
-                            return;
-                        }
-                        remove(this.currentAlarmList, currentAlarm);
-                        this.totalCount -= 1;
-                    }
-                    this.alarmList = [];
-                    this.currentAlarmList.forEach(item => {
-                        this.alarmList.push([
-                            item.name,
-                            item.message,
-                            item.alarmLevel,
-                            moment(item.triggeredTime).format('YYYY-MM-DD HH:mm:ss')
-                        ]);
                     });
-                    this.renderElement();
                 });
             }
             this.init();
@@ -110,38 +81,41 @@ export class AlarmElement extends ConditionalDisplayElement {
         return timePeriods;
     }
     init() {
-        if (this.model.filterSetting.alarmType) {
-            this.updateQueryTimeRange();
-            const input = new GetAlarmsArgs(this.alarmNames, this.startTime, this.endTime, this.pageSize, this.page * this.pageSize);
-            this.alarmsStore.getHistoryAlarms(input).subscribe(result => {
-                if (!result.error) {
-                    this.totalCount = result.totalCount;
-                    this.alarmList = result.items.map(item => [
-                        item.name,
-                        item.message,
-                        item.alarmLevel,
-                        item.triggeredTime.format('YYYY-MM-DD HH:mm:ss')
-                    ]);
-                    this.renderElement();
-                }
-            });
-        }
-        else {
-            const input = new GetAlarmsArgs(this.alarmNames, undefined, undefined, this.pageSize, this.page * this.pageSize);
-            this.alarmsStore.getCurrentAlarms(input).subscribe(result => {
-                if (!result.error) {
-                    this.totalCount = result.totalCount;
-                    this.currentAlarmList = result.items;
-                    this.alarmList = this.currentAlarmList.map(item => [
-                        item.name,
-                        item.message,
-                        item.alarmLevel,
-                        item.triggeredTime.format('YYYY-MM-DD HH:mm:ss')
-                    ]);
-                    this.renderElement();
-                }
-            });
-        }
+        clearTimeout(this.getAlarmDataId);
+        this.getAlarmDataId = setTimeout(() => {
+            if (this.model.filterSetting.alarmType) {
+                this.updateQueryTimeRange();
+                const input = new GetAlarmsArgs(this.alarmNames, this.startTime, this.endTime, this.pageSize, this.page * this.pageSize);
+                this.alarmsStore.getHistoryAlarms(input).subscribe(result => {
+                    if (!result.error) {
+                        this.totalCount = result.totalCount;
+                        this.alarmList = result.items.map(item => [
+                            item.name,
+                            item.message,
+                            item.alarmLevel,
+                            item.triggeredTime.format('YYYY-MM-DD HH:mm:ss')
+                        ]);
+                        this.renderElement();
+                    }
+                });
+            }
+            else {
+                const input = new GetAlarmsArgs(this.alarmNames, undefined, undefined, this.pageSize, this.page * this.pageSize);
+                this.alarmsStore.getCurrentAlarms(input).subscribe(result => {
+                    if (!result.error) {
+                        this.totalCount = result.totalCount;
+                        this.currentAlarmList = result.items;
+                        this.alarmList = this.currentAlarmList.map(item => [
+                            item.name,
+                            item.message,
+                            item.alarmLevel,
+                            item.triggeredTime.format('YYYY-MM-DD HH:mm:ss')
+                        ]);
+                        this.renderElement();
+                    }
+                });
+            }
+        }, 500);
     }
     renderElement() {
         this.rootElement.selectAll('*').remove();

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":49,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":50,"character":18},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":51,"character":27},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":52,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":53,"character":23},{"__symbolic":"reference","module":"../../config","name":"AlarmsStore","line":54,"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"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"AlarmElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-display-element","name":"ConditionalDisplayElement","line":15,"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/package.json

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

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

@@ -30,9 +30,9 @@ export class RemoteVariableCommunicator {
         if (this.alarmChangedSubscription !== undefined) {
             this.alarmChangedSubscription.unsubscribe();
         }
-        this.alarmChangedSubscription = this.remoteVariableProtocol.historyAlarmChanged.subscribe((alarmWithAppId) => {
+        this.alarmChangedSubscription = this.remoteVariableProtocol.virtualDeviceAlarmsChanged.subscribe((alarms) => {
             each(this.alarmObservers, ob => {
-                ob.next(alarmWithAppId);
+                ob.next(alarms);
             });
         });
     }
@@ -218,9 +218,9 @@ export class RemoteVariableCommunicator {
     subscribeUserDeviceAlarms(appId = '') {
         return new Observable(observer => {
             this.alarmObservers.push(observer);
-            this.remoteVariableProtocol.subscribeUserDeviceAlarms(appId);
+            this.remoteVariableProtocol.subscribeVirtualDeviceAlarms(appId);
             return () => {
-                this.remoteVariableProtocol.unSubscribeUserDeviceAlarms(appId);
+                this.remoteVariableProtocol.unsubscribeVirtualDeviceAlarms(appId);
             };
         });
     }

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

@@ -4,13 +4,13 @@ export interface RemoteVariableProtocol {
     connected: Observable<void>;
     variableStatesChanged: Observable<VariableValue[]>;
     variableValuesChanged: Observable<VariableValue[]>;
-    historyAlarmChanged: Observable<any>;
+    virtualDeviceAlarmsChanged: Observable<any>;
     tryOpenVariables(variableNames: string[], appId: string): Observable<void>;
     tryStopVariables(variableNames: string[], appId: string): Observable<void>;
     writeVariable(variableName: string, value: any): Observable<void>;
     writeVariableWordByBit(variableName: string, index: number, value: number): Observable<void>;
     subscribeVariableStates(variableNames: string[]): Observable<void>;
     unsubscribeVariableStates(variableNames: string[]): Observable<void>;
-    subscribeUserDeviceAlarms(appId: string): any;
-    unSubscribeUserDeviceAlarms(appId: string): any;
+    subscribeVirtualDeviceAlarms(appId: string): any;
+    unsubscribeVirtualDeviceAlarms(appId: string): any;
 }

package/elements/alarm/alarm-state-enum.d.ts

@@ -1,4 +0,0 @@
-export declare enum AlarmState {
-    AlarmStateTriggered = 1,
-    AlarmStateRecovered = 0
-}

package/elements/alarm/alarm-state-enum.js

@@ -1,5 +0,0 @@
-export var AlarmState;
-(function (AlarmState) {
-    AlarmState[AlarmState["AlarmStateTriggered"] = 1] = "AlarmStateTriggered";
-    AlarmState[AlarmState["AlarmStateRecovered"] = 0] = "AlarmStateRecovered";
-})(AlarmState || (AlarmState = {}));

package/elements/alarm/alarm-state-enum.metadata.json

@@ -1 +0,0 @@
-[{"__symbolic":"module","version":4,"metadata":{"AlarmState":{"AlarmStateTriggered":1,"AlarmStateRecovered":0}}}]