@flexem/fc-gui 3.0.0-alpha.114 → 3.0.0-alpha.115

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

@@ -6,6 +6,7 @@ export interface VariableCommunicator {
     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>;
+    requestVirtualDeviceState(): Observable<void>;
     subscribeVariableState(variableName: string): Observable<VariableState>;
     subscribeVariableStates(variableNames: Array<string>): Observable<Array<VariableState>>;
     subscribeUserDeviceAlarms(appId: string): any;

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

@@ -4,5 +4,7 @@ export declare class VariableValue {
     state: VariableStateEnum;
     value?: any;
     readonly timeStamp?: string;
-    constructor(variableName: string, state: VariableStateEnum, value?: any, timeStamp?: string);
+    systemName?: string;
+    customStatus?: string;
+    constructor(variableName: string, state: VariableStateEnum, value?: any, timeStamp?: string, systemName?: string, customStatus?: string);
 }

package/communication/variable/variable-value.js

@@ -1,8 +1,10 @@
 export class VariableValue {
-    constructor(variableName, state, value, timeStamp) {
+    constructor(variableName, state, value, timeStamp, systemName, customStatus) {
         this.variableName = variableName;
         this.state = state;
         this.value = value;
         this.timeStamp = timeStamp;
+        this.systemName = systemName;
+        this.customStatus = customStatus;
     }
 }

package/communication/variable/variable-value.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"VariableValue":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"./variable-state-enum","name":"VariableStateEnum","line":3,"character":68},{"__symbolic":"reference","name":"any"},{"__symbolic":"reference","name":"string"}]}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"VariableValue":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"./variable-state-enum","name":"VariableStateEnum","line":3,"character":68},{"__symbolic":"reference","name":"any"},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","name":"string"}]}]}}}}]

package/elements/base/readable-element.js

@@ -73,7 +73,7 @@ export class ReadableElement extends ConditionalEnableElement {
     }
     reportValueChanged(value) {
         forEach(this.elementStates, elementState => {
-            if (elementState.variableName === value.variableName) {
+            if (elementState.variableName === value.variableName || elementState.variableName === value.systemName) {
                 elementState.state = value.state;
                 this.changeStates();
             }
@@ -83,5 +83,8 @@ export class ReadableElement extends ConditionalEnableElement {
             || value.variableName === this.maxVariableName) {
             this.updateVariableValue(value.value, value.variableName);
         }
+        if (value.systemName === '设备状态') {
+            this.updateVariableValue(value.customStatus, '设备状态');
+        }
     }
 }

package/elements/base/state-control-element.js

@@ -139,6 +139,9 @@ export class StateControlElement extends ConditionalDynamicDisplayElement {
         if (!this.currentRect.length) {
             return;
         }
+        // 元件绑定设备状态时不需要在右上角显示状态
+        if (this.$element[0].dataset.model.includes('设备状态'))
+            return;
         const document = this.$element[0].ownerDocument;
         const imgObj = document.createElementNS('http://www.w3.org/2000/svg', 'image');
         if (imgObj) {

package/elements/main-element.js

@@ -262,7 +262,8 @@ export class MainElement {
         each(values, value => {
             each(this.elements, e => {
                 if (e instanceof ReadableElement) {
-                    if (e.readVariableName === value.variableName || e.minVariableName === value.variableName || e.maxVariableName === value.variableName) {
+                    if ((value.variableName && (e.readVariableName === value.variableName ||
+                        e.minVariableName === value.variableName || e.maxVariableName === value.variableName)) || e.readVariableName === value.systemName) {
                         e.reportValueChanged(value);
                     }
                 }

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

@@ -12,6 +12,7 @@ export declare class PerViewVariableCommunicator implements VariableCommunicator
     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>;
+    requestVirtualDeviceState(): Observable<void>;
     subscribeVariableState(variableName: string): Observable<VariableState>;
     subscribeVariableStates(variableNames: string[]): Observable<Array<VariableState>>;
     subscribeUserDeviceAlarms(appId?: string): Observable<VariableState[]>;

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

@@ -30,6 +30,9 @@ export class PerViewVariableCommunicator {
     writeWordByBit(variableName, index, value) {
         return this._rawVariableCommunicator.writeWordByBit(variableName, index, value);
     }
+    requestVirtualDeviceState() {
+        return this._rawVariableCommunicator.requestVirtualDeviceState();
+    }
     subscribeVariableState(variableName) {
         return this.subscribeVariableStates([variableName]).pipe(map(values => values[0]));
     }

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":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"}]}}}}]
+[{"__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"}],"requestVirtualDeviceState":[{"__symbolic":"method"}],"subscribeVariableState":[{"__symbolic":"method"}],"subscribeVariableStates":[{"__symbolic":"method"}],"subscribeUserDeviceAlarms":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}]}}}}]

