@flexem/fc-gui 3.0.0-alpha.5 → 3.0.0-alpha.50

package/elements/static-elements/hyperlink-element.js

@@ -3,8 +3,8 @@ import { GraphStateElement } from '../shared/graph/graph-state-element';
 import { LOGGER_SERVICE_TOKEN } from '../../logger';
 import { TextElementModal } from '../shared/text/text-element';
 export class HyperlinkElement extends ConditionalDynamicDisplayElement {
-    constructor(element, injector, permissionChecker, variableCommunicator, variableStore, graphStore) {
-        super(element, permissionChecker, variableCommunicator, variableStore);
+    constructor(element, injector, permissionChecker, variableCommunicator, variableStore, graphStore, signalRAppId) {
+        super(element, permissionChecker, variableCommunicator, variableStore, signalRAppId);
         this.graphStore = graphStore;
         this.logger = injector.get(LOGGER_SERVICE_TOKEN);
         if (this.model.size) {

package/elements/static-elements/hyperlink-element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"HyperlinkElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-dynamic-display-element","name":"ConditionalDynamicDisplayElement","line":12,"character":38},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":17,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":17,"character":48},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":17,"character":77},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":18,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":18,"character":67},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":18,"character":111}]}],"initGraphAndText":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"HyperlinkElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-dynamic-display-element","name":"ConditionalDynamicDisplayElement","line":12,"character":38},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":17,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":17,"character":48},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":17,"character":77},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":18,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":18,"character":67},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":18,"character":111},{"__symbolic":"reference","name":"string"}]}],"initGraphAndText":[{"__symbolic":"method"}]}}}}]

package/elements/static-elements/image-element.d.ts

@@ -9,6 +9,6 @@ export declare class ImageElement extends ConditionalDynamicDisplayElement {
     private readonly graphStore;
     readonly model: Image;
     protected readonly logger: LoggerService;
-    constructor(element: HTMLElement, injector: Injector, imageStore: ImageStore, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, graphStore: GraphStore);
+    constructor(element: HTMLElement, injector: Injector, imageStore: ImageStore, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, graphStore: GraphStore, signalRAppId: string);
     private initGraph;
 }

package/elements/static-elements/image-element.js

@@ -3,8 +3,8 @@ import { ImageFillType } from '../../model/image/image-fill-type';
 import { GraphStateElement } from '../shared/graph/graph-state-element';
 import { LOGGER_SERVICE_TOKEN } from '../../logger';
 export class ImageElement extends ConditionalDynamicDisplayElement {
-    constructor(element, injector, imageStore, permissionChecker, variableCommunicator, variableStore, graphStore) {
-        super(element, permissionChecker, variableCommunicator, variableStore);
+    constructor(element, injector, imageStore, permissionChecker, variableCommunicator, variableStore, graphStore, signalRAppId) {
+        super(element, permissionChecker, variableCommunicator, variableStore, signalRAppId);
         this.graphStore = graphStore;
         this.logger = injector.get(LOGGER_SERVICE_TOKEN);
         if (!this.model.version || this.model.version < 4 || this.model.fillType !== ImageFillType.Graph) {

package/elements/static-elements/image-element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"ImageElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-dynamic-display-element","name":"ConditionalDynamicDisplayElement","line":10,"character":34},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":15,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":16,"character":18},{"__symbolic":"reference","module":"../../config","name":"ImageStore","line":17,"character":20},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":18,"character":27},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":19,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":20,"character":23},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":21,"character":37}]}],"initGraph":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"ImageElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-dynamic-display-element","name":"ConditionalDynamicDisplayElement","line":10,"character":34},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":15,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":16,"character":18},{"__symbolic":"reference","module":"../../config","name":"ImageStore","line":17,"character":20},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":18,"character":27},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":19,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":20,"character":23},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":21,"character":37},{"__symbolic":"reference","name":"string"}]}],"initGraph":[{"__symbolic":"method"}]}}}}]

package/elements/static-elements/text-element.d.ts

