@flexem/fc-gui 3.0.0-alpha.13 → 3.0.0-alpha.131

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

@@ -3,9 +3,12 @@ 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, signalRAppId) {
+    constructor(element, injector, permissionChecker, variableCommunicator, variableStore, graphStore, signalRAppId, textLibraryService, languageService, guiContext) {
         super(element, permissionChecker, variableCommunicator, variableStore, signalRAppId);
         this.graphStore = graphStore;
+        this.textLibraryService = textLibraryService;
+        this.languageService = languageService;
+        this.guiContext = guiContext;
         this.logger = injector.get(LOGGER_SERVICE_TOKEN);
         if (this.model.text && this.model.size) {
             const width = this.model.size.width;
@@ -26,8 +29,12 @@ export class TextElement extends ConditionalDynamicDisplayElement {
                 color: this.model.stroke,
                 textAlign: this.model.textAlign
             };
-            const textElement = new TextElementModal(this.model.text, font, width, height);
-            this.$element.append(textElement.Element);
+            // 获取显示文本（支持文本库）
+            const displayText = this.getDisplayText();
+            this.textElementModal = new TextElementModal(displayText, font, width, height);
+            this.$element.append(this.textElementModal.Element);
+            // 订阅语种变化
+            this.subscribeLanguageChange();
         }
         else {
             this.handleTextValue();
@@ -37,10 +44,96 @@ export class TextElement extends ConditionalDynamicDisplayElement {
         }
     }
     dispose() {
+        // 取消语种变化订阅
+        if (this.languageChangeSubscription) {
+            this.languageChangeSubscription.unsubscribe();
+            this.languageChangeSubscription = undefined;
+        }
         if (this.$element) {
             this.$element.remove();
         }
     }
+    /**
+     * 订阅语种变化事件
+     * 当设备的语种ID改变时，重新渲染文本
+     */
+    subscribeLanguageChange() {
+        // 只有使用文本库时才需要订阅语种变化
+        if (!this.model.textLibrary || this.model.textLibrary.labelType !== 'textLibrary') {
+            return;
+        }
+        if (this.guiContext && this.guiContext.languageChanged$) {
+            this.languageChangeSubscription = this.guiContext.languageChanged$.subscribe(() => {
+                // 重新渲染文本
+                this.reRenderText();
+            });
+        }
+    }
+    /**
+     * 重新渲染文本
+     */
+    reRenderText() {
+        if (!this.textElementModal || !this.model.size) {
+            return;
+        }
+        // 获取新的显示文本
+        const displayText = this.getDisplayText();
+        // 直接更新文本内容，而不是重新创建元素
+        this.textElementModal.updateText(displayText);
+    }
+    /**
+     * 获取显示文本
+     * 如果配置了文本库，则从文本库中获取对应语种的文本
+     * 否则返回默认文本
+     */
+    getDisplayText() {
+        var _a, _b, _c, _d, _e, _f;
+        // 检查是否使用文本库
+        if (this.model.textLibrary && this.model.textLibrary.labelType === 'textLibrary') {
+            const textLibraryId = this.model.textLibrary.selectedTextLibraryItem;
+            const textItem = this.model.textLibrary.selectedTextItem;
+            if (textLibraryId && textItem && this.textLibraryService) {
+                // 获取文本库数据
+                const textLibraryData = this.textLibraryService.getTextLibraryById(typeof textLibraryId === 'string' ? parseInt(textLibraryId, 10) : textLibraryId);
+                if (textLibraryData && textLibraryData.data) {
+                    // 查找对应的文本条目
+                    const textEntry = textLibraryData.data.find(entry => entry.key === textItem.toString());
+                    if (textEntry) {
+                        // 获取当前语种ID
+                        const currentLanguageId = (_c = (_b = (_a = this.guiContext) === null || _a === void 0 ? void 0 : _a.getCurrentLanguageId) === null || _b === void 0 ? void 0 : _b.call(_a)) !== null && _c !== void 0 ? _c : null;
+                        // 确定要使用的语种代码（culture）
+                        let targetLanguage;
+                        const defaultLanguage = ((_d = this.languageService) === null || _d === void 0 ? void 0 : _d.getDefaultLanguage()) || 'zh-CN';
+                        if (currentLanguageId === null || currentLanguageId === undefined) {
+                            // 设备未设置当前语种，使用默认语种
+                            targetLanguage = defaultLanguage;
+                        }
+                        else {
+                            // 设备已设置当前语种，获取对应的语种代码
+                            const currentLanguage = (_f = (_e = this.guiContext) === null || _e === void 0 ? void 0 : _e.getLanguageCultureById) === null || _f === void 0 ? void 0 : _f.call(_e, currentLanguageId);
+                            if (currentLanguage) {
+                                targetLanguage = currentLanguage;
+                            }
+                            else {
+                                // 无法获取语种代码，使用默认语种
+                                targetLanguage = defaultLanguage;
+                            }
+                        }
+                        // 返回对应语种的文本
+                        if (textEntry.cultures && textEntry.cultures[targetLanguage]) {
+                            return textEntry.cultures[targetLanguage];
+                        }
+                        // 如果没有对应语种，返回空字符串
+                        return '';
+                    }
+                }
+            }
+            // 文本库配置但未找到数据，返回空字符串
+            return '';
+        }
+        // 默认返回文本内容
+        return this.model.text || '';
+    }
     handleTextValue() {
         const allText = this.$element.find('text');
         for (let i = 0; i < allText.length; i++) {

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},{"__symbolic":"reference","name":"string"}]}],"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":12,"character":33},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":19,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":19,"character":48},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":19,"character":77},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":20,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":20,"character":67},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":20,"character":111},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"../../service","name":"TextLibraryService","line":22,"character":46},{"__symbolic":"reference","module":"../../service","name":"LanguageService","line":23,"character":43},{"__symbolic":"reference","module":"../../gui/gui-context","name":"GuiContext","line":24,"character":38}]}],"dispose":[{"__symbolic":"method"}],"subscribeLanguageChange":[{"__symbolic":"method"}],"reRenderText":[{"__symbolic":"method"}],"getDisplayText":[{"__symbolic":"method"}],"handleTextValue":[{"__symbolic":"method"}],"initGraph":[{"__symbolic":"method"}]}}}}]

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

