From 9275fa5afc199c86c8fce20171c9f666dedb400e Mon Sep 17 00:00:00 2001
From: shier <3207840495@qq.com>
Date: Mon, 9 Oct 2023 15:56:39 +0800
Subject: [PATCH 1/6] modified:   src/label/labelGuideHelper.ts

---
 src/label/labelGuideHelper.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/label/labelGuideHelper.ts b/src/label/labelGuideHelper.ts
index fdb70665e1..a88ba90ee7 100644
--- a/src/label/labelGuideHelper.ts
+++ b/src/label/labelGuideHelper.ts
@@ -618,10 +618,7 @@ export function setLabelLineStyle(
             if (isLabelIgnored  // Not show when label is not shown in this state.
                 || !retrieve2(stateShow, showNormal) // Use normal state by default if not set.
             ) {
-                const stateObj = isNormal ? labelLine : (labelLine && labelLine.states[stateName]);
-                if (stateObj) {
-                    stateObj.ignore = true;
-                }
+                setLabelLineState(labelLine, true, stateName, stateModel);
                 continue;
             }
             // Create labelLine if not exists

From 0bad00c9f2c6f98526ecc85efab95a29411e054d Mon Sep 17 00:00:00 2001
From: shier <3207840495@qq.com>
Date: Mon, 9 Oct 2023 17:47:07 +0800
Subject: [PATCH 2/6] modified:   src/label/labelGuideHelper.ts

---
 src/label/labelGuideHelper.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/label/labelGuideHelper.ts b/src/label/labelGuideHelper.ts
index a88ba90ee7..c826eae44f 100644
--- a/src/label/labelGuideHelper.ts
+++ b/src/label/labelGuideHelper.ts
@@ -618,6 +618,10 @@ export function setLabelLineStyle(
             if (isLabelIgnored  // Not show when label is not shown in this state.
                 || !retrieve2(stateShow, showNormal) // Use normal state by default if not set.
             ) {
+                const stateObj = isNormal ? labelLine : (labelLine && labelLine.states[stateName]);
+                if (stateObj) {
+                    stateObj.ignore = true;
+                }
                 setLabelLineState(labelLine, true, stateName, stateModel);
                 continue;
             }

From 3412da28c24962c5b4da7b37bb6a0eaabf193a32 Mon Sep 17 00:00:00 2001
From: shier <3207840495@qq.com>
Date: Tue, 10 Oct 2023 16:58:59 +0800
Subject: [PATCH 3/6] modified:   src/label/labelGuideHelper.ts

---
 src/label/labelGuideHelper.ts | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/label/labelGuideHelper.ts b/src/label/labelGuideHelper.ts
index c826eae44f..896f511174 100644
--- a/src/label/labelGuideHelper.ts
+++ b/src/label/labelGuideHelper.ts
@@ -536,20 +536,22 @@ function setLabelLineState(
 ) {
     const isNormal = stateName === 'normal';
     const stateObj = isNormal ? labelLine : labelLine.ensureState(stateName);
-    // Make sure display.
-    stateObj.ignore = ignore;
-    // Set smooth
-    let smooth = stateModel.get('smooth');
-    if (smooth && smooth === true) {
-        smooth = 0.3;
-    }
-    stateObj.shape = stateObj.shape || {};
-    if (smooth > 0) {
-        (stateObj.shape as Polyline['shape']).smooth = smooth as number;
-    }
+    if (stateObj != undefined) {
+        // Make sure display.
+        stateObj.ignore = ignore;
+        // Set smooth
+        let smooth = stateModel.get('smooth');
+        if (smooth && smooth === true) {
+            smooth = 0.3;
+        }
+        stateObj.shape = stateObj.shape || {};
+        if (smooth > 0) {
+            (stateObj.shape as Polyline['shape']).smooth = smooth as number;
+        }
 
-    const styleObj = stateModel.getModel('lineStyle').getLineStyle();
-    isNormal ? labelLine.useStyle(styleObj) : stateObj.style = styleObj;
+        const styleObj = stateModel.getModel('lineStyle').getLineStyle();
+        isNormal ? labelLine.useStyle(styleObj) : stateObj.style = styleObj;
+    }
 }
 
 function buildLabelLinePath(path: CanvasRenderingContext2D, shape: Polyline['shape']) {
@@ -619,9 +621,6 @@ export function setLabelLineStyle(
                 || !retrieve2(stateShow, showNormal) // Use normal state by default if not set.
             ) {
                 const stateObj = isNormal ? labelLine : (labelLine && labelLine.states[stateName]);
-                if (stateObj) {
-                    stateObj.ignore = true;
-                }
                 setLabelLineState(labelLine, true, stateName, stateModel);
                 continue;
             }

From 77ef666c8fb880a6b080abe6271ac7525366f80e Mon Sep 17 00:00:00 2001
From: shier <3207840495@qq.com>
Date: Tue, 10 Oct 2023 17:12:58 +0800
Subject: [PATCH 4/6] modified:   src/label/labelGuideHelper.ts

---
 src/label/labelGuideHelper.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/label/labelGuideHelper.ts b/src/label/labelGuideHelper.ts
index 896f511174..b5a9d66538 100644
--- a/src/label/labelGuideHelper.ts
+++ b/src/label/labelGuideHelper.ts
@@ -620,7 +620,6 @@ export function setLabelLineStyle(
             if (isLabelIgnored  // Not show when label is not shown in this state.
                 || !retrieve2(stateShow, showNormal) // Use normal state by default if not set.
             ) {
-                const stateObj = isNormal ? labelLine : (labelLine && labelLine.states[stateName]);
                 setLabelLineState(labelLine, true, stateName, stateModel);
                 continue;
             }

From c984f16aaf3a2fe6e6989109ef7cede0b4df38a7 Mon Sep 17 00:00:00 2001
From: shier <3207840495@qq.com>
Date: Fri, 13 Oct 2023 10:02:23 +0800
Subject: [PATCH 5/6] modified:   src/label/labelGuideHelper.ts

---
 src/label/labelGuideHelper.ts | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/label/labelGuideHelper.ts b/src/label/labelGuideHelper.ts
index b5a9d66538..295b137825 100644
--- a/src/label/labelGuideHelper.ts
+++ b/src/label/labelGuideHelper.ts
@@ -536,22 +536,19 @@ function setLabelLineState(
 ) {
     const isNormal = stateName === 'normal';
     const stateObj = isNormal ? labelLine : labelLine.ensureState(stateName);
-    if (stateObj != undefined) {
-        // Make sure display.
-        stateObj.ignore = ignore;
-        // Set smooth
-        let smooth = stateModel.get('smooth');
-        if (smooth && smooth === true) {
-            smooth = 0.3;
-        }
-        stateObj.shape = stateObj.shape || {};
-        if (smooth > 0) {
-            (stateObj.shape as Polyline['shape']).smooth = smooth as number;
-        }
-
-        const styleObj = stateModel.getModel('lineStyle').getLineStyle();
-        isNormal ? labelLine.useStyle(styleObj) : stateObj.style = styleObj;
+    // Make sure display.
+    stateObj.ignore = ignore;
+    // Set smooth
+    let smooth = stateModel.get('smooth');
+    if (smooth && smooth === true) {
+        smooth = 0.3;
     }
+    stateObj.shape = stateObj.shape || {};
+    if (smooth > 0) {
+        (stateObj.shape as Polyline['shape']).smooth = smooth as number;
+    }
+    const styleObj = stateModel.getModel('lineStyle').getLineStyle();
+    isNormal ? labelLine.useStyle(styleObj) : stateObj.style = styleObj;
 }
 
 function buildLabelLinePath(path: CanvasRenderingContext2D, shape: Polyline['shape']) {
@@ -620,7 +617,12 @@ export function setLabelLineStyle(
             if (isLabelIgnored  // Not show when label is not shown in this state.
                 || !retrieve2(stateShow, showNormal) // Use normal state by default if not set.
             ) {
-                setLabelLineState(labelLine, true, stateName, stateModel);
+                const stateObj = isNormal ? labelLine : (labelLine && labelLine.states[stateName]);
+                if (stateObj) {
+                stateObj.ignore = true;}
+                if(!!labelLine){
+                    setLabelLineState(labelLine, true, stateName, stateModel);
+                }
                 continue;
             }
             // Create labelLine if not exists

From ce9e51abb179c714dcf50db5a3c9b20b7bddb89c Mon Sep 17 00:00:00 2001
From: shier <3207840495@qq.com>
Date: Fri, 13 Oct 2023 15:09:11 +0800
Subject: [PATCH 6/6] modified:   src/label/labelGuideHelper.ts

---
 src/label/labelGuideHelper.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/label/labelGuideHelper.ts b/src/label/labelGuideHelper.ts
index 295b137825..1177ceef09 100644
--- a/src/label/labelGuideHelper.ts
+++ b/src/label/labelGuideHelper.ts
@@ -619,8 +619,9 @@ export function setLabelLineStyle(
             ) {
                 const stateObj = isNormal ? labelLine : (labelLine && labelLine.states[stateName]);
                 if (stateObj) {
-                stateObj.ignore = true;}
-                if(!!labelLine){
+                    stateObj.ignore = true;
+                }
+                if (!!labelLine) {
                     setLabelLineState(labelLine, true, stateName, stateModel);
                 }
                 continue;