huweili-cesium 1.2.46 → 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
+
+      if (!toolbarWidth || !toolbarHeight || !viewportWidth || !viewportHeight) return false
 
-      const maxLeft = window.innerWidth - toolbar.offsetWidth
-      const maxTop = window.innerHeight - toolbar.offsetHeight
+      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)
+        }
       })
     }
 
@@ -982,29 +995,9 @@ export function basicConfig() {
       })
     }
 
-    const findExpandButton = () => {
-      return document.querySelector('[data-toolbar-expand-toggle="true"]')
-        || document.querySelector('[title="展开/折叠 工具栏"]')
-        || document.querySelector('[title="展开"]')
-        || document.querySelector('[title="收缩"]')
-    }
-
-    const setupBySelector = () => {
-      const btn = findExpandButton()
-      if (btn) setupToolbarDrag(btn)
-    }
-
-    if (typeof window !== 'undefined' && typeof document !== 'undefined') {
-      window.requestAnimationFrame(setupBySelector)
-      window.setTimeout(setupBySelector, 300)
-    }
-
     return {
       toggleExpand: (_viewer, btn) => {
-        if (btn) {
-          btn.dataset.toolbarExpandToggle = 'true'
-          setupToolbarDrag(btn)
-        }
+        if (btn) setupToolbarDrag(btn)
       },
       setupToolbarDrag,
       applyToggleExpand,

package/package.json

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