@flexem/fc-gui 3.0.0-alpha.150 → 3.0.0-alpha.151

package/elements/base/readable-element.js

@@ -112,7 +112,7 @@ export class ReadableElement extends ConditionalEnableElement {
             return;
         }
         // 处理普通变量
-        if (this.state === State.Normal || this.state === State.Disable
+        if (this.state === State.Normal || this.state === State.Disable || this.state === State.Offline
             || value.variableName === this.minVariableName
             || value.variableName === this.maxVariableName) {
             this.updateVariableValue(value.value, value.variableName);

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

@@ -15,6 +15,6 @@ export declare class PerViewVariableCommunicator implements VariableCommunicator
     requestVirtualDeviceState(): Observable<void>;
     subscribeVariableState(variableName: string): Observable<VariableState>;
     subscribeVariableStates(variableNames: string[]): Observable<Array<VariableState>>;
-    subscribeUserDeviceAlarms(appId?: string): Observable<VariableState[]>;
+    subscribeUserDeviceAlarms(appId?: string): Observable<any[]>;
     dispose(): void;
 }

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

@@ -18,7 +18,10 @@ export class PerViewVariableCommunicator {
                 if (!this.observers.has(variableName)) {
                     this.observers.set(variableName, []);
                 }
-                this.observers.get(variableName).push(subscriber);
+                const obs = this.observers.get(variableName);
+                if (obs) {
+                    obs.push(subscriber);
+                }
             });
             const subscription = this._rawVariableCommunicator.openVariables(variableNames, appId).subscribe(values => subscriber.next(values), error => subscriber.error(error), () => subscriber.complete());
             this.variableValuesChangedSubscriptions.push(subscription);
@@ -44,7 +47,7 @@ export class PerViewVariableCommunicator {
     }
     subscribeUserDeviceAlarms(appId = '') {
         return new Observable(subscriber => {
-            const subscription = this._rawVariableCommunicator.subscribeUserDeviceAlarms(appId).subscribe(values => subscriber.next(values), error => subscriber.error(error), () => subscriber.complete());
+            const subscription = this._rawVariableCommunicator.subscribeUserDeviceAlarms(appId).subscribe((values) => subscriber.next(values), (error) => subscriber.error(error), () => subscriber.complete());
             this.alarmSubscription.push(subscription);
         });
     }

package/elements/switch-indicator-light/bit-indicator-light-operator.d.ts

@@ -11,6 +11,7 @@ export declare class BitIndicatorLightOperator implements IndicatorLightOperator
     private binary;
     currentStateId?: number;
     currentStateIdChanged: EventEmitter<CurrentStateIdValue>;
+    private valueSubscription;
     private offStateId?;
     private onStateId?;
     get variableName(): string;

package/elements/switch-indicator-light/bit-indicator-light-operator.js

@@ -55,8 +55,11 @@ export class BitIndicatorLightOperator {
         }
     }
     requestCurrentSateIdValue(variableCommunicator, appId = '') {
-        variableCommunicator.openVariable(this.variableName, appId).subscribe(value => {
-            if (value.state === VariableStateEnum.DataNormal) {
+        if (this.valueSubscription) {
+            return;
+        }
+        this.valueSubscription = variableCommunicator.openVariable(this.variableName, appId).subscribe(value => {
+            if (value.state === VariableStateEnum.DataNormal || value.state === VariableStateEnum.Offline) {
                 if (this.settings.isBitwiseIndex) {
                     const maxBitIndex = 31;
                     this.binary = new Binary(value.value, maxBitIndex + 1);

package/elements/switch-indicator-light/bit-indicator-light-operator.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"BitIndicatorLightOperator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"../../model","name":"BitIndicatorLightSettings","line":26,"character":43},{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","module":"../../model","name":"SwitchIndicatorState","line":27,"character":16}]},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":28,"character":47},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":29,"character":40}]}],"requestData":[{"__symbolic":"method"}],"requestCurrentSateIdValue":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"BitIndicatorLightOperator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"../../model","name":"BitIndicatorLightSettings","line":27,"character":43},{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","module":"../../model","name":"SwitchIndicatorState","line":28,"character":16}]},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":29,"character":47},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":30,"character":40}]}],"requestData":[{"__symbolic":"method"}],"requestCurrentSateIdValue":[{"__symbolic":"method"}]}}}}]

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

