fix(components): 🐛 setting both showAngleLabel and showDistanceLabel …

…to false, results in an error closed #518
zouyaoji · Feb 28, 2024 · d577b2a · d577b2a
1 parent cdf15f2
commit d577b2a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/packages/composables/use-drawing/use-drawing-polyline.ts b/packages/composables/use-drawing/use-drawing-polyline.ts
@@ -294,7 +294,9 @@ export default function (props, ctx, cmpName: string) {
           if (defined(positionWindow)) {
             const l = (startPositionWindow.y - positionWindow.y) / (positionWindow.x - startPositionWindow.x)
             if (labels[i - 1] !== labelTotalLength) {
-              labels[i - 1].horizontalOrigin = 0 < l ? HorizontalOrigin.LEFT : HorizontalOrigin.RIGHT
+              if (defined(labels[i - 1]?.horizontalOrigin)) {
+                labels[i - 1].horizontalOrigin = 0 < l ? HorizontalOrigin.LEFT : HorizontalOrigin.RIGHT
+              }
             }
 
             if (positionWindow.y < startY) {

diff --git a/packages/composables/use-drawing/use-drawing-segment.ts b/packages/composables/use-drawing/use-drawing-segment.ts
@@ -532,7 +532,9 @@ export default function (props, ctx, cmpName: string) {
             const l = (startPositionWindow.y - positionWindow.y) / (positionWindow.x - startPositionWindow.x)
             const label = labels[i - 1]
             if (label && label !== labelTotalLength) {
-              label.horizontalOrigin = 0 < l ? HorizontalOrigin.LEFT : HorizontalOrigin.RIGHT
+              if (defined(label?.horizontalOrigin)) {
+                label.horizontalOrigin = 0 < l ? HorizontalOrigin.LEFT : HorizontalOrigin.RIGHT
+              }
             }
 
             if (positionWindow.y < startY) {