fix: 空 path 清除覆盖物并置为 null, 下一次不为空时无法正确显示

yue1123 · Jun 3, 2023 · fe37570 · fe37570
1 parent 60f5234
commit fe37570
Showing 1 changed file with 22 additions and 14 deletions.
diff --git a/packages/components/overlay/polyline/index.vue b/packages/components/overlay/polyline/index.vue
@@ -92,8 +92,12 @@
     'lineupdate'
   ])
   const { ready } = useLifeCycle()
-  let polyline: BMapGL.Polyline
+  let polyline: BMapGL.Polyline | null
   useBaseMapEffect((map: BMapGL.Map) => {
+    const clear = () => {
+      polyline && map.removeOverlay(polyline)
+      polyline = null
+    }
     const init = () => {
       if (!props.path || !props.path.length)
         return __DEV__ && warn('Polyline props path is required or not empty array')
@@ -133,11 +137,11 @@
     watch(
       () => props.path,
       callWhenDifferentValue((n) => {
-        polyline 
-          ? n.length
-            ? setPath(n)
-            : map.removeOverlay(polyline)
-          : init()
+        if (polyline) {
+          n.length ? setPath(n) : clear()
+        } else {
+          init()
+        }
       }),
       {
         deep: true
@@ -150,7 +154,7 @@
     watch(() => props.enableMassClear, setMassClear)
     watch(() => props.enableEditing, setEditing)
 
-    return () => map.removeOverlay(polyline)
+    return clear
   })
 
   provide('getOverlayInstance', () => polyline)
@@ -160,26 +164,30 @@
   }
 
   function setPath(path: Point[]) {
-    polyline.setPath(pathPointsToMapPoints(path))
+    polyline && polyline.setPath(pathPointsToMapPoints(path))
   }
 
   function setStrokeColor(color: string): void {
-    polyline.setStrokeColor(color)
+    polyline && polyline.setStrokeColor(color)
   }
   function setStrokeOpacity(opacity: number): void {
-    polyline.setStrokeOpacity(opacity)
+    polyline && polyline.setStrokeOpacity(opacity)
   }
   function setStrokeWeight(weight: number): void {
-    polyline.setStrokeWeight(weight)
+    polyline && polyline.setStrokeWeight(weight)
   }
   function setStrokeStyle(style: StrokeStyle): void {
-    polyline.setStrokeStyle(style)
+    polyline && polyline.setStrokeStyle(style)
   }
   function setMassClear(enableMassClear: boolean): void {
-    enableMassClear ? polyline!.enableMassClear() : polyline!.disableMassClear()
+    if (polyline) {
+      enableMassClear ? polyline!.enableMassClear() : polyline!.disableMassClear()
+    }
   }
   function setEditing(enableEditing: boolean): void {
-    enableEditing ? polyline!.enableEditing() : polyline!.disableEditing()
+    if (polyline) {
+      enableEditing ? polyline!.enableEditing() : polyline!.disableEditing()
+    }
   }
   defineOptions({
     name: 'BPolyline'