@@ -217,12 +217,17 @@ export class SwitchIndicatorLightElement extends ConditionalEnableElement {
         this.indicatorLightOperator.requestData(this.signalRAppId);
     }
     currentStateIdChange(statusIdValue) {
-        if (!isUndefined(statusIdValue.value)) {
-            this.switchToState(statusIdValue.value);
-        }
         this.updateElementStates([statusIdValue.state]);
         if (this.state === State.Unbind || this.state === State.Offline) {
-            this.switchToState(0);
+            if (!isUndefined(statusIdValue.value)) {
+                this.switchToState(statusIdValue.value);
+            }
+            else {
+                this.switchToState(0);
+            }
+        }
+        else if (!isUndefined(statusIdValue.value)) {
+            this.switchToState(statusIdValue.value);
         }
     }
     switchToState(stateId) {

package/elements/switch-indicator-light/word-indicator-light-operator.d.ts

@@ -10,6 +10,7 @@ export declare class WordIndicatorLightOperator implements IndicatorLightOperato
     private readonly variableStore;
     currentStateId?: number;
     currentStateIdChanged: EventEmitter<CurrentStateIdValue>;
+    private valueSubscription;
     private sortedStates;
     get variableName(): string;
     constructor(settings: WordIndicatorLightSettings, states: SwitchIndicatorState[], variableCommunicator: VariableCommunicator, variableStore: VariableStore);

package/elements/switch-indicator-light/word-indicator-light-operator.js

@@ -36,9 +36,12 @@ export class WordIndicatorLightOperator {
         }
     }
     requestCurrentSateIdValue(variableCommunicator, appId = '') {
+        if (this.valueSubscription) {
+            return;
+        }
         // TODO 检查状态id是从0-n连续编号的。
-        variableCommunicator.openVariable(this.variableName, appId).subscribe(value => {
-            if (value.state === VariableStateEnum.DataNormal) {
+        this.valueSubscription = variableCommunicator.openVariable(this.variableName, appId).subscribe(value => {
+            if (value.state === VariableStateEnum.DataNormal || value.state === VariableStateEnum.Offline) {
                 let stateId = 0;
                 for (let index = 0; index < this.sortedStates.length - 1; index++) {
                     const element = this.sortedStates[index];

package/elements/switch-indicator-light/word-indicator-light-operator.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"WordIndicatorLightOperator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"../../model","name":"WordIndicatorLightSettings","line":23,"character":43},{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","module":"../../model","name":"SwitchIndicatorState","line":24,"character":16}]},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":25,"character":47},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":26,"character":40}]}],"requestData":[{"__symbolic":"method"}],"requestCurrentSateIdValue":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"WordIndicatorLightOperator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"../../model","name":"WordIndicatorLightSettings","line":24,"character":43},{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","module":"../../model","name":"SwitchIndicatorState","line":25,"character":16}]},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":26,"character":47},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":27,"character":40}]}],"requestData":[{"__symbolic":"method"}],"requestCurrentSateIdValue":[{"__symbolic":"method"}]}}}}]

package/gui/gui-view.d.ts