@@ -9,7 +9,7 @@ export declare class TextElement extends ConditionalDynamicDisplayElement {
     private readonly graphStore;
     protected readonly model: TextModel;
     protected readonly logger: LoggerService;
-    constructor(element: HTMLElement, injector: Injector, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, graphStore: GraphStore);
+    constructor(element: HTMLElement, injector: Injector, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, graphStore: GraphStore, signalRAppId: string);
     dispose(): void;
     private handleTextValue;
     private initGraph;

package/elements/static-elements/text-element.js

@@ -3,8 +3,8 @@ import { GraphStateElement } from '../shared/graph/graph-state-element';
 import { LOGGER_SERVICE_TOKEN } from '../../logger';
 import { TextElementModal } from '../shared/text/text-element';
 export class TextElement extends ConditionalDynamicDisplayElement {
-    constructor(element, injector, permissionChecker, variableCommunicator, variableStore, graphStore) {
-        super(element, permissionChecker, variableCommunicator, variableStore);
+    constructor(element, injector, permissionChecker, variableCommunicator, variableStore, graphStore, signalRAppId) {
+        super(element, permissionChecker, variableCommunicator, variableStore, signalRAppId);
         this.graphStore = graphStore;
         this.logger = injector.get(LOGGER_SERVICE_TOKEN);
         if (this.model.text && this.model.size) {

package/elements/static-elements/text-element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"TextElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-dynamic-display-element","name":"ConditionalDynamicDisplayElement","line":10,"character":33},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":15,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":15,"character":48},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":15,"character":77},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":16,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":16,"character":67},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":16,"character":111}]}],"dispose":[{"__symbolic":"method"}],"handleTextValue":[{"__symbolic":"method"}],"initGraph":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"TextElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-dynamic-display-element","name":"ConditionalDynamicDisplayElement","line":10,"character":33},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":15,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":15,"character":48},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":15,"character":77},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":16,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":16,"character":67},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":16,"character":111},{"__symbolic":"reference","name":"string"}]}],"dispose":[{"__symbolic":"method"}],"handleTextValue":[{"__symbolic":"method"}],"initGraph":[{"__symbolic":"method"}]}}}}]

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

@@ -15,6 +15,6 @@ export declare class BitIndicatorLightOperator implements IndicatorLightOperator
     private onStateId?;
     get variableName(): string;
     constructor(settings: BitIndicatorLightSettings, states: SwitchIndicatorState[], variableCommunicator: VariableCommunicator, variableStore: VariableStore);
-    requestData(): void;
+    requestData(appId: string): void;
     private requestCurrentSateIdValue;
 }

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

@@ -42,11 +42,11 @@ export class BitIndicatorLightOperator {
         const variableName = new VariableDefinition(this.settings.variableName, this.settings.variableGroupName, this.settings.dataSourceCode, this.settings.variableVersion);
         return VariableUtil.getConvertedVariableName(this.variableStore, variableName);
     }
