huweili-cesium 1.2.45 → 1.2.47

package/js/basis.js

@@ -874,10 +874,17 @@ export function basicConfig() {
     }
 
     const applyToolbarPosition = (toolbar, left, top) => {
-      if (!toolbar) return
+      if (!toolbar) return false
+
+      const toolbarWidth = toolbar.offsetWidth
+      const toolbarHeight = toolbar.offsetHeight
+      const viewportWidth = window.innerWidth
+      const viewportHeight = window.innerHeight
 
-      const maxLeft = window.innerWidth - toolbar.offsetWidth
-      const maxTop = window.innerHeight - toolbar.offsetHeight
+      if (!toolbarWidth || !toolbarHeight || !viewportWidth || !viewportHeight) return false
+
+      const maxLeft = viewportWidth - toolbarWidth
+      const maxTop = viewportHeight - toolbarHeight
       const nextLeft = Math.min(Math.max(left, 0), Math.max(maxLeft, 0))
       const nextTop = Math.min(Math.max(top, 0), Math.max(maxTop, 0))
 
@@ -888,6 +895,7 @@ export function basicConfig() {
       toolbar.style.bottom = 'auto'
       toolbar.style.zIndex = toolbar.style.zIndex || '9999'
       toolbar.style.margin = '0'
+      return true
     }
 
     const restoreToolbarPosition = (btn) => {
@@ -898,7 +906,12 @@ export function basicConfig() {
       if (!position) return
 
       window.requestAnimationFrame(() => {
-        applyToolbarPosition(toolbar, position.left, position.top)
+        const restored = applyToolbarPosition(toolbar, position.left, position.top)
+        if (!restored) {
+          window.setTimeout(() => {
+            applyToolbarPosition(toolbar, position.left, position.top)
+          }, 100)
+        }
       })
     }
 
@@ -918,6 +931,51 @@ export function basicConfig() {
       btn.classList.toggle('is-collapsed', !isToolbarExpanded)
     }
 
+    const startToolbarDrag = (event, btn) => {
+      const toolbar = btn?.parentElement
+      if (!toolbar) return
+
+      const startX = event.clientX
+      const startY = event.clientY
+      const rect = toolbar.getBoundingClientRect()
+      const startLeft = rect.left
+      const startTop = rect.top
+      let hasMoved = false
+
+      applyToolbarPosition(toolbar, startLeft, startTop)
+
+      const moveToolbar = (moveEvent) => {
+        const deltaX = moveEvent.clientX - startX
+        const deltaY = moveEvent.clientY - startY
+
+        if (Math.abs(deltaX) > 3 || Math.abs(deltaY) > 3) {
+          hasMoved = true
+          isToolbarDragging = true
+        }
+
+        applyToolbarPosition(toolbar, startLeft + deltaX, startTop + deltaY)
+      }
+
+      const stopDrag = () => {
+        window.removeEventListener('pointermove', moveToolbar)
+        window.removeEventListener('pointerup', stopDrag)
+        window.removeEventListener('pointercancel', stopDrag)
+
+        if (hasMoved) {
+          const currentRect = toolbar.getBoundingClientRect()
+          saveToolbarPosition(currentRect.left, currentRect.top)
+
+          window.setTimeout(() => {
+            isToolbarDragging = false
+          }, 0)
+        }
+      }
+
+      window.addEventListener('pointermove', moveToolbar)
+      window.addEventListener('pointerup', stopDrag)
+      window.addEventListener('pointercancel', stopDrag)
+    }
+
     const setupToolbarDrag = (btn) => {
       if (!btn || btn.dataset.toolbarDragReady === 'true') return
 
@@ -933,54 +991,13 @@ export function basicConfig() {
       })
 
       btn.addEventListener('pointerdown', (event) => {
-        const toolbar = btn.parentElement
-        if (!toolbar) return
-
-        const startX = event.clientX
-        const startY = event.clientY
-        const rect = toolbar.getBoundingClientRect()
-        const startLeft = rect.left
-        const startTop = rect.top
-        let hasMoved = false
-
-        applyToolbarPosition(toolbar, startLeft, startTop)
-
-        const moveToolbar = (moveEvent) => {
-          const deltaX = moveEvent.clientX - startX
-          const deltaY = moveEvent.clientY - startY
-
-          if (Math.abs(deltaX) > 3 || Math.abs(deltaY) > 3) {
-            hasMoved = true
-            isToolbarDragging = true
-          }
-
-          applyToolbarPosition(toolbar, startLeft + deltaX, startTop + deltaY)
-        }
-
-        const stopDrag = () => {
-          window.removeEventListener('pointermove', moveToolbar)
-          window.removeEventListener('pointerup', stopDrag)
-          window.removeEventListener('pointercancel', stopDrag)
-
-          if (hasMoved) {
-            const currentRect = toolbar.getBoundingClientRect()
-            saveToolbarPosition(currentRect.left, currentRect.top)
-
-            window.setTimeout(() => {
-              isToolbarDragging = false
-            }, 0)
-          }
-        }
-
-        window.addEventListener('pointermove', moveToolbar)
-        window.addEventListener('pointerup', stopDrag)
-        window.addEventListener('pointercancel', stopDrag)
+        startToolbarDrag(event, btn)
       })
     }
 
     return {
       toggleExpand: (_viewer, btn) => {
-        setupToolbarDrag(btn)
+        if (btn) setupToolbarDrag(btn)
       },
       setupToolbarDrag,
       applyToggleExpand,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "huweili-cesium",
-  "version": "1.2.45",
+  "version": "1.2.47",
   "description": "基于 Cesium 的地图工具库（无人机态势、轨迹、围栏、工具栏等）",
   "type": "module",
   "main": "./index.js",