@flexem/fc-gui 3.0.0-alpha.163 → 3.0.0-alpha.164

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

@@ -77,7 +77,7 @@ export class TextElementModal {
             lineHeight = parseInt(font.fontSize, 10) + 5;
             fontString += font.fontSize + '/' + lineHeight.toString() + 'px ' + font.fontFamily;
             textDiv.style.cssText = `color: ${font.color};word-break: break-all;font: ${fontString};text-align: ${textAlign};`;
-            if (font.isUnderline) {
+            if (font.isUnderline && content.length > 0) {
                 textDiv.style.textDecoration = 'underline';
             }
             const spanText = document.createElement('span');

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

@@ -45,6 +45,8 @@ export declare class TextStateElement {
     private clearFlickerInterval;
     /**
      * 获取指定状态在当前语种下的字体样式
+     * fontStyleCultures 中保存的对象含 fontStyle 字符串但无 isBold/isItalic/fontFamily，
+     * 此处从 fontStyle 解析这三个字段后返回
      */
     private getFontForState;
     /**

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

@@ -44,10 +44,23 @@ export class TextStateElement {
             return;
         }
         const textElement = this.getforeignObjectElement();
-        // 设置 text-anchor 和 dominant-baseline
-        textElement.setAttribute('text-anchor', 'middle');
-        textElement.setAttribute('dominant-baseline', 'middle');
         textElement.setAttribute('pointer-events', 'auto');
+        // 根据 textAlign 计算 SVG text-anchor 和 x 坐标
+        const textAlign = font.textAlign || 'center';
+        let textAnchor;
+        let anchorX;
+        if (textAlign === 'left') {
+            textAnchor = 'start';
+            anchorX = 0;
+        }
+        else if (textAlign === 'right') {
+            textAnchor = 'end';
+            anchorX = this.width;
+        }
+        else {
+            textAnchor = 'middle';
+            anchorX = this.width / 2;
+        }
         // 拆分换行
         const lines = content.split('\n');
         const fontSize = parseInt(font.fontSize, 10);
@@ -65,16 +78,16 @@ export class TextStateElement {
                 textElement.appendChild(tspan);
             }
             tspan.setAttribute('display', 'inline');
-            tspan.setAttribute('x', (this.width / 2).toString());
+            tspan.setAttribute('x', anchorX.toString());
             tspan.setAttribute('y', startY + i * lineHeight + 'px');
-            tspan.textContent = lines[i].replace(/ /g, '\u00A0');
+            tspan.textContent = lines[i].replace(/ /g, ' ');
             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('text-anchor', textAnchor);
             tspan.setAttribute('dominant-baseline', 'middle');
         }
         // 隐藏多余的 tspan（不删除）
@@ -132,7 +145,7 @@ export class TextStateElement {
         }
     }
     doFaultFlicker(textElement, stateId) {
-        if (this.version > 3 && this.faultFlickers) {
+        if (this.version != null && this.version > 3 && this.faultFlickers) {
             this.clearFlickerInterval(textElement);
             const faultFlicker = this.faultFlickers.find(t => t.id === stateId);
             if (faultFlicker && faultFlicker.faultFlicker) {
@@ -161,6 +174,8 @@ export class TextStateElement {
     }
     /**
      * 获取指定状态在当前语种下的字体样式
+     * fontStyleCultures 中保存的对象含 fontStyle 字符串但无 isBold/isItalic/fontFamily，
+     * 此处从 fontStyle 解析这三个字段后返回
      */
     getFontForState(stateId, defaultFont) {
         if (!this.fontStyleCultures) {
@@ -181,7 +196,17 @@ export class TextStateElement {
         };
         const targetLanguage = getTargetLanguage();
         if (this.fontStyleCultures[stateKey][targetLanguage]) {
-            return this.fontStyleCultures[stateKey][targetLanguage];
+            const culturedFont = this.fontStyleCultures[stateKey][targetLanguage];
+            if (culturedFont.fontStyle) {
+                const fs = culturedFont.fontStyle;
+                const isBold = fs.indexOf('bold') !== -1;
+                const isItalic = fs.indexOf('Italic') !== -1;
+                const parts = fs.split(' ');
+                const familyIndex = (isBold ? 1 : 0) + (isItalic ? 1 : 0) + 1;
+                const fontFamily = parts.length > familyIndex ? parts[familyIndex] : null;
+                return Object.assign(Object.assign({}, culturedFont), { isBold, isItalic, fontFamily });
+            }
+            return culturedFont;
         }
         return defaultFont;
     }

package/elements/view-operation/view-operation.element.js

@@ -233,14 +233,19 @@ export class ViewOperationElement extends ConditionalEnableElement {
         const targetLanguage = getTargetLanguage();
         if (this.model.fontStyleCultures && this.model.fontStyleCultures[targetLanguage]) {
             const style = this.model.fontStyleCultures[targetLanguage];
+            const fs = style.fontStyle || '';
+            const isBold = fs.indexOf('bold') !== -1;
+            const isItalic = fs.indexOf('Italic') !== -1;
+            const parts = fs.split(' ');
+            const familyIndex = (isBold ? 1 : 0) + (isItalic ? 1 : 0) + 1;
+            const fontFamily = parts.length > familyIndex ? parts[familyIndex] : null;
             return {
                 isUnderline: style.isUnderline,
-                isBold: style.isBold,
-                isItalic: style.isItalic,
+                isBold,
+                isItalic,
                 fontSize: style.fontSize,
-                fontFamily: style.fontFamily || 'msyh',
-                color: style.color,
-                textAlign: style.textAlign
+                fontFamily: fontFamily || 'msyh',
+                color: style.color
             };
         }
         return Object.assign(Object.assign({}, this.model.label.font), { fontFamily: this.model.label.font.fontFamily || 'msyh' });

package/model/shared/text/font.d.ts

@@ -5,6 +5,6 @@ export interface Font {
     readonly fontSize: string;
     fontFamily?: string;
     readonly color: string;
-    readonly textAlign: string;
+    readonly textAlign?: string;
     readonly fontStyle?: string;
 }

package/package.json

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