Merge branches 'dev' and 'dev' of https://github.com/dromara/newcar i…

…nto dev
dromara · Jun 15, 2024 · 98bb1f0 · 98bb1f0
2 parents b37ab59 + a1e6dbc
commit 98bb1f0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/packages/basic/src/widgets/circle.ts b/packages/basic/src/widgets/circle.ts
@@ -3,7 +3,7 @@ import { Arc } from './arc'
 
 export class Circle extends Arc {
   /**
-   * Create a cirle
+   * Create a circle
    * extend from Arc
    * @param radius
    * @param options

diff --git a/packages/basic/src/widgets/polygon.ts b/packages/basic/src/widgets/polygon.ts
@@ -27,13 +27,8 @@ export class Polygon extends Path {
     this.path.addPoly(this.points.flat(), true)
 
     changed(this.points, (points) => {
-      this.path.moveTo(0, 0)
-      for (const [index, point] of points.entries()) {
-        if (index === 0)
-          this.path.moveTo(...point)
-        else this.path.lineTo(...point)
-      }
-      this.path.close()
+      this.path.rewind()
+      this.path.addPoly(points.flat(), true)
     })
   }
 }
diff --git a/packages/basic/src/widgets/textGroup.ts b/packages/basic/src/widgets/textGroup.ts
@@ -188,7 +188,7 @@ export class TextGroup extends Figure {
 
       paint.setColor(style.color)
       this.builder.pushPaintStyle(style, paint, bg)
-      this.builder.addText(text.text)
+      this.builder.addText(text.text.value)
       // TODO: Stroke and Fill
     }