huweili-cesium 1.2.38 → 1.2.41

package/js/captureFenceScreenshot.js

@@ -188,4 +188,4 @@ export async function captureFenceScreenshotByMapId(mapId, positions, options =
     return null
   }
   return captureFenceScreenshot(map, positions, options)
-}
+}

package/js/customToolbarButtons.js

@@ -79,6 +79,19 @@ export function createCustomToolbarButtons() {
    * @returns {HTMLButtonElement[]} 创建的按钮元素数组
    */
   const addToolbarButtons = (viewer, buttons) => {
+    const toolbar = viewer.container.querySelector('.cesium-viewer-toolbar')
+    if (!toolbar) return []
+
+    const direction = buttons?.direction || buttons?.[0]?.direction || 'row'
+    const isRow = direction !== 'column'
+    toolbar.style.display = 'flex'
+    toolbar.style.flexDirection = isRow ? 'row' : 'column'
+    toolbar.style.alignItems = 'center'
+    toolbar.style.gap = '4px'
+    toolbar.style.width = isRow ? 'fit-content' : 'auto'
+    toolbar.style.minWidth = 'unset'
+    toolbar.style.flexWrap = 'nowrap'
+
     return buttons.map(opt => addToolbarButton(viewer, opt)).filter(Boolean)
   }
 

package/js/drawFenceNew.js

@@ -618,24 +618,28 @@ export function drawFenceNew() {
       }
     })
 
-    const labelEntity = map.entities.add({
-      id: `${options.id}_fence_name_label`,
-      position: centerCartesian,
-      label: {
-        text: fenceName,
-        font: BaseConfig.fenceLabelFont,
-        fillColor: Cesium.Color.WHITE,
-        style: Cesium.LabelStyle.FILL,
-        showBackground: true,
-        backgroundColor: Cesium.Color.fromCssColorString(BaseConfig.fenceLabelBgColor),
-        backgroundPadding: new Cesium.Cartesian2(5, 3),
-        verticalOrigin: Cesium.VerticalOrigin.CENTER,
-        horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
-        pixelOffset: new Cesium.Cartesian2(0, 0),
-        disableDepthTestDistance: Number.POSITIVE_INFINITY,
-        distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, Number.POSITIVE_INFINITY)
-      }
-    })
+    const withLabel = options.withLabel !== false
+    let labelEntity = null
+    if (withLabel) {
+      labelEntity = map.entities.add({
+        id: `${options.id}_fence_name_label`,
+        position: centerCartesian,
+        label: {
+          text: fenceName,
+          font: BaseConfig.fenceLabelFont,
+          fillColor: Cesium.Color.WHITE,
+          style: Cesium.LabelStyle.FILL,
+          showBackground: true,
+          backgroundColor: Cesium.Color.fromCssColorString(BaseConfig.fenceLabelBgColor),
+          backgroundPadding: new Cesium.Cartesian2(5, 3),
+          verticalOrigin: Cesium.VerticalOrigin.CENTER,
+          horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+          pixelOffset: new Cesium.Cartesian2(0, 0),
+          disableDepthTestDistance: Number.POSITIVE_INFINITY,
+          distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, Number.POSITIVE_INFINITY)
+        }
+      })
+    }
 
     fenceEntity._labelEntity = labelEntity
     fenceEntity._originalOptions = {
@@ -651,7 +655,9 @@ export function drawFenceNew() {
 
     if (options.show === false) {
       fenceEntity.show = false
-      labelEntity.show = false
+      if (labelEntity) {
+        labelEntity.show = false
+      }
     }
 
     if (options.zoomTo) {
@@ -671,6 +677,15 @@ export function drawFenceNew() {
     }
   }
 
+  /**
+   * 显示多边形电子围栏（无名称标签版本）
+   * @param {Object} options 围栏选项
+   * @returns {Object}
+   */
+  const showPolygonFenceNoLabel = (options = {}) => {
+    return showPolygonFence({ ...options, withLabel: false })
+  }
+
   /**
    * 删除多边形电子围栏
    * @param {string} id 围栏ID
@@ -824,24 +839,28 @@ export function drawFenceNew() {
       }
     })
 
-    const labelEntity = map.entities.add({
-      id: `${options.id}_fence_name_label`,
-      position: centerCartesian,
-      label: {
-        text: fenceName,
-        font: BaseConfig.fenceLabelFont,
-        fillColor: Cesium.Color.WHITE,
-        style: Cesium.LabelStyle.FILL,
-        showBackground: true,
-        backgroundColor: Cesium.Color.fromCssColorString(BaseConfig.fenceLabelBgColor),
-        backgroundPadding: new Cesium.Cartesian2(5, 3),
-        verticalOrigin: Cesium.VerticalOrigin.CENTER,
-        horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
-        pixelOffset: new Cesium.Cartesian2(0, 0),
-        disableDepthTestDistance: Number.POSITIVE_INFINITY,
-        distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, Number.POSITIVE_INFINITY)
-      }
-    })
+    const withLabel = options.withLabel !== false
+    let labelEntity = null
+    if (withLabel) {
+      labelEntity = map.entities.add({
+        id: `${options.id}_fence_name_label`,
+        position: centerCartesian,
+        label: {
+          text: fenceName,
+          font: BaseConfig.fenceLabelFont,
+          fillColor: Cesium.Color.WHITE,
+          style: Cesium.LabelStyle.FILL,
+          showBackground: true,
+          backgroundColor: Cesium.Color.fromCssColorString(BaseConfig.fenceLabelBgColor),
+          backgroundPadding: new Cesium.Cartesian2(5, 3),
+          verticalOrigin: Cesium.VerticalOrigin.CENTER,
+          horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+          pixelOffset: new Cesium.Cartesian2(0, 0),
+          disableDepthTestDistance: Number.POSITIVE_INFINITY,
+          distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, Number.POSITIVE_INFINITY)
+        }
+      })
+    }
 
     fenceEntity._labelEntity = labelEntity
     fenceEntity._originalOptions = {
@@ -858,6 +877,9 @@ export function drawFenceNew() {
 
     if (options.show === false) {
       fenceEntity.show = false
+      if (labelEntity) {
+        labelEntity.show = false
+      }
     }
 
     if (options.zoomTo) {
@@ -876,6 +898,10 @@ export function drawFenceNew() {
     }
   }
 
+  const showCircleFenceNoLabel = (options = {}) => {
+    return showCircleFence({ ...options, withLabel: false })
+  }
+
   /**
    * 交互式创建圆形电子围栏（带高度）
    * 
@@ -1508,10 +1534,12 @@ export function drawFenceNew() {
     drawPolygonFence,
     drawPolygonFenceNoLabel,
     showPolygonFence,
+    showPolygonFenceNoLabel,
     updatePolygonFenceName,
     destroyPolygonFence,
     destroyPolygonFenceNoLabel,
     showCircleFence,
+    showCircleFenceNoLabel,
     drawCircleFence,
     updateCircleFenceName,
     destroyCircleFence,

package/package.json

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