-    requestData() {
+    requestData(appId) {
         if (this.variableName) {
             this.variableCommunicator.subscribeVariableState(this.variableName).subscribe(variableStete => {
                 if (variableStete.state === VariableStateEnum.Normal) {
-                    this.requestCurrentSateIdValue(this.variableCommunicator);
+                    this.requestCurrentSateIdValue(this.variableCommunicator, appId);
                 }
                 else {
                     this.currentStateIdChanged.emit(new CurrentStateIdValue(new VariableState(this.variableName, variableStete.state)));
@@ -54,8 +54,8 @@ export class BitIndicatorLightOperator {
             });
         }
     }
-    requestCurrentSateIdValue(variableCommunicator) {
-        variableCommunicator.openVariable(this.variableName).subscribe(value => {
+    requestCurrentSateIdValue(variableCommunicator, appId = '') {
+        variableCommunicator.openVariable(this.variableName, appId).subscribe(value => {
             if (value.state === VariableStateEnum.DataNormal) {
                 if (this.settings.isBitwiseIndex) {
                     const maxBitIndex = 31;

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

@@ -7,11 +7,13 @@ export declare class BitSwitchOperator implements SwitchOperator {
     private readonly settings;
     private readonly variableCommunicator;
     private readonly variableStore;
+    private readonly signalRAppId;
     private currentValue;
     private canExecuteInternal;
     private binary;
     get variableName(): string;
-    constructor(settings: BitSwitchSettings, variableCommunicator: VariableCommunicator, variableStore: VariableStore);
+    constructor(settings: BitSwitchSettings, variableCommunicator: VariableCommunicator, variableStore: VariableStore, signalRAppId: string);
     canExecute(): boolean;
     execute(): Promise<VariableOptionModel>;
+    writeValue(value: any): Promise<VariableOptionModel>;
 }

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

@@ -4,10 +4,11 @@ import { Binary } from '../../model/shared/binary';
 import { VariableUtil } from '../../utils/variable-util';
 import { VariableDefinition } from '../../communication/variable/variable-definition';
 export class BitSwitchOperator {
-    constructor(settings, variableCommunicator, variableStore) {
+    constructor(settings, variableCommunicator, variableStore, signalRAppId) {
         this.settings = settings;
         this.variableCommunicator = variableCommunicator;
         this.variableStore = variableStore;
+        this.signalRAppId = signalRAppId;
         if (!this.settings) {
             throw new Error('settings cannot be null');
         }
@@ -15,7 +16,7 @@ export class BitSwitchOperator {
             this.canExecuteInternal = true;
         }
         else {
-            variableCommunicator.openVariable(this.variableName).subscribe(value => {
+            variableCommunicator.openVariable(this.variableName, this.signalRAppId).subscribe(value => {
                 this.currentValue = value;
                 this.canExecuteInternal = this.currentValue && this.currentValue.state === VariableStateEnum.DataNormal;
             });
@@ -71,6 +72,8 @@ export class BitSwitchOperator {
                     }
                 }
                 break;
+            case BitSwitchOperation.Restoration:
+                break;
             default:
                 throw new Error(`Unknown BitSwitchOperation:${settings.operation}`);
         }
@@ -84,4 +87,21 @@ export class BitSwitchOperator {
             newValue: newValue
         });
     }
+    writeValue(value) {
+        if (this.settings.isBitwiseIndex) {
+            this.variableCommunicator.writeWordByBit(this.variableName, this.settings.bitIndex, value).subscribe();
+        }
+        else {
+            this.variableCommunicator.write(this.variableName, value).subscribe();
+        }
+        let originValue;
+        if (this.currentValue && this.currentValue.value !== undefined) {
+            originValue = this.currentValue.value;
+        }
+        return Promise.resolve({
+            variableName: this.variableName,
+            originValue: originValue,
+            newValue: value
+        });
+    }
 }

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

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"BitSwitchOperator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"../../model","name":"BitSwitchSettings","line":21,"character":43},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":21,"character":101},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":22,"character":40}]}],"canExecute":[{"__symbolic":"method"}],"execute":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"BitSwitchOperator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"../../model","name":"BitSwitchSettings","line":21,"character":43},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":21,"character":101},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":22,"character":40},{"__symbolic":"reference","name":"string"}]}],"canExecute":[{"__symbolic":"method"}],"execute":[{"__symbolic":"method"}],"writeValue":[{"__symbolic":"method"}]}}}}]

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

@@ -4,5 +4,5 @@ export interface IndicatorLightOperator {
     readonly variableName: string;
     currentStateId?: number;
     currentStateIdChanged: EventEmitter<CurrentStateIdValue>;
-    requestData: () => void;
+    requestData: (appId: string) => void;
 }

package/elements/switch-indicator-light/switch-indicator-light-element.d.ts

@@ -19,9 +19,17 @@ export declare class SwitchIndicatorLightElement extends ConditionalEnableElemen
     private graphStateElement?;
     private textStateElement;
     private isMobileMode;
-    constructor(element: HTMLElement, injector: Injector, modalService: BsModalService, variableCommunicator: VariableCommunicator, graphStore: GraphStore, permissionChecker: PermissionChecker, operationRecordService: OperationRecordService, securityChecker: SecurityChecker, variableStore: VariableStore, localization: Localization);
+    private isBitRestoration;
+    private isVerifiedForRestoration;
+    private restorationTimer;
+    private isWriteRestorationDownValue;
+    private onDocMouseUp;
+    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;
     private checkElementPassword;
     private doSwitchOperator;
+    private writeValue;
     private initSwitchOperator;
     private initIndictorLightOperator;
     private currentStateIdChange;

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

@@ -1,7 +1,7 @@
 import { LOGGER_SERVICE_TOKEN } from '../../logger';
 import * as d3 from 'd3-selection';
 import { isUndefined } from 'lodash';
-import { IndicatorLightType, SwitchType, State } from '../../model';
+import { IndicatorLightType, SwitchType, State, BitSwitchOperation } from '../../model';
 import { VariableState } from '../../communication';
 import { ConditionalEnableElement } from '../base/conditional-enable-element';
 import { GraphStateElement } from '../shared/graph/graph-state-element';
@@ -17,19 +17,22 @@ import { DisplayMode, GlobalSettings } from '../../settings';
 import { VariableUtil } from '../../utils/variable-util';
 import { VariableDefinition } from '../../communication/variable/variable-definition';
 export class SwitchIndicatorLightElement extends ConditionalEnableElement {
-    constructor(element, injector, modalService, variableCommunicator, graphStore, permissionChecker, operationRecordService, securityChecker, variableStore, localization) {
-        super(element, permissionChecker, variableCommunicator, variableStore, localization);
+    constructor(element, injector, modalService, variableCommunicator, graphStore, permissionChecker, operationRecordService, securityChecker, variableStore, localization, signalRAppId) {
+        super(element, permissionChecker, variableCommunicator, variableStore, localization, signalRAppId);
         this.modalService = modalService;
         this.graphStore = graphStore;
         this.operationRecordService = operationRecordService;
         this.securityChecker = securityChecker;
+        this.isBitRestoration = false; // 是否是 位设定且执行设置是复位
+        this.isVerifiedForRestoration = false; // 位设定且执行设置是复位情况下，是否已经完成了验证
+        this.isWriteRestorationDownValue = false;
         this.logger = injector.get(LOGGER_SERVICE_TOKEN);
         this.isMobileMode = DisplayMode.Mobile === injector.get(GlobalSettings).displayMode;
         this.checkState();
         if (this.model.useSwitch) {
             this.initSwitchOperator();
             this.rootElement.style('cursor', 'hand');
-            this.rootElement.on('mousedown', () => {
+            this.rootElement.on(this.isMobileMode ? 'touchstart' : 'mousedown', () => {
                 if (!this.isInitialized) {
                     return;
                 }
@@ -43,31 +46,39 @@ export class SwitchIndicatorLightElement extends ConditionalEnableElement {
                     return;
                 }
                 if (this.switchOperator.canExecute()) {
-                    if (this.model.useSecurity) {
-                        const modalRef = this.modalService.show(ConfirmOperationModalComponent, { backdrop: 'static', class: 'gui-modal-dialog-position', animated: false });
-                        const onClosedSub = modalRef.content.onClosed.subscribe(result => {
-                            modalRef.hide();
-                            onClosedSub.unsubscribe();
-                            if (result) {
-                                this.checkElementPassword();
+                    if (!this.isBitRestoration || !this.isVerifiedForRestoration) {
+                        if (this.model.useSecurity) {
+                            const modalRef = this.modalService.show(ConfirmOperationModalComponent, { backdrop: 'static', class: 'gui-modal-dialog-position', animated: false });
+                            const onClosedSub = modalRef.content.onClosed.subscribe(result => {
+                                modalRef.hide();
+                                onClosedSub.unsubscribe();
+                                if (result) {
+                                    this.checkElementPassword(true);
+                                }
+                            });
+                        }
+                        else {
+                            this.checkElementPassword(false);
+                            if (!this.model.useIndicatorLight && !this.isMobileMode) {
+                                this.switchToState(1);
                             }
-                        });
+                        }
                     }
                     else {
-                        this.checkElementPassword();
-                        if (!this.model.useIndicatorLight && !this.isMobileMode) {
-                            this.switchToState(1);
-                        }
+                        document.addEventListener(this.isMobileMode ? 'touchend' : 'mouseup', this.onDocMouseUp);
+                        this.restorationTimer = setTimeout(() => {
+                            this.writeValue(1);
+                            this.isWriteRestorationDownValue = true;
+                        }, 1000);
                     }
                     d3.event.preventDefault();
                 }
             });
-            if (!this.model.useIndicatorLight && !this.isMobileMode) {
-                this.rootElement.on('mouseup', () => {
-                    this.switchToState(0);
-                    d3.event.preventDefault();
-                });
-            }
+            this.rootElement.on(this.isMobileMode ? 'touchend' : 'mouseup', () => {
+                this.handleMouseUp();
+                d3.event.stopPropagation();
+            });
+            this.initOnDocMouseUpEvent();
         }
         this.initGraphAndText();
         if (this.model.useIndicatorLight) {
@@ -77,19 +88,62 @@ export class SwitchIndicatorLightElement extends ConditionalEnableElement {
             this.switchToState(0);
         }
     }
-    checkElementPassword() {
+    handleMouseUp() {
+        if (this.restorationTimer) {
+            clearTimeout(this.restorationTimer);
+            this.restorationTimer = undefined;
+        }
+        if (this.isBitRestoration && this.isWriteRestorationDownValue) {
+            this.writeValue(0);
+        }
+        document.removeEventListener(this.isMobileMode ? 'touchend' : 'mouseup', this.onDocMouseUp);
+        this.isVerifiedForRestoration = false;
+        this.isWriteRestorationDownValue = false;
+        if (!this.model.useIndicatorLight && !this.isMobileMode) {
+            this.switchToState(0);
+            if (d3.event) {
+                d3.event.preventDefault();
+            }
+        }
+    }
+    initOnDocMouseUpEvent() {
+        this.onDocMouseUp = () => {
+            this.handleMouseUp();
+        };
+    }
+    checkElementPassword(afterConfirm) {
         if (this.model.enablePassword) {
             const modalRef = this.modalService.show(VerifyPasswordModalComponent, { initialState: { securityChecker: this.securityChecker }, backdrop: 'static', class: 'gui-modal-dialog-position', animated: false });
             const onClosedSub = modalRef.content.onClosed.subscribe(result => {
                 modalRef.hide();
                 onClosedSub.unsubscribe();
                 if (result) {
-                    this.doSwitchOperator();
+                    if (!this.isBitRestoration) {
+                        this.doSwitchOperator();
+                    }
+                    else {
+                        this.isVerifiedForRestoration = true;
+                    }
                 }
             });
         }
         else {
-            this.doSwitchOperator();
+            if (!this.isBitRestoration) {
+                this.doSwitchOperator();
+            }
+            else {
+                if (afterConfirm) {
+                    this.isVerifiedForRestoration = true;
+                }
+                else {
+                    this.isVerifiedForRestoration = true;
+                    document.addEventListener(this.isMobileMode ? 'touchend' : 'mouseup', this.onDocMouseUp);
+                    this.restorationTimer = setTimeout(() => {
+                        this.writeValue(1);
+                        this.isWriteRestorationDownValue = true;
+                    }, 1000);
+                }
+            }
         }
     }
     doSwitchOperator() {
@@ -106,16 +160,31 @@ export class SwitchIndicatorLightElement extends ConditionalEnableElement {
             throw new Error('Failure of the operation record:switchOperator');
         });
     }
+    writeValue(value) {
+        this.switchOperator.writeValue(value).then(args => {
+            if (this.model.isRecordOperation || this.model.isRecordOperation === undefined) {
+                if (args.newValue !== undefined || args.originValue !== undefined) {
+                    this.operationRecordService.record({
+                        variableOptionModel: args,
+                        operationDescription: this.model.operationDescription
+                    });
+                }
+            }
+        }).catch(() => {
+            throw new Error('Failure of the operation record:switchOperator');
+        });
+    }
     initSwitchOperator() {
         const settings = this.model.switchSettings;
         switch (settings.type) {
             case SwitchType.Bit:
                 this.switchOperator =
-                    new BitSwitchOperator(settings.settings, this.variableCommunicator, this.variableStore);
+                    new BitSwitchOperator(settings.settings, this.variableCommunicator, this.variableStore, this.signalRAppId);
+                this.isBitRestoration = settings.settings.operation === BitSwitchOperation.Restoration;
                 break;
             case SwitchType.Word:
                 this.switchOperator =
-                    new WordSwitchOperator(settings.settings, this.variableCommunicator, this.variableStore);
+                    new WordSwitchOperator(settings.settings, this.variableCommunicator, this.variableStore, this.signalRAppId);
                 break;
             default:
                 throw new Error(`Unknown switchType:${settings.type}`);
@@ -141,7 +210,7 @@ export class SwitchIndicatorLightElement extends ConditionalEnableElement {
         this.indicatorLightOperator.currentStateIdChanged.subscribe(statusIdValue => {
             this.currentStateIdChange(statusIdValue);
         });
-        this.indicatorLightOperator.requestData();
+        this.indicatorLightOperator.requestData(this.signalRAppId);
     }
     currentStateIdChange(statusIdValue) {
         if (!isUndefined(statusIdValue.value)) {

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":44,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":45,"character":18},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":46,"character":39},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":47,"character":30},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":48,"character":37},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":49,"character":27},{"__symbolic":"reference","module":"../../service","name":"OperationRecordService","line":50,"character":49},{"__symbolic":"reference","module":"../../security","name":"SecurityChecker","line":51,"character":42},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":52,"character":23},{"__symbolic":"reference","module":"../../localization","name":"Localization","line":53,"character":22}]}],"checkElementPassword":[{"__symbolic":"method"}],"doSwitchOperator":[{"__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":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"}]}}}}]

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

@@ -2,4 +2,5 @@ import { VariableOptionModel } from '../../service';
 export interface SwitchOperator {
     canExecute(): boolean;
     execute(): Promise<VariableOptionModel>;
+    writeValue(value: number): Promise<VariableOptionModel>;
 }

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

@@ -13,6 +13,6 @@ export declare class WordIndicatorLightOperator implements IndicatorLightOperato
     private sortedStates;
     get variableName(): string;
     constructor(settings: WordIndicatorLightSettings, states: SwitchIndicatorState[], variableCommunicator: VariableCommunicator, variableStore: VariableStore);
-    requestData(): void;
+    requestData(appId: string): void;
     private requestCurrentSateIdValue;
 }

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

@@ -20,11 +20,11 @@ export class WordIndicatorLightOperator {
         const variable = new VariableDefinition(this.settings.variableName, this.settings.variableGroupName, this.settings.dataSourceCode, this.settings.variableVersion);
         return VariableUtil.getConvertedVariableName(this.variableStore, variable);
     }
-    requestData() {
+    requestData(appId) {
         if (this.variableName) {
             this.variableCommunicator.subscribeVariableState(this.variableName).subscribe(variableValue => {
                 if (variableValue.state === VariableStateEnum.Normal) {
-                    this.requestCurrentSateIdValue(this.variableCommunicator);
+                    this.requestCurrentSateIdValue(this.variableCommunicator, appId);
                 }
                 else {
                     this.currentStateIdChanged.emit(new CurrentStateIdValue(new VariableState(this.variableName, variableValue.state)));
@@ -32,12 +32,12 @@ export class WordIndicatorLightOperator {
             });
         }
         else {
-            this.requestCurrentSateIdValue(this.variableCommunicator);
+            this.requestCurrentSateIdValue(this.variableCommunicator, appId);
         }
     }
-    requestCurrentSateIdValue(variableCommunicator) {
+    requestCurrentSateIdValue(variableCommunicator, appId = '') {
         // TODO 检查状态id是从0-n连续编号的。
-        variableCommunicator.openVariable(this.variableName).subscribe(value => {
+        variableCommunicator.openVariable(this.variableName, appId).subscribe(value => {
             if (value.state === VariableStateEnum.DataNormal) {
                 let stateId = 0;
                 for (let index = 0; index < this.sortedStates.length - 1; index++) {

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

@@ -7,10 +7,12 @@ export declare class WordSwitchOperator implements SwitchOperator {
     private readonly settings;
     private readonly variableCommunicator;
     private readonly variableStore;
+    private readonly signalRAppId;
     private currentValue;
     private canExecuteInternal;
     get variableName(): string;
-    constructor(settings: WordSwitchSettings, variableCommunicator: VariableCommunicator, variableStore: VariableStore);
+    constructor(settings: WordSwitchSettings, variableCommunicator: VariableCommunicator, variableStore: VariableStore, signalRAppId: string);
     canExecute(): boolean;
     execute(): Promise<VariableOptionModel>;
+    writeValue(value: any): Promise<VariableOptionModel>;
 }

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

@@ -4,10 +4,11 @@ import { VariableStateEnum } from '../../communication';
 import { VariableUtil } from '../../utils/variable-util';
 import { VariableDefinition } from '../../communication/variable/variable-definition';
 export class WordSwitchOperator {
-    constructor(settings, variableCommunicator, variableStore) {
+    constructor(settings, variableCommunicator, variableStore, signalRAppId) {
         this.settings = settings;
         this.variableCommunicator = variableCommunicator;
         this.variableStore = variableStore;
+        this.signalRAppId = signalRAppId;
         if (!this.settings) {
             throw new Error('settings cannot be null');
         }
@@ -15,7 +16,7 @@ export class WordSwitchOperator {
             this.canExecuteInternal = true;
         }
         else {
-            variableCommunicator.openVariable(this.variableName).subscribe(value => {
+            variableCommunicator.openVariable(this.variableName, this.signalRAppId).subscribe(value => {
                 this.currentValue = value;
                 this.canExecuteInternal = this.currentValue && this.currentValue.state === VariableStateEnum.DataNormal;
             });
@@ -65,4 +66,10 @@ export class WordSwitchOperator {
             newValue: newValue
         });
     }
+    // 此方法为 位设定添加的，字设定目前不会用到，为了解决接口error，添加一个空实现
+    writeValue(value) {
+        return Promise.resolve({
+            newValue: value
+        });
+    }
 }

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

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"WordSwitchOperator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"../../model","name":"WordSwitchSettings","line":20,"character":43},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":20,"character":102},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":21,"character":40}]}],"canExecute":[{"__symbolic":"method"}],"execute":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"WordSwitchOperator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"../../model","name":"WordSwitchSettings","line":20,"character":43},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":20,"character":102},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":21,"character":40},{"__symbolic":"reference","name":"string"}]}],"canExecute":[{"__symbolic":"method"}],"execute":[{"__symbolic":"method"}],"writeValue":[{"__symbolic":"method"}]}}}}]

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

@@ -5,5 +5,5 @@ import { TableModel } from '../../model/table/table-model';
 import { VariableStore } from '../../config';
 export declare class TableElement extends ConditionalDynamicDisplayElement {
     readonly model: TableModel;
-    constructor(element: HTMLElement, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore);
+    constructor(element: HTMLElement, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, signalRAppId: string);
 }

package/elements/table/table-element.js

@@ -1,6 +1,6 @@
 import { ConditionalDynamicDisplayElement } from '../base/conditional-dynamic-display-element';
 export class TableElement extends ConditionalDynamicDisplayElement {
-    constructor(element, permissionChecker, variableCommunicator, variableStore) {
-        super(element, permissionChecker, variableCommunicator, variableStore);
+    constructor(element, permissionChecker, variableCommunicator, variableStore, signalRAppId) {
+        super(element, permissionChecker, variableCommunicator, variableStore, signalRAppId);
     }
 }

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

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"TableElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-dynamic-display-element","name":"ConditionalDynamicDisplayElement","line":6,"character":34},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":10,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":10,"character":57},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":11,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":11,"character":67}]}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"TableElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-dynamic-display-element","name":"ConditionalDynamicDisplayElement","line":6,"character":34},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":10,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":10,"character":57},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":11,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":11,"character":67},{"__symbolic":"reference","name":"string"}]}]}}}}]

