huweili-cesium 1.2.47 → 1.2.49

package/js/basis.js

@@ -760,12 +760,60 @@ export function basicConfig() {
       zoomOutDefault(mapId, factor)
     }
 
+    const defaultVisibleTitles = ['指北针', '2D/3D视角切换', '降低视角', '抬升视角', '更多']
+    let isMoreExpanded = false
+
+    const isDefaultVisibleToolbarItem = (item) => {
+      const title = item?.getAttribute?.('title') || item?.title || item?.textContent?.trim()
+      return defaultVisibleTitles.includes(title)
+    }
+
+    const applyMoreVisible = (toolbar, expanded) => {
+      if (!toolbar) return
+
+      Array.from(toolbar.children).forEach((item) => {
+        const isDefaultVisible = isDefaultVisibleToolbarItem(item)
+        item.style.display = expanded || isDefaultVisible ? '' : 'none'
+      })
+    }
+
+    const setupDefaultMoreVisible = (retryCount = 0) => {
+      if (typeof window === 'undefined' || typeof document === 'undefined') return
+
+      const moreBtn = document.querySelector('[title="更多"]')
+      const toolbar = moreBtn?.parentElement
+
+      if (toolbar) {
+        applyMoreVisible(toolbar, isMoreExpanded)
+        return
+      }
+
+      if (retryCount < 20) {
+        window.setTimeout(() => setupDefaultMoreVisible(retryCount + 1), 100)
+      }
+    }
+
+    if (typeof window !== 'undefined') {
+      window.requestAnimationFrame(() => setupDefaultMoreVisible())
+    }
+
+    const toggleMoreButtons = (_viewer, btn) => {
+      const toolbar = btn?.parentElement
+      if (!toolbar) return
+
+      isMoreExpanded = !isMoreExpanded
+      applyMoreVisible(toolbar, isMoreExpanded)
+      btn.title = isMoreExpanded ? '收起更多' : '更多'
+      btn.setAttribute('aria-expanded', String(isMoreExpanded))
+    }
+
     return [
       {
         index: 0,
         title: '指北针',
         text: 'N',
         isCompass: true,
+        isDefaultVisible: true,
         onClick: () => resetCompassDirection(),
       },
       {
@@ -792,9 +840,10 @@ export function basicConfig() {
         },
       },
       {
-        index: 3,
+        index: 4,
         title: '2D/3D视角切换',
         text: '2D',
+        isDefaultVisible: true,
         onClick: (_v, btn) => {
           const result = toggleViewAtViewportCenter(mapId, {
             distance2D,
@@ -806,23 +855,33 @@ export function basicConfig() {
         },
       },
       {
-        index: 4,
+        index: 5,
         title: '降低视角',
         iconSrc: `${baseUrl}/images/new/jia.svg`,
+        isDefaultVisible: true,
         onClick: () => zoomIn(),
       },
       {
-        index: 5,
+        index: 6,
         title: '抬升视角',
         iconSrc: `${baseUrl}/images/new/jian.svg`,
+        isDefaultVisible: true,
         onClick: () => zoomOut(),
       },
       {
-        index: 6,
+        index: 7,
         title: '切换底图',
         iconSrc: `${baseUrl}/images/new/map.svg`,
         onClick: (v, btn) => toggleBasemapPickerPanel(v, btn || null),
       },
+      {
+        index: 1000,
+        title: '更多',
+        text: '更多',
+        isDefaultVisible: true,
+        isMoreToggle: true,
+        onClick: (v, btn) => toggleMoreButtons(v, btn),
+      },
     ]
   }
 
@@ -834,6 +893,8 @@ export function basicConfig() {
    */
   const createToolbarExpandController = ({
     storageKey = 'huweili-cesium-toolbar-position',
+    toggleIconSrc = '',
+    autoRestore = true,
   } = {}) => {
     let isToolbarExpanded = true
     let isToolbarDragging = false
@@ -995,12 +1056,41 @@ export function basicConfig() {
       })
     }
 
+    const findExpandButtonByIcon = () => {
+      if (!toggleIconSrc || typeof document === 'undefined') return null
+
+      const images = Array.from(document.querySelectorAll('img'))
+      const icon = images.find((img) => img.src?.includes(toggleIconSrc) || img.getAttribute('src')?.includes(toggleIconSrc))
+      if (!icon) return null
+
+      return icon.closest('button') || icon.parentElement
+    }
+
+    const autoRestoreToolbarPosition = (retryCount = 0) => {
+      if (!autoRestore || typeof window === 'undefined') return
+
+      const btn = findExpandButtonByIcon()
+      if (btn) {
+        setupToolbarDrag(btn)
+        return
+      }
+
+      if (retryCount < 20) {
+        window.setTimeout(() => autoRestoreToolbarPosition(retryCount + 1), 100)
+      }
+    }
+
+    if (autoRestore && typeof window !== 'undefined') {
+      window.requestAnimationFrame(() => autoRestoreToolbarPosition())
+    }
+
     return {
       toggleExpand: (_viewer, btn) => {
         if (btn) setupToolbarDrag(btn)
       },
       setupToolbarDrag,
       applyToggleExpand,
+      restoreToolbarPosition,
     }
   }
 

package/package.json

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