@@ -23,7 +23,8 @@ export declare class GuiView implements PopupViewService {
     private openVariableStatesSubscription;
     private requestVirtualDeviceState;
     private virtualDeviceStatesChanged;
-    private openVariablesSubscription;
+    private openVariablesSubscriptions;
+    private openedVariableNamesForValues;
     private openedVariableNames;
     private perViewVariableCommunicator;
     private svgRootClass;

package/gui/gui-view.js

@@ -16,6 +16,8 @@ export class GuiView {
         this.context = context;
         this.parentView = parentView;
         this.viewId = Guid.newGuid().toString('n');
+        this.openVariablesSubscriptions = [];
+        this.openedVariableNamesForValues = new Set();
         this.logger = injector.get(LOGGER_SERVICE_TOKEN);
         this.childViews = new Array();
         if (parentView) {
@@ -71,6 +73,9 @@ export class GuiView {
         if (this.openVariableStatesSubscription) {
             this.openVariableStatesSubscription.unsubscribe();
         }
+        this.openVariablesSubscriptions.forEach(s => s.unsubscribe());
+        this.openVariablesSubscriptions = [];
+        this.openedVariableNamesForValues.clear();
         this.openedVariableNames = this.mainElement.getVariableNames();
         // 分离系统变量和普通变量
         const systemVariables = [];
@@ -110,7 +115,7 @@ export class GuiView {
                 this.mainElement.reportVariableStates(states);
                 const normalVariableNames = [];
                 each(states, v => {
-                    if (v.state === VariableStateEnum.Normal && normalVariableNames.indexOf(v.variableName) === -1) {
+                    if ((v.state === VariableStateEnum.Normal || v.state === VariableStateEnum.Offline) && normalVariableNames.indexOf(v.variableName) === -1) {
                         normalVariableNames.push(v.variableName);
                     }
                 });
@@ -217,8 +222,8 @@ export class GuiView {
         if (this.virtualDeviceStatesChanged) {
             this.virtualDeviceStatesChanged.unsubscribe();
         }
-        if (this.openVariablesSubscription) {
-            this.openVariablesSubscription.unsubscribe();
+        if (this.openVariablesSubscriptions) {
+            this.openVariablesSubscriptions.forEach(s => s.unsubscribe());
         }
         if (this.perViewVariableCommunicator) {
             this.perViewVariableCommunicator.dispose();
@@ -232,9 +237,12 @@ export class GuiView {
         this.logger.debug('[GUI] View disposed.');
     }
     normalOpenedVariableNames(normalVariableNames) {
-        if (normalVariableNames.length > 0) {
-            this.openVariablesSubscription = this.perViewVariableCommunicator.openVariables(normalVariableNames, this.signalRAppId)
+        const newVariables = normalVariableNames.filter(v => !this.openedVariableNamesForValues.has(v));
+        if (newVariables.length > 0) {
+            newVariables.forEach(v => this.openedVariableNamesForValues.add(v));
+            const sub = this.perViewVariableCommunicator.openVariables(newVariables, this.signalRAppId)
                 .subscribe(variableValues => this.mainElement.reportVariableValues(variableValues));
+            this.openVariablesSubscriptions.push(sub);
         }
     }
 }

package/gui/gui-view.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"GuiView":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":49,"character":43},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":50,"character":41},{"__symbolic":"reference","module":"./gui-context","name":"GuiContext","line":51,"character":34},{"__symbolic":"reference","name":"GuiView"}]}],"resize":[{"__symbolic":"method"}],"load":[{"__symbolic":"method"}],"loadElementState":[{"__symbolic":"method"}],"popView":[{"__symbolic":"method"}],"closeView":[{"__symbolic":"method"}],"moveView":[{"__symbolic":"method"}],"showMusk":[{"__symbolic":"method"}],"showShadow":[{"__symbolic":"method"}],"hideMusk":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}],"normalOpenedVariableNames":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"GuiView":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":50,"character":43},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":51,"character":41},{"__symbolic":"reference","module":"./gui-context","name":"GuiContext","line":52,"character":34},{"__symbolic":"reference","name":"GuiView"}]}],"resize":[{"__symbolic":"method"}],"load":[{"__symbolic":"method"}],"loadElementState":[{"__symbolic":"method"}],"popView":[{"__symbolic":"method"}],"closeView":[{"__symbolic":"method"}],"moveView":[{"__symbolic":"method"}],"showMusk":[{"__symbolic":"method"}],"showShadow":[{"__symbolic":"method"}],"hideMusk":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}],"normalOpenedVariableNames":[{"__symbolic":"method"}]}}}}]

package/package.json

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

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

@@ -21,11 +21,16 @@ export declare class RemoteVariableCommunicator implements VariableCommunicator
     private alarmObservers;
     private alarmChangedSubscription;
     private systemVariableHandlers;
+    private offlineValueCache;
     constructor(remoteVariableProtocol: RemoteVariableProtocol, logger: LoggerService);
     private doAlarmChanged;
     private doVariableValuesChanged;
     private doVirtualDeviceStatesChanged;
     private doVariableStatesChanged;
+    /**
+     * 预填充离线变量值缓存，由 GuiContext 在组态加载时一次性调用
+     */
+    setOfflineValueCache(variableName: string, value: any): void;
     subscribeVariableStates(variableNames: string[]): Observable<VariableState[]>;
     subscribeVariableState(variableName: string): Observable<VariableState>;
     requestVirtualDeviceState(): Observable<void>;

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

