@flexem/fc-gui 3.0.0-alpha.117 → 3.0.0-alpha.119

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

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

package/communication/variable/variable-value.js

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

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":"reference","name":"string"},{"__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"},{"__symbolic":"reference","name":"number"}]}]}}}}]

package/elements/base/readable-element.js

@@ -74,14 +74,14 @@ export class ReadableElement extends ConditionalEnableElement {
     reportValueChanged(value) {
         var _a, _b, _c, _d;
         forEach(this.elementStates, elementState => {
-            if (elementState.variableName === value.variableName || elementState.variableName === value.systemName) {
+            if (elementState.variableName === value.variableName) {
                 elementState.state = value.state;
                 this.changeStates();
             }
         });
-        if (this.state === State.Normal || this.state === State.Disable
+        if (value.systemName !== '设备状态' && (this.state === State.Normal || this.state === State.Disable
             || value.variableName === this.minVariableName
-            || value.variableName === this.maxVariableName) {
+            || value.variableName === this.maxVariableName)) {
             this.updateVariableValue(value.value, value.variableName);
         }
         if (value.systemName === '设备状态') {

package/elements/base/state-control-element.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="jquery" />
+/// <reference types="jqueryui" />
 import { PermissionChecker } from '../../service';
 import { Localization } from '../../localization';
 import { VariableCommunicator, VariableState } from '../../communication';
@@ -9,7 +11,7 @@ export declare abstract class StateControlElement extends ConditionalDynamicDisp
     isEnable: boolean;
     elementStates: VariableState[];
     state: State;
-    private currentRect;
+    currentRect: JQuery;
     preState: State;
     constructor(element: HTMLElement, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, localization: Localization, signalRAppId: string);
     initState(): void;

package/elements/main-element.d.ts

@@ -37,6 +37,7 @@ export declare class MainElement {
     initElementState(): void;
     getVariableNames(): Array<string>;
     reportVariableStates(states: VariableState[]): void;
+    getVirtualDeviceIdFromRect(rectElement: any): any;
     reportVariableValues(values: VariableValue[]): void;
     dispose(): void;
     private checkIsLoaded;

package/elements/main-element.js

@@ -257,15 +257,39 @@ export class MainElement {
             });
         });
     }
+    getVirtualDeviceIdFromRect(rectElement) {
+        let current = rectElement;
+        while (current) {
+            if (current.tagName === 'FC-GUI') {
+                const virtualDeviceId = current.getAttribute('data-virtual-device-id');
+                return virtualDeviceId || null;
+            }
+            current = current.parentElement;
+        }
+        return null;
+    }
     reportVariableValues(values) {
         this.checkIsLoaded();
         each(values, value => {
             each(this.elements, e => {
+                var _a;
                 if (e instanceof ReadableElement) {
                     if ((value.variableName && (e.readVariableName === value.variableName ||
-                        e.minVariableName === value.variableName || e.maxVariableName === value.variableName)) || e.readVariableName === value.systemName) {
+                        e.minVariableName === value.variableName || e.maxVariableName === value.variableName))) {
                         e.reportValueChanged(value);
                     }
+                    if (e.readVariableName === value.systemName) {
+                        const rect = (_a = e.currentRect) === null || _a === void 0 ? void 0 : _a[0];
+                        const deviceId = this.getVirtualDeviceIdFromRect(rect);
+                        if (deviceId) {
+                            if (+deviceId === value.virtualDeviceId) {
+                                e.reportValueChanged(value);
+                            }
+                        }
+                        else {
+                            e.reportValueChanged(value);
+                        }
+                    }
                 }
             });
         });

package/elements/main-element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"MainElement":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":55,"character":43},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":56,"character":41},{"__symbolic":"reference","module":"../gui/gui-context","name":"GuiContext","line":57,"character":34},{"__symbolic":"reference","module":"../communication","name":"VariableCommunicator","line":58,"character":47},{"__symbolic":"reference","module":"../view/popup-view.service","name":"PopupViewService","line":59,"character":43},null]}],"load":[{"__symbolic":"method"}],"uniformStretch":[{"__symbolic":"method"}],"changeVideoStyle":[{"__symbolic":"method"}],"horizontalStretch":[{"__symbolic":"method"}],"initElementState":[{"__symbolic":"method"}],"getVariableNames":[{"__symbolic":"method"}],"reportVariableStates":[{"__symbolic":"method"}],"reportVariableValues":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}],"checkIsLoaded":[{"__symbolic":"method"}],"initBackground":[{"__symbolic":"method"}],"getImageEl":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"MainElement":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":55,"character":43},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":56,"character":41},{"__symbolic":"reference","module":"../gui/gui-context","name":"GuiContext","line":57,"character":34},{"__symbolic":"reference","module":"../communication","name":"VariableCommunicator","line":58,"character":47},{"__symbolic":"reference","module":"../view/popup-view.service","name":"PopupViewService","line":59,"character":43},null]}],"load":[{"__symbolic":"method"}],"uniformStretch":[{"__symbolic":"method"}],"changeVideoStyle":[{"__symbolic":"method"}],"horizontalStretch":[{"__symbolic":"method"}],"initElementState":[{"__symbolic":"method"}],"getVariableNames":[{"__symbolic":"method"}],"reportVariableStates":[{"__symbolic":"method"}],"getVirtualDeviceIdFromRect":[{"__symbolic":"method"}],"reportVariableValues":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}],"checkIsLoaded":[{"__symbolic":"method"}],"initBackground":[{"__symbolic":"method"}],"getImageEl":[{"__symbolic":"method"}]}}}}]