@@ -15,4 +15,5 @@ export declare class BitSwitchOperator implements SwitchOperator {
     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

@@ -72,6 +72,8 @@ export class BitSwitchOperator {
                     }
                 }
                 break;
+            case BitSwitchOperation.Restoration:
+                break;
             default:
                 throw new Error(`Unknown BitSwitchOperation:${settings.operation}`);
         }
@@ -85,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},{"__symbolic":"reference","name":"string"}]}],"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/switch-indicator-light-element.d.ts

@@ -3,15 +3,19 @@ import { BsModalService } from 'ngx-bootstrap/modal';
 import { GraphStore, VariableStore } from '../../config';
 import { Localization } from '../../localization';
 import { SwitchIndicatorLight } from '../../model';
-import { PermissionChecker, OperationRecordService } from '../../service';
+import { PermissionChecker, OperationRecordService, TextLibraryService, LanguageService } from '../../service';
 import { VariableCommunicator } from '../../communication';
 import { ConditionalEnableElement } from '../base/conditional-enable-element';
 import { SecurityChecker } from '../../security';
+import { GuiContext } from '../../gui/gui-context';
 export declare class SwitchIndicatorLightElement extends ConditionalEnableElement {
     private readonly modalService;
     private readonly graphStore;
     private readonly operationRecordService;
     private readonly securityChecker;
+    private readonly textLibraryService?;
+    private readonly languageService?;
+    private readonly guiContext?;
     protected readonly model: SwitchIndicatorLight;
     private readonly logger;
     private switchOperator;
@@ -19,13 +23,25 @@ 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, signalRAppId: string);
+    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, textLibraryService?: TextLibraryService, languageService?: LanguageService, guiContext?: GuiContext);
+    handleMouseUp(): void;
+    private initOnDocMouseUpEvent;
     private checkElementPassword;
     private doSwitchOperator;
+    private writeValue;
     private initSwitchOperator;
     private initIndictorLightOperator;
     private currentStateIdChange;
     private switchToState;
     private initGraphAndText;
