huweili-cesium 1.2.44 → 1.2.46

package/js/basis.js

@@ -832,10 +832,76 @@ export function basicConfig() {
    * - 双击展开按钮：展开/折叠同级工具栏按钮
    * - 拖拽展开按钮：移动整个工具栏按钮组
    */
-  const createToolbarExpandController = () => {
+  const createToolbarExpandController = ({
+    storageKey = 'huweili-cesium-toolbar-position',
+  } = {}) => {
     let isToolbarExpanded = true
     let isToolbarDragging = false
 
+    const getStorage = () => {
+      try {
+        return window?.localStorage || null
+      } catch (_error) {
+        return null
+      }
+    }
+
+    const readToolbarPosition = () => {
+      const storage = getStorage()
+      if (!storage || !storageKey) return null
+
+      try {
+        const value = storage.getItem(storageKey)
+        if (!value) return null
+
+        const position = JSON.parse(value)
+        if (!Number.isFinite(position?.left) || !Number.isFinite(position?.top)) return null
+        return position
+      } catch (_error) {
+        return null
+      }
+    }
+
+    const saveToolbarPosition = (left, top) => {
+      const storage = getStorage()
+      if (!storage || !storageKey) return
+
+      try {
+        storage.setItem(storageKey, JSON.stringify({ left, top }))
+      } catch (_error) {
+        // ignore storage write error
+      }
+    }
+
+    const applyToolbarPosition = (toolbar, left, top) => {
+      if (!toolbar) return
+
+      const maxLeft = window.innerWidth - toolbar.offsetWidth
+      const maxTop = window.innerHeight - toolbar.offsetHeight
+      const nextLeft = Math.min(Math.max(left, 0), Math.max(maxLeft, 0))
+      const nextTop = Math.min(Math.max(top, 0), Math.max(maxTop, 0))
+
+      toolbar.style.position = 'fixed'
+      toolbar.style.left = `${nextLeft}px`
+      toolbar.style.top = `${nextTop}px`
+      toolbar.style.right = 'auto'
+      toolbar.style.bottom = 'auto'
+      toolbar.style.zIndex = toolbar.style.zIndex || '9999'
+      toolbar.style.margin = '0'
+    }
+
+    const restoreToolbarPosition = (btn) => {
+      const toolbar = btn?.parentElement
+      if (!toolbar) return
+
+      const position = readToolbarPosition()
+      if (!position) return
+
+      window.requestAnimationFrame(() => {
+        applyToolbarPosition(toolbar, position.left, position.top)
+      })
+    }
+
     const applyToggleExpand = (btn) => {
       const toolbar = btn?.parentElement
       if (!toolbar) return
@@ -852,11 +918,57 @@ 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
 
       btn.dataset.toolbarDragReady = 'true'
       btn.style.cursor = 'move'
+      restoreToolbarPosition(btn)
 
       btn.addEventListener('dblclick', (event) => {
         event.preventDefault()
@@ -866,63 +978,33 @@ 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
-
-        toolbar.style.position = 'fixed'
-        toolbar.style.left = `${startLeft}px`
-        toolbar.style.top = `${startTop}px`
-        toolbar.style.right = 'auto'
-        toolbar.style.bottom = 'auto'
-        toolbar.style.zIndex = toolbar.style.zIndex || '9999'
-        toolbar.style.margin = '0'
-
-        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
-          }
-
-          const maxLeft = window.innerWidth - toolbar.offsetWidth
-          const maxTop = window.innerHeight - toolbar.offsetHeight
-          const nextLeft = Math.min(Math.max(startLeft + deltaX, 0), Math.max(maxLeft, 0))
-          const nextTop = Math.min(Math.max(startTop + deltaY, 0), Math.max(maxTop, 0))
-
-          toolbar.style.left = `${nextLeft}px`
-          toolbar.style.top = `${nextTop}px`
-        }
+        startToolbarDrag(event, btn)
+      })
+    }
 
-        const stopDrag = () => {
-          window.removeEventListener('pointermove', moveToolbar)
-          window.removeEventListener('pointerup', stopDrag)
-          window.removeEventListener('pointercancel', stopDrag)
+    const findExpandButton = () => {
+      return document.querySelector('[data-toolbar-expand-toggle="true"]')
+        || document.querySelector('[title="展开/折叠 工具栏"]')
+        || document.querySelector('[title="展开"]')
+        || document.querySelector('[title="收缩"]')
+    }
 
-          if (hasMoved) {
-            window.setTimeout(() => {
-              isToolbarDragging = false
-            }, 0)
-          }
-        }
+    const setupBySelector = () => {
+      const btn = findExpandButton()
+      if (btn) setupToolbarDrag(btn)
+    }
 
-        window.addEventListener('pointermove', moveToolbar)
-        window.addEventListener('pointerup', stopDrag)
-        window.addEventListener('pointercancel', stopDrag)
-      })
+    if (typeof window !== 'undefined' && typeof document !== 'undefined') {
+      window.requestAnimationFrame(setupBySelector)
+      window.setTimeout(setupBySelector, 300)
     }
 
     return {
       toggleExpand: (_viewer, btn) => {
-        setupToolbarDrag(btn)
+        if (btn) {
+          btn.dataset.toolbarExpandToggle = 'true'
+          setupToolbarDrag(btn)
+        }
       },
       setupToolbarDrag,
       applyToggleExpand,

package/package.json

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