package/elements/shared/text/text-state-element.d.ts

@@ -16,7 +16,6 @@ export declare class TextStateElement {
     constructor(textStates: TextState[], width: number, height: number, logger: LoggerService, version?: number, faultFlickers?: IndicatorLightFaultFlicker[]);
     switchToState(stateId: number): void;
     private getforeignObjectElement;
-    private createNewForeignObjectText;
     private removeForeignObjectlement;
     private doFaultFlicker;
     private clearFlickerInterval;

package/elements/shared/text/text-state-element.js

@@ -1,5 +1,4 @@
 import { Flicker } from '../../../model';
-import { isNil } from 'lodash';
 export class TextStateElement {
     constructor(textStates, width, height, logger, version, faultFlickers) {
         this.textStates = textStates;
@@ -23,7 +22,7 @@ export class TextStateElement {
             return;
         }
         const content = textState.text.content;
-        if (content === '') {
+        if (content === '' || content == null) {
             this.removeForeignObjectlement();
             return;
         }
@@ -33,72 +32,51 @@ export class TextStateElement {
             this.logger.debug('The font is undefined.');
             return;
         }
-        const foreignObjectElement = this.getforeignObjectElement();
-        foreignObjectElement.innerHTML = '';
-        const text = this.createNewForeignObjectText(content, font);
-        foreignObjectElement.appendChild(text);
-        this.doFaultFlicker(foreignObjectElement, stateId);
+        const textElement = this.getforeignObjectElement();
+        // 清空旧内容
+        textElement.textContent = '';
+        // 设置 text-anchor 和 dominant-baseline
+        textElement.setAttribute('text-anchor', 'middle');
+        textElement.setAttribute('dominant-baseline', 'middle');
+        textElement.setAttribute('pointer-events', 'auto');
+        // 拆分换行
+        const lines = content.split('\n');
+        const fontSize = parseInt(font.fontSize, 10);
+        const lineHeight = fontSize + 4;
+        // 总高度 = 行数 * 行高
+        const totalHeight = lines.length * lineHeight;
+        // 调整文本整体垂直居中（通过 dy）
+        const startY = (this.height / 2) - (totalHeight / 2) + (lineHeight / 2);
+        // 添加每行文本
+        for (let i = 0; i < lines.length; i++) {
+            const tspan = document.createElementNS('http://www.w3.org/2000/svg', 'tspan');
+            tspan.setAttribute('x', (this.width / 2).toString());
+            tspan.setAttribute('y', startY + i * lineHeight + 'px');
+            tspan.textContent = lines[i].replace(/ /g, '\u00A0');
+            tspan.setAttribute('font-size', font.fontSize);
+            tspan.setAttribute('fill', font.color);
+            tspan.setAttribute('font-family', font.fontFamily);
+            tspan.setAttribute('font-weight', font.isBold ? 'bold' : 'normal');
+            tspan.setAttribute('font-style', font.isItalic ? 'italic' : 'normal');
+            tspan.setAttribute('text-decoration', font.isUnderline ? 'underline' : 'none');
+            tspan.setAttribute('text-anchor', 'middle');
+            tspan.setAttribute('dominant-baseline', 'middle');
+            textElement.appendChild(tspan);
+        }
+        this.doFaultFlicker(textElement, stateId);
     }
     getforeignObjectElement() {
         if (!this.textElement) {
-            this.textElement = document.createElementNS('http://www.w3.org/2000/svg', 'foreignObject');
-            this.textElement.setAttribute('width', this.width.toString());
-            this.textElement.setAttribute('height', this.height.toString());
+            this.textElement = document.createElementNS('http://www.w3.org/2000/svg', 'text');
+            this.textElement.setAttribute('x', (this.width / 2).toString());
+            this.textElement.setAttribute('y', (this.height / 2).toString());
+            this.textElement.setAttribute('text-anchor', 'middle');
+            this.textElement.setAttribute('dominant-baseline', 'middle');
+            this.textElement.setAttribute('pointer-events', 'auto'); // 确保能接收事件
             this._element.appendChild(this.textElement);
         }
         return this.textElement;
     }
-    createNewForeignObjectText(content, font) {
-        if (font && !font.fontFamily.includes(',msyh')) {
-            font.fontFamily += ',msyh';
-        }
-        const bodyDiv = document.createElement('div');
-        bodyDiv.style.textAlign = font.textAlign ? font.textAlign : 'center';
-        bodyDiv.style.userSelect = 'none';
-        bodyDiv.style.display = 'table-cell';
-        bodyDiv.style.verticalAlign = 'middle';
-        if (isNil(content)) {
-            content = '';
-        }
-        let textArray = content.toString().split('\n');
-        textArray = textArray.map(item => {
-            return item.toString().replace(/\s/g, '&nbsp;');
-        });
-        const fragment = document.createDocumentFragment();
-        for (let index = 0; index < textArray.length; index++) {
-            const textDiv = document.createElement('div');
-            textDiv.innerHTML = textArray[index] ? textArray[index] : '&nbsp;';
-            let fontString = '';
-            if (font.isItalic) {
-                fontString += 'italic ';
-            }
-            if (font.isBold) {
-                fontString += 'bold ';
-            }
-            textDiv.style.wordBreak = 'break-word';
-            textDiv.style.color = font.color;
-            let lineHeight = 0;
-            lineHeight = parseInt(font.fontSize, 10) + 5;
-            fontString += font.fontSize + 'px/' + lineHeight + 'px ' + font.fontFamily;
-            textDiv.style.font = fontString;
-            if (font.isUnderline) {
-                textDiv.style.textDecoration = 'underline';
-            }
-            fragment.appendChild(textDiv);
-        }
-        bodyDiv.appendChild(fragment);
-        const contentDiv = document.createElement('div');
-        contentDiv.style.display = 'table';
-        contentDiv.style.width = '100%';
-        contentDiv.style.height = '100%';
-        contentDiv.appendChild(bodyDiv);
-        const containerDiv = document.createElement('div');
-        containerDiv.style.overflow = 'hidden';
-        containerDiv.style.width = this.width.toString() + 'px';
-        containerDiv.style.height = this.height.toString() + 'px';
-        containerDiv.appendChild(contentDiv);
-        return containerDiv;
-    }
     removeForeignObjectlement() {
         if (this.textElement) {
             this._element.removeChild(this.textElement);

package/elements/shared/text/text-state-element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"TextStateElement":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","module":"./text-state.model","name":"TextState","line":18,"character":45}]},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","module":"../../../logger","name":"LoggerService","line":21,"character":33},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","module":"../../../model/switch-indicator-light/indicator-light-fault-flicker","name":"IndicatorLightFaultFlicker","line":23,"character":41}]}]}],"switchToState":[{"__symbolic":"method"}],"getforeignObjectElement":[{"__symbolic":"method"}],"createNewForeignObjectText":[{"__symbolic":"method"}],"removeForeignObjectlement":[{"__symbolic":"method"}],"doFaultFlicker":[{"__symbolic":"method"}],"clearFlickerInterval":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"TextStateElement":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","module":"./text-state.model","name":"TextState","line":17,"character":45}]},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","module":"../../../logger","name":"LoggerService","line":20,"character":33},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","module":"../../../model/switch-indicator-light/indicator-light-fault-flicker","name":"IndicatorLightFaultFlicker","line":22,"character":41}]}]}],"switchToState":[{"__symbolic":"method"}],"getforeignObjectElement":[{"__symbolic":"method"}],"removeForeignObjectlement":[{"__symbolic":"method"}],"doFaultFlicker":[{"__symbolic":"method"}],"clearFlickerInterval":[{"__symbolic":"method"}]}}}}]

package/package.json

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