@@ -1,6 +1,7 @@
 import { each, remove, uniq } from 'lodash';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
+import { VariableStateEnum } from '../../../communication';
 import { StringifyingMap } from '../../../core';
 export class RemoteVariableCommunicator {
     constructor(remoteVariableProtocol, logger) {
@@ -13,6 +14,8 @@ export class RemoteVariableCommunicator {
         this.alarmObservers = [];
         // 系统变量处理器
         this.systemVariableHandlers = new Map();
+        // 预加载的离线变量最新值缓存（组态加载时一次性填充，推送后即删除）
+        this.offlineValueCache = new Map();
         this.variableValueCache = new StringifyingMap(k => JSON.stringify(k));
         this.connectedSubscription = this.remoteVariableProtocol.connected.subscribe(() => {
             const variableNamesToStart = [];
@@ -87,13 +90,35 @@ export class RemoteVariableCommunicator {
                     this.variableStateCache.set(variableName, state);
                     if (this.variableStateObservers.has(variableName)) {
                         each(this.variableStateObservers.get(variableName), ob => {
-                            // TODO 同一个ob监听多个变量的情况，组合成数组一次推送。
                             ob.next([state]);
                         });
                     }
+                    // 离线时从预加载缓存取值推送给值订阅者
+                    if (state.state === VariableStateEnum.Offline && this.offlineValueCache.has(variableName)) {
+                        const cachedValue = this.offlineValueCache.get(variableName);
+                        const variableValue = {
+                            variableName,
+                            value: cachedValue,
+                            state: VariableStateEnum.Offline
+                        };
+                        this.variableValueCache.set(variableName, variableValue);
+                        if (this.observers.has(variableName)) {
+                            each(this.observers.get(variableName), ob => {
+                                ob.next([variableValue]);
+                            });
+                        }
+                    }
+                    // 无论什么状态，推送后清除缓存，防止后续再次离线时用旧值
+                    this.offlineValueCache.delete(variableName);
                 });
             });
     }
+    /**
+     * 预填充离线变量值缓存，由 GuiContext 在组态加载时一次性调用
+     */
+    setOfflineValueCache(variableName, value) {
+        this.offlineValueCache.set(variableName, value);
+    }
     subscribeVariableStates(variableNames) {
         return new Observable(observer => {
             let variableNamesToStart = [];

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":34,"character":57},{"__symbolic":"reference","module":"../../../logger","name":"LoggerService","line":34,"character":106}]}],"doAlarmChanged":[{"__symbolic":"method"}],"doVariableValuesChanged":[{"__symbolic":"method"}],"doVirtualDeviceStatesChanged":[{"__symbolic":"method"}],"doVariableStatesChanged":[{"__symbolic":"method"}],"subscribeVariableStates":[{"__symbolic":"method"}],"subscribeVariableState":[{"__symbolic":"method"}],"requestVirtualDeviceState":[{"__symbolic":"method"}],"openVariables":[{"__symbolic":"method"}],"openVariable":[{"__symbolic":"method"}],"write":[{"__symbolic":"method"}],"writeWordByBit":[{"__symbolic":"method"}],"subscribeUserDeviceAlarms":[{"__symbolic":"method"}],"registerSystemVariableHandler":[{"__symbolic":"method"}],"notifySystemVariableChange":[{"__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":37,"character":57},{"__symbolic":"reference","module":"../../../logger","name":"LoggerService","line":37,"character":106}]}],"doAlarmChanged":[{"__symbolic":"method"}],"doVariableValuesChanged":[{"__symbolic":"method"}],"doVirtualDeviceStatesChanged":[{"__symbolic":"method"}],"doVariableStatesChanged":[{"__symbolic":"method"}],"setOfflineValueCache":[{"__symbolic":"method"}],"subscribeVariableStates":[{"__symbolic":"method"}],"subscribeVariableState":[{"__symbolic":"method"}],"requestVirtualDeviceState":[{"__symbolic":"method"}],"openVariables":[{"__symbolic":"method"}],"openVariable":[{"__symbolic":"method"}],"write":[{"__symbolic":"method"}],"writeWordByBit":[{"__symbolic":"method"}],"subscribeUserDeviceAlarms":[{"__symbolic":"method"}],"registerSystemVariableHandler":[{"__symbolic":"method"}],"notifySystemVariableChange":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}]}}}}]