fl-web-component 2.0.0-beta.8 → 2.0.0-beta.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fl-web-component",
-  "version": "2.0.0-beta.8",
+  "version": "2.0.0-beta.9",
   "scripts": {
     "postinstall": "patch-package",
     "tip1": "仅调试本组件不涉及业务组件,请执行dev",

package/packages/components/com-flcanvas/components/entityFormatting.js

@@ -364,7 +364,9 @@ function drawLine(recordDxf, entity, group, key, configParams) {
 
     // group.add(line);
 }
+
 function drawText(recordDxf, entity, group, key, configParams) {
+
     let color=entity.color;
     let rgb=decimalToRGBHex(color);
     console.log(rgb);
@@ -374,22 +376,22 @@ function drawText(recordDxf, entity, group, key, configParams) {
         hex='#000';
     }
     let text = entity.text;
-    let fontSize=0;
-    if(key==0){
-        fontSize=entity.textHeight+0.35;
-    }else{
-        fontSize=entity.textHeight+0.35;
-    }
-
-
-    let startPoint = entity.startPoint;
-    let x = startPoint.x;
-    let y = startPoint.y;
-    let dim = new Konva.Text({
-        x: parseFloat(x),
-        y: -parseFloat(y),
+    const fontSize = entity.textHeight;
+
+    // 与 AutoCAD TEXT 一致：绕插入点对齐锚点旋转；Y 轴翻转后角度用 360°-θ
+    const insert =
+        entity.endPoint &&
+        (entity.halign !== undefined || entity.valign !== undefined)
+            ? entity.endPoint
+            : entity.startPoint;
+
+    const dim = new Konva.Text({
+        x: 0,
+        y: 0,
         text: text,
         fontSize: fontSize,
+        align: "left",
+        verticalAlign: "top",
         fill: hex,
         customColor: configParams ? configParams.color : "",
         name: key.replace(/\s*/g, ""),
@@ -399,103 +401,75 @@ function drawText(recordDxf, entity, group, key, configParams) {
         stroke: hex,
         strokeWidth:0.1,
     });
-    let width=dim.getTextWidth()
-    //let clientRect=dim.getClientRect()
-    //let clientWidth=clientRect.width;
 
-    if(entity.halign){
-        if(entity.halign==1){
-            dim.attrs.x= dim.attrs.x-(width/2);
-        }
+    if (entity.xScale) {
+        dim.scaleX(entity.xScale);
     }
 
-
-    if (entity.rotation) {
-        if(entity.rotation==90||parseInt(entity.rotation)==90||parseInt(entity.rotation)==89||parseInt(entity.rotation)==450) {
-            dim.attrs.x = parseFloat(x) - fontSize;
-        }
-        if(entity.rotation==270||parseInt(entity.rotation)==270)
-        {
-            dim.attrs.x = parseFloat(x) + fontSize;
-        }
-        if(entity.rotation==180||parseInt(entity.rotation)==180){
-            dim.attrs.y=  -parseFloat(y) - fontSize;
-        }
-        if(entity.rotation==360||parseFloat(entity.rotation)==360){
-            dim.attrs.y=  -parseFloat(y) - fontSize;
+    const tw = dim.width();
+    const th = dim.height();
+    const lh = dim.lineHeight() || 1;
+    // 用字体度量计算锚点，避免 valign=2(中线) 与 baseline 近似重合
+    let ascent = fontSize * lh * 0.8;
+    let descent = fontSize * lh * 0.2;
+    try {
+        const metrics = dim.measureSize(text || "M");
+        const mAscent =
+            metrics?.fontBoundingBoxAscent ??
+            metrics?.actualBoundingBoxAscent;
+        const mDescent =
+            metrics?.fontBoundingBoxDescent ??
+            metrics?.actualBoundingBoxDescent;
+        if (typeof mAscent === "number" && mAscent > 0) {
+            ascent = mAscent;
         }
-        if(parseInt(entity.rotation)==30||parseInt(entity.rotation)==29) {
-            //dim.attrs.x=  parseFloat(x) -200;
-
-            //console.log("rect");
-            //console.log(rect);
-            dim.attrs.y=  -parseFloat(y) - fontSize*0.85;
-            dim.attrs.x = parseFloat(x) - fontSize*0.85;
-            if(text.length>9){
-                let width=dim.getTextWidth()
-                //let clientRect=dim.getClientRect()
-                //let clientWidth=clientRect.width;
-                dim.attrs.y=  -parseFloat(y) +fontSize;
-                if(entity.halign){
-                    if(entity.halign==1){
-                        dim.attrs.x= dim.attrs.x-(width/2);
-                    }
-
-                }
-                if (entity.valign === 3) {          // Middle
-                    dim.attrs.x= dim.attrs.x+1;
-                    dim.attrs.y = -parseFloat(y) +fontSize*1.8 ;
-                }
-            }else{
-                if (entity.valign === 3) {          // Middle
-                    dim.attrs.x= dim.attrs.x+1;
-                    dim.attrs.y = -parseFloat(y)  ;
-                }
-            }
-        }
-        if(parseInt(entity.rotation)==330||parseInt(entity.rotation)==329) {
-            //dim.attrs.x=  parseFloat(x) -200;
-
-            //console.log("rect");
-            //console.log(rect);
-            dim.attrs.y=  -parseFloat(y) -fontSize;
-            dim.attrs.x = parseFloat(x) +0.5;
+        if (typeof mDescent === "number" && mDescent >= 0) {
+            descent = mDescent;
         }
-        if(parseInt(entity.rotation)==60||parseInt(entity.rotation)==60) {
-            //dim.attrs.x=  parseFloat(x) -200;
-
-            //console.log("rect");
-            //console.log(rect);
-            dim.attrs.y=  -parseFloat(y) ;
-            dim.attrs.x = parseFloat(x) -fontSize;
-        }
-
+    } catch (e) {
+        // ignore
+    }
+    const baselineOffset = ascent;
 
-        // dim.attrs.y=  -parseFloat(y)+ fontSize*0.8;
+    const halign = entity.halign != null ? Number(entity.halign) : 0;
+    const valign = entity.valign != null ? Number(entity.valign) : 0;
 
-        dim.attrs.rotation = 360-entity.rotation ;
+    let anchorX = 0;
+    if (halign === 1 || halign === 4) {
+        anchorX = tw / 2;
+    } else if (halign === 2) {
+        anchorX = tw;
+    }
 
-    }else{
+    let anchorY = baselineOffset;
+    if (valign === 3) {
+        anchorY = 0;
+    } else if (valign === 2) {
+        // DXF Middle: 使用字形上下边界中心，而不是 Konva 文本框中心
+        anchorY = (ascent + descent) / 2;
+    } else if (valign === 1) {
+        anchorY = ascent + descent;
 
-        // 支持 DXF 垂直对齐（valign），仅在未旋转时按插入点对齐
-        if (entity.valign === 2) {          // Middle
-            dim.attrs.y = -parseFloat(y) - fontSize / 2;
-        } else if (entity.valign === 3) {   // Top
-            dim.attrs.y = -parseFloat(y);
-        } else {                            // Baseline / Bottom 或未设置，保持原逻辑
-            dim.attrs.y = -parseFloat(y) - fontSize;
-        }
-    }
-    if (entity.xScale) {
-        dim.attrs.fontSize =(fontSize+0.35)* entity.xScale;
     }
 
+    dim.x(-anchorX);
+    dim.y(-anchorY);
 
+    const rotation = Number(entity.rotation || 0);
+    const g = new Konva.Group({
+        x: parseFloat(insert.x),
+        y: -parseFloat(insert.y),
+        rotation: 360 - rotation,
+        name: key.replace(/\s*/g, ""),
+        entityId: key,
+        visible: configParams ? configParams.visible : true,
+        customColor: configParams ? configParams.color : "",
+    });
+    g.add(dim);
 
-    //dim.attrs.x= dim.attrs.x-parseFloat(2);
     group.push({
         "type":'text',
-        'obj':dim,
+        'obj': g,
     })
     // group.add(dim);
 }