+    /**
+     * 释放资源
+     */
+    dispose(): void;
     private checkState;
 }

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,26 @@ 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, signalRAppId) {
+    constructor(element, injector, modalService, variableCommunicator, graphStore, permissionChecker, operationRecordService, securityChecker, variableStore, localization, signalRAppId, textLibraryService, languageService, guiContext) {
         super(element, permissionChecker, variableCommunicator, variableStore, localization, signalRAppId);
         this.modalService = modalService;
         this.graphStore = graphStore;
         this.operationRecordService = operationRecordService;
         this.securityChecker = securityChecker;
+        this.textLibraryService = textLibraryService;
+        this.languageService = languageService;
+        this.guiContext = guiContext;
+        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', () => {
+            const isMobile = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i);
+            this.rootElement.on(this.isMobileMode && isMobile ? 'touchstart' : 'mousedown', () => {
                 if (!this.isInitialized) {
                     return;
                 }
@@ -43,31 +50,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.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 && isMobile ? 'touchend' : 'mouseup', () => {
+                this.handleMouseUp();
+                d3.event.stopPropagation();
+            });
+            this.initOnDocMouseUpEvent();
         }
         this.initGraphAndText();
         if (this.model.useIndicatorLight) {
@@ -77,19 +92,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.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,12 +164,27 @@ 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, this.signalRAppId);
+                this.isBitRestoration = settings.settings.operation === BitSwitchOperation.Restoration;
                 break;
             case SwitchType.Word:
                 this.switchOperator =
@@ -168,9 +241,31 @@ export class SwitchIndicatorLightElement extends ConditionalEnableElement {
             this.graphStateElement = new GraphStateElement(this.model.graphSetting, width, height, this.graphStore, this.logger, this.model.version, this.model.states);
             this.$element.append(this.graphStateElement.Element);
         }
-        this.textStateElement = new TextStateElement(this.model.states, width, height, this.logger, this.model.version, this.model.states);
+        this.textStateElement = new TextStateElement(this.model.states, width, height, this.logger, this.model.version, this.model.states, this.model.textLibrary, this.textLibraryService, this.languageService, this.guiContext);
         this.$element.append(this.textStateElement.Element);
     }
+    /**
+     * 释放资源
+     */
+    dispose() {
+        // 释放文本元素资源（取消语种变化订阅等）
+        if (this.textStateElement) {
+            this.textStateElement.dispose();
+        }
+        // 释放指示灯操作器资源
+        if (this.indicatorLightOperator) {
+            // indicatorLightOperator 可能有自己的dispose方法
+        }
+        // 清除定时器
+        if (this.restorationTimer) {
+            clearTimeout(this.restorationTimer);
+            this.restorationTimer = undefined;
+        }
+        // 移除事件监听
+        if (this.onDocMouseUp) {
+            document.removeEventListener(this.isMobileMode ? 'touchend' : 'mouseup', this.onDocMouseUp);
+        }
+    }
     checkState() {
         if (!this.model.states) {
             throw new Error('The switch indicator light\'s states is undefined.');

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},{"__symbolic":"reference","name":"string"}]}],"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":33,"character":49},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":51,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":52,"character":18},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":53,"character":39},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":54,"character":30},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":55,"character":37},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":56,"character":27},{"__symbolic":"reference","module":"../../service","name":"OperationRecordService","line":57,"character":49},{"__symbolic":"reference","module":"../../security","name":"SecurityChecker","line":58,"character":42},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":59,"character":23},{"__symbolic":"reference","module":"../../localization","name":"Localization","line":60,"character":22},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"../../service","name":"TextLibraryService","line":62,"character":46},{"__symbolic":"reference","module":"../../service","name":"LanguageService","line":63,"character":43},{"__symbolic":"reference","module":"../../gui/gui-context","name":"GuiContext","line":64,"character":38}]}],"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"}],"dispose":[{"__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-switch-operator.d.ts

@@ -14,4 +14,5 @@ export declare class WordSwitchOperator implements SwitchOperator {
     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

@@ -66,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},{"__symbolic":"reference","name":"string"}]}],"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/video/video-element.d.ts

@@ -16,6 +16,9 @@ export declare class VideoElement extends ConditionalDisplayElement {
     private videoId;
     private isShow;
     private videoPlayer;
+    private refreshTimer;
+    private isFullscreen;
+    private videoUrl;
     constructor(element: HTMLElement, injector: Injector, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, videoService: VideoService, guiSize: Size, svgRootClass: string, signalRAppId: string);
     dispose(): void;
     hide(): void;
@@ -24,4 +27,5 @@ export declare class VideoElement extends ConditionalDisplayElement {
     private initVideo;
     private addVideoAddressToolTip;
     private setAndroidVideo;
+    private setIosVideo;
 }