@flexem/fc-gui 3.0.0-alpha.116 → 3.0.0-alpha.118

package/elements/base/readable-element.js

@@ -72,6 +72,7 @@ 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) {
                 elementState.state = value.state;
@@ -85,20 +86,21 @@ export class ReadableElement extends ConditionalEnableElement {
         }
         if (value.systemName === '设备状态') {
             let name = value.customStatus;
-            const language = window.abp.localization.currentCulture.name;
+            const language = ((_b = (_a = window.abp.localization) === null || _a === void 0 ? void 0 : _a.currentCulture) === null || _b === void 0 ? void 0 : _b.name) || ((_d = (_c = this.localization.localizationService) === null || _c === void 0 ? void 0 : _c.translate) === null || _d === void 0 ? void 0 : _d.currentLang);
+            const isChinese = language === 'zh-Hans' || language === 'zh';
             if (!name) {
                 switch (value.state) {
                     case 1:
-                        name = language === 'zh-Hans' ? '在线' : 'Online';
+                        name = isChinese ? '在线' : 'Online';
                         break;
                     case 3:
-                        name = language === 'zh-Hans' ? '离线' : 'Offline';
+                        name = isChinese ? '离线' : 'Offline';
                         break;
                     case 4:
-                        name = language === 'zh-Hans' ? '告警' : 'Alarming';
+                        name = isChinese ? '告警' : 'Alarming';
                         break;
                     case 5:
-                        name = language === 'zh-Hans' ? '未绑定' : 'Unbound';
+                        name = isChinese ? '未绑定' : 'Unbound';
                         break;
                     default:
                 }

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.116",
+	"version": "3.0.0-alpha.118",
 	"module": "public_api.js",
 	"typings": "public_api.d.ts",
 	"license": "UNLICENSED",