package/elements/vector-graphics/ellipse-element.d.ts

@@ -5,5 +5,5 @@ import { ConditionalDynamicDisplayElement } from '../base/conditional-dynamic-di
 import { VariableStore } from '../../config';
 export declare class EllipseElement extends ConditionalDynamicDisplayElement {
     readonly model: ConditionalDynamicDisplayModel;
-    constructor(element: HTMLElement, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore);
+    constructor(element: HTMLElement, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, signalRAppId: string);
 }

package/elements/vector-graphics/ellipse-element.js

@@ -1,6 +1,6 @@
 import { ConditionalDynamicDisplayElement } from '../base/conditional-dynamic-display-element';
 export class EllipseElement extends ConditionalDynamicDisplayElement {
-    constructor(element, permissionChecker, variableCommunicator, variableStore) {
-        super(element, permissionChecker, variableCommunicator, variableStore);
+    constructor(element, permissionChecker, variableCommunicator, variableStore, signalRAppId) {
+        super(element, permissionChecker, variableCommunicator, variableStore, signalRAppId);
     }
 }

package/elements/vector-graphics/ellipse-element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"EllipseElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-dynamic-display-element","name":"ConditionalDynamicDisplayElement","line":6,"character":36},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":10,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":10,"character":57},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":11,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":11,"character":67}]}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"EllipseElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-dynamic-display-element","name":"ConditionalDynamicDisplayElement","line":6,"character":36},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":10,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":10,"character":57},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":11,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":11,"character":67},{"__symbolic":"reference","name":"string"}]}]}}}}]

package/elements/vector-graphics/poly-line-element.d.ts

@@ -6,7 +6,7 @@ import { PolyLineModel } from '../../model/poly-line/poly-line-model';
 import { VariableStore } from '../../config';
 export declare class PolyLineElement extends ConditionalDynamicDisplayElement {
     readonly model: PolyLineModel;
-    constructor(element: HTMLElement, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore);
+    constructor(element: HTMLElement, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, signalRAppId: string);
     getActualSize(): Size;
     getActualLocation(): Point;
 }