package/gui/gui-view.d.ts

@@ -21,6 +21,8 @@ export declare class GuiView implements PopupViewService {
     private mainElement;
     private muskElement;
     private openVariableStatesSubscription;
+    private requestVirtualDeviceState;
+    private virtualDeviceStatesChanged;
     private openVariablesSubscription;
     private openedVariableNames;
     private perViewVariableCommunicator;

package/gui/gui-view.js

@@ -72,22 +72,57 @@ export class GuiView {
             this.openVariableStatesSubscription.unsubscribe();
         }
         this.openedVariableNames = this.mainElement.getVariableNames();
-        if (this.openedVariableNames.length === 0) {
-            return;
+        if (this.openedVariableNames.indexOf('设备状态') !== -1) {
+            if (this.requestVirtualDeviceState) {
+                this.requestVirtualDeviceState.unsubscribe();
+            }
+            if (this.requestVirtualDeviceState) {
+                this.requestVirtualDeviceState.unsubscribe();
+            }
+            if (this.openedVariableNames.length === 1) {
+                this.normalOpenedVariableNames(['设备状态']);
+                this.requestVirtualDeviceState =
+                    this.perViewVariableCommunicator.requestVirtualDeviceState().subscribe({
+                        complete: () => { }
+                    });
+            }
+            else {
+                this.openVariableStatesSubscription =
+                    this.perViewVariableCommunicator.subscribeVariableStates(this.openedVariableNames).subscribe((states) => {
+                        this.mainElement.reportVariableStates(states);
+                        const normalVariableNames = [];
+                        each(states, v => {
+                            if (v.state === VariableStateEnum.Normal && normalVariableNames.indexOf(v.variableName) === -1) {
+                                normalVariableNames.push(v.variableName);
+                            }
+                        });
+                        normalVariableNames.push('设备状态');
+                        this.normalOpenedVariableNames(normalVariableNames);
+                        this.requestVirtualDeviceState =
+                            this.perViewVariableCommunicator.requestVirtualDeviceState().subscribe({
+                                complete: () => { }
+                            });
+                    });
+            }
         }
-        this.openVariableStatesSubscription =
-            this.perViewVariableCommunicator.subscribeVariableStates(this.openedVariableNames).subscribe((states) => {
-                this.mainElement.reportVariableStates(states);
-                const normalVariableNames = [];
-                each(states, v => {
-                    if (v.state === VariableStateEnum.Normal && normalVariableNames.indexOf(v.variableName) === -1) {
-                        normalVariableNames.push(v.variableName);
+        else {
+            if (this.openedVariableNames.length === 0) {
+                return;
+            }
+            this.openVariableStatesSubscription =
+                this.perViewVariableCommunicator.subscribeVariableStates(this.openedVariableNames).subscribe((states) => {
+                    this.mainElement.reportVariableStates(states);
+                    const normalVariableNames = [];
+                    each(states, v => {
+                        if (v.state === VariableStateEnum.Normal && normalVariableNames.indexOf(v.variableName) === -1) {
+                            normalVariableNames.push(v.variableName);
+                        }
+                    });
+                    if (normalVariableNames.length > 0) {
+                        this.normalOpenedVariableNames(normalVariableNames);
                     }
                 });
-                if (normalVariableNames.length > 0) {
-                    this.normalOpenedVariableNames(normalVariableNames);
-                }
-            });
+        }
     }
     popView(viewIndex, hostContainerId, el) {
         return this.context.configStore.viewStore.getViewConfig(viewIndex).pipe(map(view => {
@@ -181,6 +216,12 @@ export class GuiView {
         if (this.openVariableStatesSubscription) {
             this.openVariableStatesSubscription.unsubscribe();
         }
+        if (this.requestVirtualDeviceState) {
+            this.requestVirtualDeviceState.unsubscribe();
+        }
+        if (this.virtualDeviceStatesChanged) {
+            this.virtualDeviceStatesChanged.unsubscribe();
+        }
         if (this.openVariablesSubscription) {
             this.openVariablesSubscription.unsubscribe();
         }

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":47,"character":43},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":48,"character":41},{"__symbolic":"reference","module":"./gui-context","name":"GuiContext","line":49,"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":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"}]}}}}]

package/package.json

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

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

@@ -9,6 +9,7 @@ export declare class RemoteVariableCommunicator implements VariableCommunicator
     private appIdVariablesMap;
     private connectedSubscription;
     private variableValuesChangedSubscription;
+    private virtualDeviceStatesChangedSubscription;
     private variablesToBeOpened;
     private variablesToBeClosed;
     private variableValueCache;
@@ -22,9 +23,11 @@ export declare class RemoteVariableCommunicator implements VariableCommunicator
     constructor(remoteVariableProtocol: RemoteVariableProtocol, logger: LoggerService);
     private doAlarmChanged;
     private doVariableValuesChanged;
+    private doVirtualDeviceStatesChanged;
     private doVariableStatesChanged;
     subscribeVariableStates(variableNames: string[]): Observable<VariableState[]>;
     subscribeVariableState(variableName: string): Observable<VariableState>;
+    requestVirtualDeviceState(): Observable<void>;
     openVariables(variableNames: string[], appId?: string): Observable<VariableValue[]>;
     openVariable(variableName: string, appId?: string): Observable<VariableValue>;
     write(variableName: string, value: any): Observable<VariableValue>;

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

@@ -24,6 +24,7 @@ export class RemoteVariableCommunicator {
         });
         this.doVariableStatesChanged();
         this.doVariableValuesChanged();
+        this.doVirtualDeviceStatesChanged();
         this.doAlarmChanged();
     }
     doAlarmChanged() {
@@ -54,6 +55,25 @@ export class RemoteVariableCommunicator {
                 });
             });
     }
+    doVirtualDeviceStatesChanged() {
+        if (this.virtualDeviceStatesChangedSubscription !== undefined) {
+            this.virtualDeviceStatesChangedSubscription.unsubscribe();
+        }
+        this.virtualDeviceStatesChangedSubscription =
+            this.remoteVariableProtocol.virtualDeviceStatesChanged.subscribe((deviceStates) => {
+                each(deviceStates, deviceState => {
+                    const variableName = '设备状态';
+                    this.variableValueCache.set(variableName, deviceState);
+                    const data = Object.assign(Object.assign({}, deviceState), { systemName: '设备状态' });
+                    if (this.observers.has(variableName)) {
+                        each(this.observers.get(variableName), ob => {
+                            // TODO 同一个ob监听多个变量的情况，组合成数组一次推送。
+                            ob.next([data]);
+                        });
+                    }
+                });
+            });
+    }
     doVariableStatesChanged() {
         if (this.variableStatesChangedSubscription !== undefined) {
             this.variableStatesChangedSubscription.unsubscribe();
@@ -127,6 +147,9 @@ export class RemoteVariableCommunicator {
     subscribeVariableState(variableName) {
         return this.subscribeVariableStates([variableName]).pipe(map(values => values[0]));
     }
+    requestVirtualDeviceState() {
+        return this.remoteVariableProtocol.requestVirtualDeviceState();
+    }
     openVariables(variableNames, appId = '') {
         return new Observable(observer => {
             let variablesToStart = [];
@@ -229,6 +252,7 @@ export class RemoteVariableCommunicator {
         this.connectedSubscription.unsubscribe();
         this.variableStatesChangedSubscription.unsubscribe();
         this.variableValuesChangedSubscription.unsubscribe();
+        this.virtualDeviceStatesChangedSubscription.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":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"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"RemoteVariableCommunicator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"./remote-variable-protocol","name":"RemoteVariableProtocol","line":28,"character":57},{"__symbolic":"reference","module":"../../../logger","name":"LoggerService","line":28,"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"}],"dispose":[{"__symbolic":"method"}]}}}}]

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

@@ -9,6 +9,8 @@ export interface RemoteVariableProtocol {
     tryStopVariables(variableNames: string[], appId: string): Observable<void>;
     writeVariable(variableName: string, value: any): Observable<void>;
     writeVariableWordByBit(variableName: string, index: number, value: number): Observable<void>;
+    requestVirtualDeviceState(): Observable<void>;
+    virtualDeviceStatesChanged: Observable<any>;
     subscribeVariableStates(variableNames: string[]): Observable<void>;
     unsubscribeVariableStates(variableNames: string[]): Observable<void>;
     subscribeVirtualDeviceAlarms(appId: string): any;