@flexem/fc-gui 3.0.0-alpha.147 → 3.0.0-alpha.149

package/elements/scroll-alarm/scroll-alarm-element.d.ts

@@ -42,6 +42,8 @@ export declare class ScrollAlarmElement extends ConditionalDynamicDisplayElement
     private initDisplayContainer;
     private _buildFontAttrs;
     private _createSvgTextNode;
+    private _getSvgTextWidth;
+    private _updateUnderlineWidth;
     private renderNewPage;
     private _rebaseTextNodes;
     private removeOldestPage;

package/elements/scroll-alarm/scroll-alarm-element.js

@@ -256,9 +256,9 @@ export class ScrollAlarmElement extends ConditionalDynamicDisplayElement {
         clipPath.setAttribute('id', clipId);
         const clipRect = document.createElementNS('http://www.w3.org/2000/svg', 'rect');
         clipRect.setAttribute('x', '2');
-        clipRect.setAttribute('y', '0');
+        clipRect.setAttribute('y', '1');
         clipRect.setAttribute('width', (elementWidth - 4).toString());
-        clipRect.setAttribute('height', elementHeight.toString());
+        clipRect.setAttribute('height', (elementHeight - 2).toString());
         clipPath.appendChild(clipRect);
         defs.appendChild(clipPath);
         this.$element[0].appendChild(defs);
@@ -288,8 +288,10 @@ export class ScrollAlarmElement extends ConditionalDynamicDisplayElement {
     _createSvgTextNode(textContent) {
         const elementHeight = this.model.size.height;
         const fa = this._buildFontAttrs();
+        const g = document.createElementNS('http://www.w3.org/2000/svg', 'g');
         const text = document.createElementNS('http://www.w3.org/2000/svg', 'text');
-        text.setAttribute('y', (elementHeight / 2).toString());
+        const textY = elementHeight / 2;
+        text.setAttribute('y', textY.toString());
         text.setAttribute('dominant-baseline', 'central');
         text.setAttribute('fill', fa.color);
         text.setAttribute('font-size', fa.fontSize.toString());
@@ -300,11 +302,41 @@ export class ScrollAlarmElement extends ConditionalDynamicDisplayElement {
         if (fa.isItalic) {
             text.setAttribute('font-style', 'italic');
         }
+        // 不使用 SVG text-decoration，避免跨平台下划线位置不一致（Chrome/Android 与 iOS Safari 渲染差异）
+        text.textContent = textContent;
+        g.appendChild(text);
         if (fa.isUnderline) {
-            text.setAttribute('text-decoration', 'underline');
+            // dominant-baseline: central 下，基线约在 textY + fontSize*0.35
+            // 下划线紧贴文字底部（基线下 fontSize*0.1），再加 2px 间距避免与字形粘连
+            // stroke-width 随字号缩放，参照浏览器标准约 fontSize/14，最小 1px
+            const lineY = textY + Math.round(fa.fontSize * 0.35) + Math.round(fa.fontSize * 0.1) + 2;
+            const strokeWidth = Math.max(1, Math.round(fa.fontSize / 14));
+            const underline = document.createElementNS('http://www.w3.org/2000/svg', 'line');
+            underline.setAttribute('y1', lineY.toString());
+            underline.setAttribute('y2', lineY.toString());
+            underline.setAttribute('x1', '0');
+            underline.setAttribute('x2', '0'); // 宽度在 append 后由 _updateUnderlineWidth 设置
+            underline.setAttribute('stroke', fa.color);
+            underline.setAttribute('stroke-width', strokeWidth.toString());
+            underline.setAttribute('class', 'text-underline');
+            g.appendChild(underline);
+        }
+        return g;
+    }
+    _getSvgTextWidth(g) {
+        const text = g.querySelector('text');
+        if (!text) {
+            return 100;
+        }
+        return text.getComputedTextLength
+            ? text.getComputedTextLength()
+            : (text.getBBox ? text.getBBox().width : 100);
+    }
+    _updateUnderlineWidth(g, width) {
+        const underline = g.querySelector('line.text-underline');
+        if (underline) {
+            underline.setAttribute('x2', width.toString());
         }
-        text.textContent = textContent;
-        return text;
     }
     renderNewPage(pageData) {
         const GAP = 80;
@@ -336,11 +368,10 @@ export class ScrollAlarmElement extends ConditionalDynamicDisplayElement {
                 contentParts.push(stateMap[alarm.state] || (isChinese ? '触发/未确认' : 'Triggered/Unconfirmed'));
             }
             const textNode = this._createSvgTextNode(contentParts.join(' '));
-            textNode.setAttribute('x', xOffset.toString());
+            textNode.setAttribute('transform', `translate(${xOffset}, 0)`);
             this.allAlarmsContainer.appendChild(textNode);
-            const textWidth = textNode.getComputedTextLength
-                ? textNode.getComputedTextLength()
-                : (textNode.getBBox ? textNode.getBBox().width : 100);
+            const textWidth = this._getSvgTextWidth(textNode);
+            this._updateUnderlineWidth(textNode, textWidth);
             xOffset += textWidth + GAP;
             pageWidth += (pageWidth > 0 ? GAP : 0) + textWidth;
         });
@@ -351,10 +382,9 @@ export class ScrollAlarmElement extends ConditionalDynamicDisplayElement {
         const GAP = 80;
         let x = 0;
         Array.from(this.allAlarmsContainer.children).forEach(node => {
-            node.setAttribute('x', x.toString());
-            const w = node.getComputedTextLength
-                ? node.getComputedTextLength()
-                : (node.getBBox ? node.getBBox().width : 100);
+            node.setAttribute('transform', `translate(${x}, 0)`);
+            const w = this._getSvgTextWidth(node);
+            this._updateUnderlineWidth(node, w);
             x += w + GAP;
         });
         const newTotal = x > 0 ? x - GAP : 0;
@@ -371,14 +401,13 @@ export class ScrollAlarmElement extends ConditionalDynamicDisplayElement {
         elementsToRemove.forEach(el => {
             this.allAlarmsContainer.removeChild(el);
         });
-        // SVG text 的 x 坐标从 0 重排（DOM删除后剩余节点要重新编排 x）
+        // g 元素的 transform 从 0 重排（DOM删除后剩余节点要重新编排位置）
         const GAP = 80;
         let x = 0;
         Array.from(this.allAlarmsContainer.children).forEach(node => {
-            node.setAttribute('x', x.toString());
-            const w = node.getComputedTextLength
-                ? node.getComputedTextLength()
-                : (node.getBBox ? node.getBBox().width : 100);
+            node.setAttribute('transform', `translate(${x}, 0)`);
+            const w = this._getSvgTextWidth(node);
+            this._updateUnderlineWidth(node, w);
             x += w + GAP;
         });
         // currentLeft 补偿被移除页的宽度（含 gap），保持视觉位置不变
@@ -588,14 +617,13 @@ export class ScrollAlarmElement extends ConditionalDynamicDisplayElement {
         }
         // 创建 SVG text 节点（与真实运行模式一致，不依赖 foreignObject）
         const textNode = this._createSvgTextNode(textParts.join(' '));
-        textNode.setAttribute('x', '0');
+        textNode.setAttribute('transform', 'translate(0, 0)');
         this.currentLeft = this.model.size.width;
         this.allAlarmsContainer.setAttribute('transform', `translate(${this.currentLeft}, 0)`);
         this.allAlarmsContainer.appendChild(textNode);
-        // SVG text 宽度可直接通过 getComputedTextLength 同步获取，无需 setTimeout
-        const textWidth = textNode.getComputedTextLength
-            ? textNode.getComputedTextLength()
-            : (textNode.getBBox ? textNode.getBBox().width : 200);
+        // SVG text 宽度通过内部 text 元素的 getComputedTextLength 获取
+        const textWidth = this._getSvgTextWidth(textNode);
+        this._updateUnderlineWidth(textNode, textWidth);
         this.totalWidth = textWidth;
         this.pageWidths.push(textWidth);
         // 启动滚动（autoCycle 只控制是否循环，不控制是否滚动）

package/elements/scroll-alarm/scroll-alarm-element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"ScrollAlarmElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-dynamic-display-element","name":"ConditionalDynamicDisplayElement","line":17,"character":40},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":52,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":53,"character":18},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":54,"character":27},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":55,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":56,"character":23},{"__symbolic":"reference","module":"../../config","name":"AlarmsStore","line":57,"character":38},{"__symbolic":"reference","name":"string"}]}],"dispose":[{"__symbolic":"method"}],"getAlarmData":[{"__symbolic":"method"}],"initDisplayContainer":[{"__symbolic":"method"}],"_buildFontAttrs":[{"__symbolic":"method"}],"_createSvgTextNode":[{"__symbolic":"method"}],"renderNewPage":[{"__symbolic":"method"}],"_rebaseTextNodes":[{"__symbolic":"method"}],"removeOldestPage":[{"__symbolic":"method"}],"scrollContent":[{"__symbolic":"method"}],"initScrolling":[{"__symbolic":"method"}],"resetToFirstPage":[{"__symbolic":"method"}],"updateQueryTimeRange":[{"__symbolic":"method"}],"setStatusAsNormal":[{"__symbolic":"method"}],"setStatusAsLoading":[{"__symbolic":"method"}],"renderStatus":[{"__symbolic":"method"}],"clearStatus":[{"__symbolic":"method"}],"renderStaticDisplay":[{"__symbolic":"method"}],"initStaticScrolling":[{"__symbolic":"method"}],"scrollStaticContent":[{"__symbolic":"method"}],"replaceCurrentScrollingContent":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"ScrollAlarmElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-dynamic-display-element","name":"ConditionalDynamicDisplayElement","line":17,"character":40},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":52,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":53,"character":18},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":54,"character":27},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":55,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":56,"character":23},{"__symbolic":"reference","module":"../../config","name":"AlarmsStore","line":57,"character":38},{"__symbolic":"reference","name":"string"}]}],"dispose":[{"__symbolic":"method"}],"getAlarmData":[{"__symbolic":"method"}],"initDisplayContainer":[{"__symbolic":"method"}],"_buildFontAttrs":[{"__symbolic":"method"}],"_createSvgTextNode":[{"__symbolic":"method"}],"_getSvgTextWidth":[{"__symbolic":"method"}],"_updateUnderlineWidth":[{"__symbolic":"method"}],"renderNewPage":[{"__symbolic":"method"}],"_rebaseTextNodes":[{"__symbolic":"method"}],"removeOldestPage":[{"__symbolic":"method"}],"scrollContent":[{"__symbolic":"method"}],"initScrolling":[{"__symbolic":"method"}],"resetToFirstPage":[{"__symbolic":"method"}],"updateQueryTimeRange":[{"__symbolic":"method"}],"setStatusAsNormal":[{"__symbolic":"method"}],"setStatusAsLoading":[{"__symbolic":"method"}],"renderStatus":[{"__symbolic":"method"}],"clearStatus":[{"__symbolic":"method"}],"renderStaticDisplay":[{"__symbolic":"method"}],"initStaticScrolling":[{"__symbolic":"method"}],"scrollStaticContent":[{"__symbolic":"method"}],"replaceCurrentScrollingContent":[{"__symbolic":"method"}]}}}}]

package/modal/write-value/write-value-modal.component.js

@@ -35,7 +35,19 @@ let WriteValueModalComponent = class WriteValueModalComponent {
         this.validate();
     }
     initData(option) {
+        var _a, _b, _c;
         this.variableName = option.variableName;
+        if (this.variableName === '当前语种ID') {
+            const language = (_c = (_b = (_a = window.abp) === null || _a === void 0 ? void 0 : _a.localization) === null || _b === void 0 ? void 0 : _b.currentLanguage) === null || _c === void 0 ? void 0 : _c.name;
+            const isChinese = language === 'zh-Hans' || language === 'zh';
+            const isTraditionalChinese = language === 'zh-Hant' || language === 'zh-TW' || language === 'zh-tw';
+            if (isTraditionalChinese) {
+                this.variableName = '當前語種ID';
+            }
+            else if (!isChinese) {
+                this.variableName = ' Current Language ID';
+            }
+        }
         this.dataType = option.dataType;
         this.fBoxDataType = option.fBoxDataType;
         this.integerDigits = option.integerDigits ? option.integerDigits : 0;

package/package.json

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