注释

src/BaseDialog/index.js

@@ -1,5 +1,5 @@
 class BaseDialog {
-  constructor(container, options = {}) {
+  constructor(container, options = {}, only = true) {
     this.container = container
     this.options = { ...options }
     this.options.ismove = true
@@ -9,10 +9,13 @@ class BaseDialog {
     this.closeCallBack = options.closeCallBack
     this._element = {}
     this._element_style = undefined
+    this.only = only
   }
 
   async init() {
-    this.closeAll()
+    if (this.only) {
+      this.closeAll()
+    }
     DialogAll.push(this)
     this.isDestroy = false
     // body
@@ -48,6 +51,15 @@ class BaseDialog {
     <button class="close">关闭</button>
     `
     this._element.body.appendChild(this._element.foot)
+    let curtain = await document.createElement('div')
+    curtain.style.position = 'absolute'
+    curtain.style.top = '0'
+    curtain.style.left = '0'
+    curtain.style.width = '100%'
+    curtain.style.height = '100%'
+    curtain.style.backdropFilter = 'blur(2px)'
+    curtain.style.zIndex = '-999999'
+    this._element.body.appendChild(curtain)
 
     // 关闭
     let closeBtnsBox = this._element.body.getElementsByClassName('close-box')[0];

src/Draw/drawAttackArrow.js

@@ -59,12 +59,17 @@ export default class DrawAttackArrow extends Draw {
           return
         }
         into = '3D'
+        let pos84 = this.cartesian3Towgs84(cartesian, this.viewer)
+        let lastPos84 = cache_positions[cache_positions.length - 1]
+        if(lastPos84 && (lastPos84.lng === pos84.lng && lastPos84.lat === pos84.lat)) {
+          return
+        }
         if (!this.entityHasCreated) {
           let polyline_id = DrawAttackArrow.create_arrow_polygon(this)
           this.points_ids.push(polyline_id)
         }
         this.points_ids.push(this.create_point(cartesian))
-        cache_positions.push(this.cartesian3Towgs84(cartesian, this.viewer))
+        cache_positions.push(pos84)
         isMove = false
       })
       this.event.mouse_right((movement, cartesian) => {

src/Draw/drawPolygon.js

@@ -13,6 +13,7 @@ class DrawPolygon extends Draw {
    * */
   constructor(sdk, options = {}) {
     super(sdk, options)
+    this.color = options.color || 'rgba(255,0,0,0.5)'
     this.polygonHasCreated = false
   }
 
@@ -34,8 +35,8 @@ class DrawPolygon extends Draw {
           positions: new Cesium.CallbackProperty((e) => {
             return that.positions.concat(that.positions[0])
           }),
-          width: 2,
-          material: Cesium.Color.fromCssColorString('#c1c505').withAlpha(0.5),
+          width: 3,
+          material: Cesium.Color.fromCssColorString(that.color).withAlpha(1),
           clampToGround: true,
           zIndex: 99999999
         },

src/Global/FlyRoam/index.js

@@ -135,6 +135,7 @@ const open = async (sdk, options = {}, _Dialog = {}) => {
       pitch: viewer.camera.pitch,
       roll: viewer.camera.roll
     }
+    tools.message({text: '操作成功'})
   })
 
   let totalTimeElm = contentElm.querySelector("input[name='totalTime']")

src/Global/KeyBoard/index.js

@@ -101,6 +101,7 @@ function getFlagFromKeyboard(key) {
  */
 function keyDown(event) {
   let _viewer = this
+
   // 判断是否有输入框聚焦
   function isInputFocused() {
     const activeElement = document.activeElement;
@@ -164,32 +165,51 @@ function keyUp(event) {
  * @return {*}
  */
 function keyboardMapRoamingRender(_viewer) {
-  if(!_viewer.scene.screenSpaceCameraController.enableTilt) {
+  if(!_viewer || !_viewer.scene || !_viewer.scene.screenSpaceCameraController.enableTilt) {
     return
   }
   let camera = _viewer.camera;
   let ellipsoid = _viewer.scene.globe.ellipsoid;
   let cameraHeight = ellipsoid.cartesianToCartographic(camera.position).height;
+  let cameraHeight2 = camera.positionCartographic.height;
+
 
   // 根据相机高度设置移动距离，比默认距离移动效果更好
   let moveRate = cameraHeight / 20.0;
   let rotationRate = moveRate / 500000 / Cesium.Math.toDegrees(camera.pitch);
+  let moveRate2 = cameraHeight2 / 100.0;
 
   if (flags.moveForward) {
-    // camera.moveForward(moveRate);
-    camera.rotate(camera.right, -rotationRate);
+    if(_viewer.scene.mode == 2) {
+      camera.moveUp(moveRate2);
+    }
+    else {
+      camera.rotate(camera.right, -rotationRate);
+    }
   }
   if (flags.moveBackward) {
-    // camera.moveBackward(moveRate);
-    camera.rotate(camera.right, rotationRate);
+    if(_viewer.scene.mode == 2) {
+      camera.moveDown(moveRate2);
+    }
+    else {
+      camera.rotate(camera.right, rotationRate);
+    }
   }
   if (flags.moveLeft) {
-    // camera.moveLeft(moveRate);
-    camera.rotate(camera.up, -rotationRate);
+    if(_viewer.scene.mode == 2) {
+      camera.moveLeft(moveRate2);
+    }
+    else {
+      camera.rotate(camera.up, -rotationRate);
+    }
   }
   if (flags.moveRight) {
-    // camera.moveRight(moveRate);
-    camera.rotate(camera.up, rotationRate);
+    if(_viewer.scene.mode == 2) {
+      camera.moveRight(moveRate2);
+    }
+    else {
+      camera.rotate(camera.up, rotationRate);
+    }
   }
   if (flags.moveUp) {
     camera.moveUp(moveRate);

src/Global/MapPrint/index.js

@@ -1420,11 +1420,11 @@ async function MapPrint(sdk, thumbnailImg, rectangle, originalImg) {
         const url = URL.createObjectURL(blob);
         let downloadElement = document.createElement('a');
         downloadElement.href = url;
-        downloadElement.download = `高清出图-${getDateTimeString()}.jpg`;
+        downloadElement.download = `高清出图-${getDateTimeString()}.png`;
         document.body.appendChild(downloadElement);
         downloadElement.click();
         document.body.removeChild(downloadElement);
-      }, 'image/jpeg', 0.95);
+      }, 'image/png', 0.95);
       exporting = false;
       exportBtn.innerHTML = '打印';
       // canvas2.toBlob(function (blob) {

src/Global/MapX/index.js

@@ -124,7 +124,7 @@ function syncViewer() {
   if (height > 9000000) {
     height = 9000000
   }
-  if (height < 100000) {
+  if (height < 400000) {
     this.entity.billboard.show = true
     this.entity.rectangle.show = false
   }

src/Global/MouseCoordinate/index.js

@@ -4,18 +4,38 @@
 import Tools from "../../Tools";
 import { getCoordinateSystem } from "../../Global/global";
 import MouseEvent from '../../Event/index'
+import { getSdk as get2DSdk } from '../../Global/MultiViewportMode'
+import { getSdk as getSplitScreenSdk } from "../../Global/SplitScreen";
 
 let event
+let event2
 let MouseCoordinateElm
 let requestAnimationFrameEventId
+let tmovement
+let targetSdk
+let sdkD
 
 const MouseCoordinate = (sdk, status) => {
+  if (!sdk || !sdk.viewer) {
+    return
+  }
+  targetSdk = sdk
+  sdkD = get2DSdk().sdkD
+  if(!sdkD) {
+    sdkD = getSplitScreenSdk().sdkD
+  }
+
   let tools = new Tools(sdk)
   if (status) {
     if (event) {
       event.destroy()
     }
+    if (event2) {
+      event2.destroy()
+      event2 = undefined
+    }
     event = new MouseEvent(sdk)
+    tmovement = null
     let position = {
       x: '',
       y: '',
@@ -40,22 +60,60 @@ const MouseCoordinate = (sdk, status) => {
       contentElm.style['background-size'] = `200% 200%`;
       MouseCoordinateElm = contentElm
     }
-    sdk.viewer._element.appendChild(contentElm)
-    let tmovement
+    sdk.viewer.container.appendChild(contentElm)
+
     event.mouse_move((movement, cartesian) => {
-      tmovement = { ...movement }
+      targetSdk = sdk
+      tmovement = { ...movement.endPosition }
     })
 
     const getPosition = () => {
-      if(!tmovement) {
+      if (!targetSdk) {
         return
       }
       let canvas = sdk.viewer._element.getElementsByTagName('canvas')[0]
-      let left = tmovement.endPosition.x;
-      let top = tmovement.endPosition.y;
-      let cartesian = event.getcartesian(tmovement)
-      contentElm.style['background-position-x'] = `${-canvas.width + left + 4}px`;
-      contentElm.style['background-position-y'] = `${-canvas.height + top - 2}px`;
+      sdkD = get2DSdk().sdkD
+      if(!sdkD) {
+        sdkD = getSplitScreenSdk().sdkD
+      }
+      if (!event2 && sdkD) {
+        event2 = new MouseEvent(sdkD)
+        event2.mouse_move((movement, cartesian) => {
+          targetSdk = sdkD
+          tmovement = { x: movement.endPosition.x, y: movement.endPosition.y }
+        })
+      }
+      if (!tmovement) {
+        return
+      }
+      let left = tmovement.x;
+      let top = tmovement.y;
+      let cartesian
+      if (targetSdk.viewer.scene.mode === 2) {
+        left = left + canvas.width
+        cartesian = targetSdk.viewer.camera.pickEllipsoid(tmovement, targetSdk.viewer.scene.globe.ellipsoid)
+      }
+      else {
+        cartesian = targetSdk.viewer.scene.pickPosition(tmovement)
+        if (!cartesian) {
+          const ray = targetSdk.viewer.camera.getPickRay(position); //相交的射线
+          let pickedObjects = targetSdk.viewer.scene.drillPickFromRay(ray, 10);
+          let result = {}
+          for (let i = 0; i < pickedObjects.length; i++) {
+            if (pickedObjects[i].position) {
+              result = pickedObjects[i]
+              break
+            }
+          }
+          cartesian = result.position
+          if (!cartesian) {
+            cartesian = targetSdk.viewer.scene.globe.pick(ray, targetSdk.viewer.scene);
+          }
+        }
+      }
+      contentElm.style['background-position-x'] = `${-sdk.viewer.container.clientWidth + left + 4}px`;
+
+      contentElm.style['background-position-y'] = `${-sdk.viewer.container.clientHeight + top - 2}px`;
       // this.entity.position = cartesian
       if (cartesian) {
         let degrees = tools.cartesian3Towgs84(cartesian, sdk.viewer)
@@ -97,10 +155,13 @@ const MouseCoordinate = (sdk, status) => {
   else {
     if (event) {
       event.destroy()
-      event = undefined
+    }
+    if (event2) {
+      event2.destroy()
+      event2 = undefined
     }
     if (MouseCoordinateElm) {
-      sdk.viewer._element.removeChild(MouseCoordinateElm)
+      sdk.viewer.container.removeChild(MouseCoordinateElm)
       MouseCoordinateElm = undefined
     }
     if (requestAnimationFrameEventId) {

src/Global/MultiViewportMode/ClickCallback/index.js

@@ -0,0 +1,578 @@
+/**
+ * @name: click
+ * @author: Administrator
+ * @date: 2023-05-28 11:05
+ * @description：click
+ * @update: 2023-05-28 11:05
+ */
+let leftClickHandler = null
+let rightClickHandler = null
+let MoveHandler = null
+let leftClickCallbackMap = new Map()
+let rightClickCallbackMap = new Map()
+let MoveCallbackMap = new Map()
+let selectedFeature;
+
+
+function cartesian3Towgs84(cartesian, viewer) {
+  var ellipsoid = viewer.scene.globe.ellipsoid
+  var cartesian3 = new Cesium.Cartesian3(
+    cartesian.x,
+    cartesian.y,
+    cartesian.z
+  )
+  var cartographic = ellipsoid.cartesianToCartographic(cartesian3)
+  var lat = Cesium.Math.toDegrees(cartographic.latitude)
+  var lng = Cesium.Math.toDegrees(cartographic.longitude)
+  var alt = cartographic.height < 0 ? 0 : cartographic.height
+  return {
+    lng: lng,
+    lat: lat,
+    alt: alt,
+  }
+}
+
+function getcartesian(sdk, movement) {
+  if (movement.endPosition) {
+    movement.endPosition.y -= 2
+  }
+  let position = movement.position || movement.endPosition
+  // 获取世界坐标系地表坐标，考虑地形，不包括模型，倾斜摄影模型表面；
+  let cartesian = sdk.viewer.scene.pickPosition(position)
+  if (!cartesian) {
+    const ray = sdk.viewer.camera.getPickRay(position); //相交的射线
+    cartesian = sdk.viewer.scene.globe.pick(ray, sdk.viewer.scene);
+  }
+  return cartesian
+}
+
+function openLeftClick(sdk, cb) {
+  if (!sdk || !sdk.viewer) {
+    return
+  }
+  let click = true
+  leftClickHandler = new Cesium.ScreenSpaceEventHandler(sdk.viewer.canvas)
+  leftClickHandler.setInputAction((movement) => {
+    let cartesian = sdk.viewer.scene.pickPosition(movement.position)
+    if (!cartesian) {
+      const ray = sdk.viewer.camera.getPickRay(movement.position); //相交的射线
+      cartesian = sdk.viewer.scene.globe.pick(ray, sdk.viewer.scene);
+    }
+    if (!cartesian) {
+      return
+    }
+
+    let pos84 = cartesian3Towgs84(cartesian, sdk.viewer)
+
+    cb && cb(pos84)
+
+    if (click) {
+      click = false
+      setTimeout(() => {
+        click = true
+      }, 600);
+      if (!YJ.Measure.GetMeasureStatus() && cartesian) {
+        let flag = false
+        for (let i = leftClickCallbackMap.size - 1; i >= 0; i--) {
+          let key = Array.from(leftClickCallbackMap.keys())[i]
+          let obj = leftClickCallbackMap.get(key)
+          if (obj) {
+
+            if (obj.that) {
+              // 是否为多边形
+              if (obj.that.type === 'PolygonObject') {
+                // 是否可点击y
+                if (obj.that.picking) {
+                  if (obj.that.options.positions && obj.that.options.positions.length >= 3) {
+                    let pt = turf.point([pos84.lng, pos84.lat]);
+                    let polyPos = []
+                    for (let i = 0; i < obj.that.options.positions.length; i++) {
+                      polyPos.push([
+                        obj.that.options.positions[i].lng,
+                        obj.that.options.positions[i].lat
+                      ])
+                    }
+                    polyPos.push([
+                      obj.that.options.positions[0].lng,
+                      obj.that.options.positions[0].lat
+                    ])
+                    let poly = turf.polygon([polyPos]);
+                    let contain = turf.booleanPointInPolygon(pt, poly);
+                    if (contain) {
+                      obj.callback(
+                        movement,
+                        obj.that.options.id,
+                        cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
+                      flag = true
+                      break
+                    }
+                  }
+                }
+              }
+              // 聚集地
+              else if (obj.that.type === 'AssembleObject') {
+                if (obj.that.picking) {
+                  if (obj.that.options.positions && obj.that.options.positions.length >= 3) {
+                    let positions = obj.that.computeAssemble(obj.that.options.positions, true)
+                    let pt = turf.point([pos84.lng, pos84.lat]);
+                    let polyPos = []
+                    for (let i = 0; i < positions.length; i += 2) {
+                      polyPos.push([
+                        positions[i],
+                        positions[i + 1]
+                      ])
+                    }
+                    let poly = turf.polygon([polyPos]);
+                    let contain = turf.booleanPointInPolygon(pt, poly);
+                    if (contain) {
+                      obj.callback(
+                        movement,
+                        obj.that.options.id,
+                        cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
+                      flag = true
+                      break
+                    }
+                  }
+                }
+              }
+              // 单箭头
+              else if (obj.that.type === 'AttackArrowObject') {
+                if (obj.that.picking) {
+                  if (obj.that.options.positions && obj.that.options.positions.length >= 3) {
+                    let pt = turf.point([pos84.lng, pos84.lat]);
+                    let positions = obj.that.computeAttackArrow(obj.that.options.positions)
+                    let polyPos = []
+                    for (let m = 0; m < positions.length; m++) {
+                      let pos84 = cartesian3Towgs84(positions[m], sdk.viewer)
+                      polyPos.push([pos84.lng, pos84.lat])
+                    }
+                    let poly = turf.polygon([polyPos]);
+                    let contain = turf.booleanPointInPolygon(pt, poly);
+                    if (contain) {
+                      obj.callback(
+                        movement,
+                        obj.that.options.id,
+                        cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
+                      flag = true
+                      break
+                    }
+                  }
+                }
+              }
+              // 双箭头
+              else if (obj.that.type === 'PincerArrowObject') {
+                if (obj.that.picking) {
+                  if (obj.that.options.positions && obj.that.options.positions.length >= 5) {
+                    let pt = turf.point([pos84.lng, pos84.lat]);
+                    let positions = obj.that.computePincerArrow(obj.that.options.positions)
+                    let polyPos = []
+                    for (let m = 0; m < positions.length; m++) {
+                      let pos84 = cartesian3Towgs84(positions[m], sdk.viewer)
+                      polyPos.push([pos84.lng, pos84.lat])
+                    }
+                    let pos84_0 = cartesian3Towgs84(positions[0], sdk.viewer)
+                    polyPos.push([pos84_0.lng, pos84_0.lat])
+                    let poly = turf.polygon([polyPos]);
+                    let contain = turf.booleanPointInPolygon(pt, poly);
+                    if (contain) {
+                      obj.callback(
+                        movement,
+                        obj.that.options.id,
+                        cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
+                      flag = true
+                      break
+                    }
+                  }
+                }
+              }
+              // 圆
+              else if (obj.that.type === 'CircleObject') {
+                if (obj.that.picking) {
+                  let pt = turf.point([pos84.lng, pos84.lat]);
+                  if (obj.that.options.center && obj.that.options.radius) {
+                    let center = [obj.that.options.center.lng, obj.that.options.center.lat];
+                    let radius = obj.that.options.radius / 1000;
+                    let options = { steps: 360, units: 'kilometers' };
+                    let circle = turf.circle(center, radius, options);
+                    let contain = turf.booleanPointInPolygon(pt, circle);
+                    if (contain) {
+                      obj.callback(
+                        movement,
+                        obj.that.options.id,
+                        cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
+                      flag = true
+                      break
+                    }
+                  }
+
+                }
+              }
+              // 扇形
+              else if (obj.that.type === 'SectorObject') {
+                if (obj.that.picking) {
+                  let pt = turf.point([pos84.lng, pos84.lat]);
+                  if (obj.that.options.center && obj.that.options.radius && obj.that.options.startAngle && obj.that.options.endAngle) {
+                    let positions = obj.that.calSector(obj.that.options.center, obj.that.options.radius, obj.that.options.startAngle, obj.that.options.endAngle, undefined, true)
+                    let polyPos = []
+                    for (let m = 0; m < positions.length; m++) {
+                      polyPos.push([positions[m].lng, positions[m].lat])
+                    }
+                    let poly = turf.polygon([polyPos]);
+                    let contain = turf.booleanPointInPolygon(pt, poly);
+                    if (contain) {
+                      obj.callback(
+                        movement,
+                        obj.that.options.id,
+                        cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
+                      flag = true
+                      break
+                    }
+                  }
+
+                }
+              }
+            }
+          }
+        }
+        if (!flag) {
+          const pick = sdk.viewer.scene.pick(movement.position)
+          if (pick) {
+            if (pick.id) {
+              let entityId
+              // 矢量
+              if (pick.id.type && pick.id.type === 'vector' && pick.id.parentId) {
+                let obj = leftClickCallbackMap.get(pick.id.parentId)
+                if (obj.that.picking && obj.that.geojson) {
+                  for (let i = 0; i < obj.that.geojson.features.length; i++) {
+                    if (obj.that.geojson.features[i].id === pick.id._id) {
+                      obj.callback(
+                        movement,
+                        obj.that.geojson.features[i].id,
+                        cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
+                    }
+                  }
+                }
+              }
+              else if (typeof pick.id.id == 'string') {
+                let array = pick.id.id.split('-')
+                array.splice(array.length - 1, 1)
+                entityId = array.join('-')
+              }
+
+              if (pick.id.properties && pick.id.properties.id && leftClickCallbackMap.has(pick.id.properties.id._value)) {
+                let obj = leftClickCallbackMap.get(pick.id.properties.id._value)
+                if (obj.that.picking) {
+                  obj.callback(
+                    movement,
+                    pick.id.properties.id._value,
+                    cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
+                }
+              }
+              else if (leftClickCallbackMap.has(pick.id.id)) {
+                let obj = leftClickCallbackMap.get(pick.id.id)
+                if (obj.that.picking) {
+                  obj.callback(
+                    movement,
+                    pick.id.id,
+                    cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
+                }
+              }
+              else if (entityId && leftClickCallbackMap.has(entityId)) {
+                let obj = leftClickCallbackMap.get(entityId)
+                if (obj.that.picking) {
+                  obj.callback(
+                    movement,
+                    entityId,
+                    cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
+                }
+              }
+              else if (pick.primitive) {
+                if (typeof pick.id == 'string' && leftClickCallbackMap.has(pick.id)) {
+                  let obj = leftClickCallbackMap.get(pick.id)
+                  obj.callback(
+                    movement,
+                    pick.id,
+                    cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
+                }
+              }
+            }
+            else {
+              if (pick.primitive && pick.primitive.id) {
+                if (leftClickCallbackMap.has(pick.primitive.id)) {
+                  let obj = leftClickCallbackMap.get(pick.primitive.id)
+                  if (obj.that.picking) {
+                    if (obj.that.type === 'bim') {
+                      if (YJ.Global.getBimPickStatus(sdk)) {
+                        obj.callback(
+                          movement,
+                          pick.primitive,
+                          cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
+                      }
+                    }
+                    else {
+                      obj.callback(
+                        movement,
+                        pick.primitive.id,
+                        cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
+                    }
+                  }
+                }
+              }
+            }
+            if (pick.content && (!pick.primitive || !pick.primitive.id)) {
+              if (leftClickCallbackMap.has(pick.content.tileset.id)) {
+                let obj = leftClickCallbackMap.get(pick.content.tileset.id)
+                if (obj.that.picking) {
+                  if (obj.that.type === 'bim') {
+                    if (YJ.Global.getBimPickStatus(sdk)) {
+                      obj.callback(
+                        movement,
+                        pick.content.tileset,
+                        cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
+                    }
+                  }
+                  else {
+                    obj.callback(
+                      movement,
+                      pick.content.tileset.id,
+                      cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+
+
+    // if (click) {
+    //   click = false
+    //   setTimeout(() => {
+    //     click = true
+    //   }, 300);
+    //   if (!YJ.Measure.GetMeasureStatus()) {
+
+    //   }
+    // }
+  }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
+
+  // leftClickHandler.setInputAction(function (movement) {
+  //   const feature = sdk.viewer.scene.pick(movement.endPosition);
+  //   // unselectFeature(selectedFeature);
+  //   if (selectedFeature) {
+  //     selectedFeature.color = Cesium.Color.WHITE;
+  //   }
+  //   selectedFeature = feature
+  //   if (feature) {
+  //     feature.color = Cesium.Color.YELLOW;
+  //   }
+  // }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
+  // }
+
+}
+
+function closeLeftClick(sdk) {
+  leftClickHandler.destroy() //关闭事件句柄
+  leftClickHandler = null
+  // }
+}
+
+function openRightClick(sdk) {
+  if (!sdk || !sdk.viewer) {
+    return
+  }
+  rightClickHandler = new Cesium.ScreenSpaceEventHandler(sdk.viewer.canvas)
+  rightClickHandler.setInputAction((movement) => {
+    if (!YJ.Measure.GetMeasureStatus()) {
+      const pick = sdk.viewer.scene.pick(movement.position)
+      if (pick && pick.id) {
+        let id
+        if (pick.id.type && pick.id.type === 'vector' && pick.id.parentId) {
+          let obj = rightClickCallbackMap.get(pick.id.parentId)
+          if (obj.that.picking && obj.that.geojson) {
+            for (let i = 0; i < obj.that.geojson.features.length; i++) {
+              if (obj.that.geojson.features[i].id === pick.id._id) {
+                obj.callback(
+                  movement,
+                  obj.that.geojson.features[i].id,
+                  cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
+              }
+            }
+          }
+        }
+        else {
+          if (typeof pick.id === 'string') {
+            id = pick.id
+          }
+          else {
+            id = pick.id.id
+          }
+          if (rightClickCallbackMap.has(id)) {
+            let obj = rightClickCallbackMap.get(id)
+            if (obj.that.picking) {
+              let cartesian = getcartesian(sdk, movement)
+              if (!cartesian) {
+                return
+              }
+              obj.callback(
+                movement,
+                id,
+                cartesian3Towgs84(cartesian, sdk.viewer), obj.that)
+            }
+          }
+        }
+      }
+      if (pick && pick.content) {
+        if (rightClickCallbackMap.has(pick.content.tileset.id)) {
+          let obj = rightClickCallbackMap.get(pick.content.tileset.id)
+          if (obj.that.picking) {
+            if (obj.that.type === 'bim') {
+              if (YJ.Global.getBimPickStatus(sdk)) {
+                let cartesian = getcartesian(sdk, movement)
+                if (!cartesian) {
+                  return
+                }
+                obj.callback(
+                  movement,
+                  pick.getProperty('id'),
+                  cartesian3Towgs84(cartesian, sdk.viewer), obj.that)
+              }
+            }
+            else {
+              let cartesian = getcartesian(sdk, movement)
+              if (!cartesian) {
+                return
+              }
+              obj.callback(
+                movement,
+                pick.content.tileset.id,
+                cartesian3Towgs84(cartesian, sdk.viewer), obj.that)
+            }
+          }
+        }
+      }
+    }
+  }, Cesium.ScreenSpaceEventType.RIGHT_CLICK)
+}
+
+function closeRightClick() {
+  if (rightClickHandler) {
+    rightClickHandler.destroy() //关闭事件句柄
+    rightClickHandler = null
+  }
+}
+
+function openMove(sdk) {
+  MoveHandler = new Cesium.ScreenSpaceEventHandler(sdk.viewer.canvas)
+  MoveHandler.setInputAction(function (movement) {
+    const pick = sdk.viewer.scene.pick(movement.endPosition);
+    // unselectFeature(selectedFeature);
+    // if (selectedFeature) {
+    //   let color = '#fff'
+    //   let state = selectedFeature.getProperty('state')
+    //   switch (state) {
+    //     case '0':
+    //       color = '#fff'
+    //       break;
+    //     case '1':
+    //       color = '#f00'
+    //       break;
+    //     case '2':
+    //       color = '#0f0'
+    //       break;
+    //     case '3':
+    //       color = '#00f'
+    //       break;
+    //     default:
+    //   }
+    //   selectedFeature.color = Cesium.Color.fromCssColorString(color).withAlpha(selectedFeature.tileset.transparency)
+    // }
+    // if (pick && pick.id) { }
+    // if (pick && pick.content) {
+    //   if (MoveCallbackMap.has(pick.content.tileset.id)) {
+    //     let obj = MoveCallbackMap.get(pick.content.tileset.id)
+    //     if (obj.that.picking) {
+    //       if (obj.that.type === 'bim') {
+    //         if (YJ.Global.getBimPickStatus(sdk)) {
+    //           selectedFeature = pick
+    //           pick.color = Cesium.Color.YELLOW;
+    //         }
+    //         else {
+    //           selectedFeature = null
+    //         }
+    //       }
+    //       else {
+    //         selectedFeature = pick
+    //         pick.color = Cesium.Color.YELLOW;
+    //       }
+    //     }
+    //     else {
+    //       selectedFeature = null
+    //     }
+    //   }
+    // }
+  }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
+}
+
+function closeMove() {
+  if (MoveHandler) {
+    MoveHandler.destroy() //关闭事件句柄
+    MoveHandler = null
+  }
+}
+
+/*注册左键回调*/
+function regLeftClickCallback(id, callback, that) {
+
+  leftClickCallbackMap.set(id, { callback, that })
+}/*取消左键回调*/
+function unRegLeftClickCallback(id,) {
+  leftClickCallbackMap.delete(id,)
+}
+
+/*注册右键回调*/
+function regRightClickCallback(id, callback, that) {
+  rightClickCallbackMap.set(id, { callback, that })
+}/*取消右键回调*/
+function unRegRightClickCallback(id,) {
+  rightClickCallbackMap.delete(id,)
+}
+
+/*注册左键回调*/
+function regMoveCallback(id, callback, that) {
+  MoveCallbackMap.set(id, { callback, that })
+}/*取消左键回调*/
+function unregMoveCallback(id,) {
+  MoveCallbackMap.delete(id,)
+}
+
+function getLeftClickState() {
+  if (leftClickHandler) {
+    return true
+  }
+  else {
+    false
+  }
+}
+
+function getRightClickState() {
+  if (rightClickHandler) {
+    return true
+  }
+  else {
+    false
+  }
+}
+
+function getMoveState() {
+  if (MoveHandler) {
+    return true
+  }
+  else {
+    false
+  }
+}
+
+
+export { openLeftClick, closeLeftClick, regLeftClickCallback, unRegLeftClickCallback, openRightClick, closeRightClick, regRightClickCallback, unRegRightClickCallback, openMove, closeMove, regMoveCallback, unregMoveCallback, getLeftClickState, getRightClickState, getMoveState }

src/Global/MultiViewportMode/index.js

@@ -7,6 +7,9 @@ import { CesiumContainer } from '../global'
 import { off as offSplitScreen } from "../SplitScreen";
 import { FlwStatusSwitch, JwwStatusSwitch, getFlwStatus, getJwwStatus } from "../global"
 import { SheetIndexStatusSwitch, getStatus } from '../SheetIndex'
+import { getLeftClickState, getRightClickState, getMoveState } from "../../Global/ClickCallback"
+import { openLeftClick, openRightClick, openMove } from "./ClickCallback"
+
 
 let sdk2D
 let sdk3D
@@ -32,6 +35,16 @@ async function init(sdk) {
   })
   sdk2.viewer.scene.mode = Cesium.SceneMode.SCENE2D
   sdk2D = await sdk2
+  if(getLeftClickState()) {
+    openLeftClick(sdk2D)
+  }
+  if(getRightClickState()) {
+    openRightClick(sdk2D)
+  }
+  if(getMoveState()) {
+    openMove(sdk2D)
+  }
+
   // window.sdk2D = sdk2D
   solveBug()
   syncObject = { sdks: [sdk, sdk2], tools }
@@ -49,7 +62,16 @@ async function init(sdk) {
   sdk2D.viewer.imageryLayers.removeAll()
   for (let i = 0; i < imageryLayers.length; i++) {
     let entity = sdk2D.viewer.imageryLayers.addImageryProvider(imageryLayers[i].imageryProvider, imageryLayers[i]._layerIndex)
+    if(imageryLayers[i]._id) {
+      entity._id = imageryLayers[i]._id
+    }
     entity.show = imageryLayers[i].show
+    entity.alpha = imageryLayers[i].alpha
+    if (imageryLayers[i]._objectState) {
+      if (imageryLayers[i]._showView == 3) {
+        entity.show = false
+      }
+    }
   }
   // sdk.viewer.entities.collectionChanged.addEventListener(syncEntities)
   // sdk.viewer.dataSources.dataSourceAdded.addEventListener(syncDataSources)
@@ -61,6 +83,12 @@ async function init(sdk) {
     JwwStatusSwitch(sdk2, true)
   }
 
+  sdk.entityMap.forEach((item, key) => {
+    if (item.showView == 2) {
+      item.showView = 2
+    }
+  })
+
 }
 async function on(sdk) {
   if (sdk2D) {
@@ -94,6 +122,11 @@ function off(sdk) {
     activeViewer = null
     syncObject = {}
   }
+  sdk.entityMap.forEach((item, key) => {
+    if (item.showView) {
+      item.show = item.show
+    }
+  })
 }
 
 async function syncData2(sdk, id, entityId) {
@@ -119,8 +152,17 @@ async function syncData2(sdk, id, entityId) {
         options.heightMode = 0
         options.height = 0
       }
-      if (!that.type || (that.type !== 'tileset' && that.type !== 'bim' && that.type !== 'glb' && that.type !== 'layer')) {
-        let newObject = await new that.constructor(sdk2D, options)
+
+      if (!that.type || (that.type !== 'tileset' && that.type !== 'bim' && that.type !== 'glb' && that.type !== 'layer' && that.type !== 'wallStereoscopic')) {
+        if (that.showView == 3) {
+          options.show = false
+        }
+        let callback
+        if(that.type === 'TextBox') {
+          callback = that.callback
+        }
+
+        let newObject = await new that.constructor(sdk2D, options, callback)
         newObject.onClick = that.onClick
         newObject.onRightClick = that.onRightClick
         newObject.onMouseMove = that.onMouseMove
@@ -207,8 +249,19 @@ async function syncData2(sdk, id, entityId) {
         obj.options.heightReference = 1
       }
       let options = syncObject.tools.deepCopyObj(obj.options)
-      if (!obj.type || (obj.type !== 'tileset' && obj.type !== 'bim' && obj.type !== 'glb' && obj.type !== 'layer')) {
-        let target = await new obj.constructor(sdk2D, options)
+      if (!obj.type || (obj.type !== 'tileset' && obj.type !== 'bim' && obj.type !== 'glb' && obj.type !== 'layer' && obj.type !== 'wallStereoscopic')) {
+        if (obj.showView == 3) {
+          options.show = false
+        }
+        let target = await sdk2D.entityMap.get(options.id)
+        if(target) {
+          await target.remove()
+        }
+        let callback
+        if(obj.type === 'TextBox') {
+          callback = obj.callback
+        }
+        target = await new obj.constructor(sdk2D, options, callback)
         target.onClick = obj.onClick
         target.onRightClick = obj.onRightClick
         target.onMouseMove = obj.onMouseMove
@@ -401,11 +454,25 @@ function syncImageryLayerRemoved(layer, index) {
   sdk2D.viewer.imageryLayers.remove(layer2d)
 }
 function syncImageryLayerShownOrHidden(layer, index, state) {
+  return
   let layer2d = sdk2D.viewer.imageryLayers._layers[index]
+  let layer3d = sdk3D.viewer.imageryLayers._layers[index]
+  console.log('layer2d', layer2d, sdk2D, layer3d)
+
   if (!layer2d) {
     return
   }
-  layer2d.show = state
+  if (layer3d._objectState) {
+    if (!layer3d._showView || layer3d._showView == 2) {
+      layer2d.show = true
+    }
+    if (layer3d._showView == 3) {
+      layer2d.show = false
+    }
+  }
+  else {
+    layer2d.show = state
+  }
 }
 
 async function syncPrimitives(primitive) {
@@ -535,6 +602,7 @@ function syncViewer() {
 
 }
 
+
 function get2DView() {
   return sdk2D
 }

src/Global/SplitScreen/index.js

@@ -102,11 +102,20 @@ function off() {
   let leftCanvas = leftBox.getElementsByTagName('canvas')[0]
   leftBox.style.width = '100%'
   leftCanvas.style.width = '100%'
+  let billboardAttributeBoxs = sdkP.viewer._element.getElementsByClassName('billboard-attribute-box')
+  for (let i = 0; i < billboardAttributeBoxs.length; i++) {
+    billboardAttributeBoxs[i].style.display = 'block'
+  }
   sdkP = null
 }
 
 
 async function init(sdk) {
+  let billboardAttributeBoxs = sdk.viewer._element.getElementsByClassName('billboard-attribute-box')
+  for (let i = 0; i < billboardAttributeBoxs.length; i++) {
+    billboardAttributeBoxs[i].style.display = 'none'
+  }
+
   sdk.entityMap.forEach((item, key) => {
     if (item.type && item.type == 'TrajectoryMotion' && item.viewFollow) {
       item.viewFollow = false
@@ -137,10 +146,8 @@ async function init(sdk) {
   rightElm.style.position = 'absolute'
   rightElm.style.right = 'calc(50% - 50px)'
 
-  if (!activeIds || activeIds.length == 0) {
-    leftElm.style.display = 'none'
-    rightElm.style.display = 'none'
-  }
+  leftElm.style.display = 'none'
+  rightElm.style.display = 'none'
 
   sdk.viewer._element.appendChild(leftElm)
   sdk.viewer._element.appendChild(rightElm)
@@ -149,6 +156,12 @@ async function init(sdk) {
   let right = 0
   if (activeIds) {
     for (let i = 0; i < activeIds.length; i++) {
+      let thatP = sdk.entityMap.get(activeIds[i])
+      if (!thatP || (thatP.type === 'terrain' || !thatP.show) || thatP.type === 'TextBox') {
+        continue
+      }
+      leftElm.style.display = 'unset'
+      rightElm.style.display = 'unset'
       let status = statusMap.get(activeIds[i])
       if (status) {
         if (status.P) {
@@ -517,7 +530,7 @@ async function setSplitDirection(v, id, isoff = false, entityId) {
             thatD.textShow = thatP.textShow
           }
           if (thatP.label && thatP.labelShow) {
-            thatP.label.entity.show = true
+            thatP.labelShow = true
           }
           if (thatD.label) {
             thatD.label.options.ground = false
@@ -911,7 +924,7 @@ async function setSplitDirection(v, id, isoff = false, entityId) {
           }
           if (thatP.type === 'GroundSvg' && thatP.text) {
             thatP.text.show = thatP.textShow
-            target.textShow = false
+            target && (target.textShow = false)
           }
           if (thatP.label && thatP.labelShow) {
             thatP.label.entity.show = true
@@ -1281,6 +1294,8 @@ function setActiveId(ids = []) {
   }
   else {
     if (leftElm && rightElm) {
+      leftElm.style.display = 'none'
+      rightElm.style.display = 'none'
       let left = 0
       let right = 0
       for (let i = 0; i < activeIds.length; i++) {
@@ -1298,10 +1313,8 @@ function setActiveId(ids = []) {
 
 
         let thatP = sdkP.entityMap.get(activeIds[i])
-        let thatD = sdkD.entityMap.get(activeIds[i])
-        if (!thatP || (thatP.type === 'terrain' || !thatP.show)) {
-          leftElm.style.display = 'none'
-          rightElm.style.display = 'none'
+        // let thatD = sdkD.entityMap.get(activeIds[i])
+        if (!thatP || (thatP.type === 'terrain' || !thatP.show) || thatP.type === 'TextBox') {
           continue
         }
         leftElm.style.display = 'unset'

src/Global/efflect/Sunshine/eventBinding.js

@@ -1,45 +1,89 @@
-class eventBinding {
+class EventBinding {
   constructor() {
     this.element = {}
   }
   static event = {}
 
   getEvent(name) {
-    return eventBinding.event[name]
+    return EventBinding.event[name]
   }
 
   getEventAll() {
-    return eventBinding.event
+    return EventBinding.event
   }
 
   setEvent(name, event) {
-    eventBinding.event[name] = event
+    EventBinding.event[name] = event
   }
 
   on(that, elements) {
+    this.element = {}
     for (let i = 0; i < elements.length; i++) {
-      let Event = []
-      let isEvent = false
-      let removeName = []
       if (!elements[i] || !elements[i].attributes) {
         continue;
       }
+      let Event = {
+        'input': [],
+        'change': [],
+        'blur': [],
+        'click': []
+      }
+      let isEvent = false
+      let removeName = []
       for (let m of elements[i].attributes) {
         switch (m.name) {
           case '@model': {
             isEvent = true
             if (elements[i].type == 'checkbox') {
-              Event.push((e) => { that[m.value] = e.target.checked })
+              Event.change.push((e) => { that[m.value] = e.target.checked })
               elements[i].checked = that[m.value]
             }
             else {
-              Event.push((e) => {
-                let value = e.target.value
-                if (e.target.type == 'number') {
-                  value = Number(value)
-                }
-                that[m.value] = value
-              })
+              if (elements[i].type == 'number') {
+                Event.input.push((e) => {
+                  if (e.target.value || e.target.value === 0) {
+                    let value = e.target.value
+                    value = Number(value)
+                    if (e.data != '.' && (e.data != '-' || e.target.value)) {
+                      if (((!e.target.max) && (!e.target.min)) || ((value <= Number(e.target.max)) && value >= Number(e.target.min))) {
+                        // that[m.value] = value
+                        value = value
+                      }
+                      if ((e.target.max) && value > Number(e.target.max)) {
+                        value = Number(e.target.max)
+                      }
+                      if ((e.target.min) && value < Number(e.target.min)) {
+                        value = Number(e.target.min)
+                      }
+                      // if ((e.target.dataset.min) && value < Number(e.target.dataset.min)) {
+                      //   value = Number(e.target.dataset.min)
+                      // }
+                      that[m.value] = value
+                    }
+                  }
+                })
+                Event.blur.push((e) => {
+                  let value = e.target.value
+                  if (e.target.value || (e.target.dataset.null !== 'undefined' && e.target.dataset.null !== '' && !Boolean(e.target.dataset.null))) {
+                    value = Number(value)
+                    if ((e.target.max) && value > Number(e.target.max)) {
+                      value = Number(e.target.max)
+                    }
+                    if ((e.target.min) && value < Number(e.target.min)) {
+                      value = Number(e.target.min)
+                    }
+                    if ((e.target.dataset.min) && value < Number(e.target.dataset.min)) {
+                      value = Number(e.target.dataset.min)
+                    }
+                  }
+                  that[m.value] = value
+                })
+              }
+              else {
+                Event.input.push((e) => {
+                  that[m.value] = e.target.value
+                })
+              }
               if (elements[i].nodeName == 'IMG') {
                 elements[i].src = that[m.value]
               }
@@ -57,13 +101,13 @@ class eventBinding {
             break;
           }
           case '@click': {
-            elements[i].addEventListener('click', (e) => {
-              if (typeof (that.Dialog[m.value]) === 'function') {
-                that.Dialog[m.value](e)
+            isEvent = true
+            Event.click.push((e) => {
+              if (typeof (that[m.value]) === 'function') {
+                that[m.value](e)
               }
-            });
+            })
             removeName.push(m.name)
-            // elements[i].attributes.removeNamedItem(m.name)
             break;
           }
         }
@@ -74,19 +118,18 @@ class eventBinding {
       }
 
       if (isEvent) {
-        let ventType = 'input'
-        if (elements[i].tagName != 'INPUT' || elements[i].type == 'checkbox') {
-          ventType = 'change'
-        }
-        elements[i].addEventListener(ventType, (e) => {
-          for (let t = 0; t < Event.length; t++) {
-            Event[t](e)
+        for (let key in Event) {
+          if (Event[key].length > 0) {
+            elements[i].addEventListener(key, (e) => {
+              for (let t = 0; t < Event[key].length; t++) {
+                Event[key][t](e)
+              }
+            });
           }
-        });
+        }
       }
     }
   }
 }
 
-const EventBinding = new eventBinding();
 export default EventBinding;

src/Global/efflect/Sunshine/index.js

@@ -3,7 +3,7 @@
  */
 import Dialog from '../../../Obj/Element/Dialog';
 import { html } from "./_element";
-import EventBinding from '../../../Obj/Element/Dialog/eventBinding';
+import EventBinding from './eventBinding';
 import { syncData } from '../../MultiViewportMode'
 import Tools from '../../../Tools'
 import TimeLine from './TimeLine'

src/Global/mouseRightMenu/index.js

@@ -121,6 +121,9 @@ function MouseRightMenu(sdk, status, callBack) {
         <ul class="base" style="list-style: none;padding: 0;margin: 0;font-size: 12px;">
           <li style="padding: 3px 10px;cursor: pointer;">绕鼠标点旋转</li>
         </ul>
+        <ul class="base" style="list-style: none;padding: 0;margin: 0;font-size: 12px;">
+          <li style="padding: 3px 10px;cursor: pointer;">文本框</li>
+        </ul>
         ${addedMenu}
       `
         _element.appendChild(menuElm)
@@ -175,6 +178,7 @@ function MouseRightMenu(sdk, status, callBack) {
                 break
               case '文本框':
                 object.position = position
+                key = 'textBox'
                 break
             }
             eventListener[sdk.div_id].callBack(key, object)

src/In/index.js

@@ -186,7 +186,7 @@ import Frustum from '../Obj/AirLine/frustum'
 import DrawTakeOff from '../Obj/AirLine/DrawTakeOff'
 import FlowLine from '../Obj/Base/FlowLine'
 import Sunshine from '../Global/efflect/Sunshine'
-// import Road2 from '../Obj/Base/RoadObject'
+import Road2 from '../Obj/Base/RoadObject'
 import TextBox from '../Obj/Base/TextBox'
 import BatchModel from '../Obj/Base/BatchModel'
 
@@ -261,7 +261,7 @@ if (!window.YJ) {
       // GenerateRoute
       Dialog,
       FlowLine,
-      // Road2,
+      Road2,
       TextBox,
       BatchModel
     },

src/Measure/MeasureDistance/index.js

@@ -91,7 +91,7 @@ class MeasureDistance extends Measure {
 
 
     //暂时固定取20个点
-    if (d > 20) {//大于20m时，固定取20个点
+    if (d > 2) {//大于20m时，固定取20个点
       meters = d / 20
       await start(meters)
     } else if (d < 1) {
@@ -106,8 +106,8 @@ class MeasureDistance extends Measure {
 
 
   async sampleHeight(p1, index) {
-    let p2 = await this.sampleHeightMostDetailed([p1])
-    p1.alt = p2[0].height
+    let height = await this.getClampToHeight(p1, [...this.sdk.viewer.entities.values])
+    p1.alt = height
     return {position: p1, index}
   }
 

src/Obj/Analysis/Contour/index.js

@@ -47,6 +47,11 @@ class ContourAnalysis {
     YJ.Analysis.AnalysesResults.push(this)
     this.createNewLine();
   }
+
+  get type() {
+    return 'ContourAnalysis'
+  }
+
   createNewLine() {
     ContourAnalysis.interpolatePoint(this);
   }

src/Obj/Analysis/Visibility/index.js

@@ -63,11 +63,15 @@ class VisibilityAnalysis extends Tools {
         that.tip.set_text("左键创建视角终点，右键结束通视分析")
         if (!that.resultObject.viewPoint) {
           let pos84 = that.cartesian3Towgs84(cartesian, that.viewer)
-          let positions = await Cesium.sampleTerrainMostDetailed(
-            that.sdk.viewer.terrainProvider,
-            [Cesium.Cartographic.fromDegrees(pos84.lng, pos84.lat)]
-          );
-          if (positions[0].height > pos84.alt) {
+          let positions
+          if(that.sdk.viewer.terrainProvider.availability)
+          {
+            positions = await Cesium.sampleTerrainMostDetailed(
+              that.sdk.viewer.terrainProvider,
+              [Cesium.Cartographic.fromDegrees(pos84.lng, pos84.lat)]
+            );
+          }
+          if (positions && positions[0].height > pos84.alt) {
             pos84.alt = positions[0].height
           }
           pos84.alt = pos84.alt + that.viewPointHeight

src/Obj/Analysis/test2/index.js

@@ -292,7 +292,7 @@ class PolygonObject extends Base {
   }
   set labelShow(v) {
     this.options.label.show = v
-    if (this.show) {
+    if (this.show && !this.showView || this.showView == 3) {
       this.label.show = v
     }
     else {

src/Obj/Base/AssembleObject/index.js

@@ -22,14 +22,53 @@ class AssembleObject extends Base {
    * @param sdk
    * @description 集结地
    * @param options {object} 属性
+   * @param options.id {string} 唯一标识
    * @param options.show=true {boolean} 显示/隐藏
    * @param options.name {string} 名称
-   * @param options.color="#ff000080" {string} 颜色
+   * @param options.color='rgba(255, 0, 0, 0.5)' {string} 颜色
    * @param options.height {number} 高度
    * @param options.heightMode=2{number} 高度模式（0：海拔高度；1：相对地表；2：依附模式）
-   * @param {Array.<object>} options.positions 坐标数组 [{lon,lat,alt},...]
-   * @param _Dialog {object} 弹框事件
-   * @param _Dialog.confirmCallBack {function} 弹框确认时的回调
+   * @param options.areaUnit='平方米' {string} 面积单位
+   * @param options.line {object} 边框
+   * @param options.line.width=2 {string} 边框宽
+   * @param options.line.color="rgba(155, 155, 124, 0.89)" {string} 边框颜色
+   * @param {Array.<object>} options.positions 必填，经纬度和高度的列表，值交替 [{lon,lat,alt},...]
+   * @param options.positions[].lng {number} 经度
+   * @param options.positions[].lat {number} 纬度
+   * @param options.positions[].alt {number} 高度
+   * @param options.label {object} 标签对象
+   * @param options.label.text {string} 标签文本
+   * @param options.label.show {string} 标签显隐
+   * @param options.label.position {string} 标签位置
+   * @param options.label.position {object} 标签位置
+   * @param options.label.position.lng {number} 经度
+   * @param options.label.position.lat {number} 纬度
+   * @param options.label.position.alt {number} 高度
+   * @param options.label.fontSize=20 {number} 字体大小
+   * @param options.label.fontFamily=0 {number} 字体项 0：黑体；1：思源黑体；2：庞门正道标题体；3：数黑体
+   * @param options.label.color=#ffffff {string} 字体颜色
+   * @param options.label.lineWidth=4 {number} 引线宽
+   * @param options.label.lineColor=#00ffff80 {string} 引线颜色
+   * @param options.label.pixelOffset=20 {number} 字体偏移(引线长度)
+   * @param options.label.backgroundColor=['#00ffff80', '#00ffff80'] {array} 背景颜色
+   * @param options.label.scaleByDistance {boolean} 距离缩放
+   * @param options.label.near=2000 {number} 视野缩放最近距离
+   * @param options.label.far=100000 {number} 视野缩放最远距离
+   * @param options.attribute {object} 属性内容
+   * @param options.attribute.link={} {object} 链接
+   * @param options.attribute.link.content=[]] {array} 链接内容
+   * @param options.attribute.link.content[].name {string} 链接名称
+   * @param options.attribute.link.content[].url {string} 链接地址
+   * @param options.richTextContent {string} 富文本内容
+   * @param options.customView {object} 默认视角
+   * @param options.customView.orientation {object} 默认视角方位
+   * @param options.customView.orientation.heading {number} 航向角
+   * @param options.customView.orientation.pitch {number} 俯仰角
+   * @param options.customView.orientation.roll {number} 翻滚角
+   * @param options.customView.relativePosition {object} 视角相对位置
+   * @param options.customView.relativePosition.lng {number} 经度
+   * @param options.customView.relativePosition.lat {number} 纬度
+   * @param options.customView.relativePosition.alt {number} 高度
    * */
   constructor(sdk, options = {}, _Dialog = {}) {
     super(sdk, options);
@@ -40,7 +79,7 @@ class AssembleObject extends Base {
     this.options.positions = options.positions || []
     this.options.line = options.line || {}
     this.options.line.width = ((this.options.line.width || this.options.line.width === 0) ? this.options.line.width : 3)
-    this.options.line.color = this.options.line.color || 'rgba(255, 0, 0, 0.5)'
+    this.options.line.color = this.options.line.color || 'rgba(255, 0, 0, 1)'
     this.options['area-unit'] = options['area-unit'] || '平方米'
     this.entity
     this.event = new MouseEvent(this.sdk)
@@ -319,7 +358,7 @@ class AssembleObject extends Base {
   }
   set labelShow(v) {
     this.options.label.show = v
-    if (this.show) {
+    if (this.show && !this.showView || this.showView == 3) {
       this.label.show = v
     }
     else {

src/Obj/Base/AttackArrowObject/index.js

@@ -22,14 +22,56 @@ class AttackArrowObject extends Base {
    * @param sdk
    * @description 箭头面
    * @param options {object} 属性
+   * @param options.id {string} 唯一标识
    * @param options.show=true {boolean} 显示/隐藏
    * @param options.name {string} 名称
-   * @param options.color="#ff000080" {string} 颜色
+   * @param options.color='rgba(255, 0, 0, 0.5)' {string} 颜色
    * @param options.height {number} 高度
    * @param options.heightMode=2{number} 高度模式（0：海拔高度；1：相对地表；2：依附模式）
-   * @param {Array.<object>} options.positions 坐标数组 [{lon,lat,alt},...]
-   * @param _Dialog {object} 弹框事件
-   * @param _Dialog.confirmCallBack {function} 弹框确认时的回调
+   * @param options.areaUnit='平方米' {string} 面积单位
+   * @param options.line {object} 边框
+   * @param options.line.width=2 {string} 边框宽
+   * @param options.line.color="rgba(155, 155, 124, 0.89)" {string} 边框颜色
+   * @param {Array.<object>} options.positions 必填，经纬度和高度的列表，值交替 [{lon,lat,alt},...]
+   * @param options.positions[].lng {number} 经度
+   * @param options.positions[].lat {number} 纬度
+   * @param options.positions[].alt {number} 高度
+   * @param options.spreadState=false {boolean} 动画
+   * @param options.loop=false {loop} 动画重复
+   * @param options.spreadTime=3000 {number} 动画持续时长(毫秒)
+   * @param options.label {object} 标签对象
+   * @param options.label.text {string} 标签文本
+   * @param options.label.show {string} 标签显隐
+   * @param options.label.position {string} 标签位置
+   * @param options.label.position {object} 标签位置
+   * @param options.label.position.lng {number} 经度
+   * @param options.label.position.lat {number} 纬度
+   * @param options.label.position.alt {number} 高度
+   * @param options.label.fontSize=20 {number} 字体大小
+   * @param options.label.fontFamily=0 {number} 字体项 0：黑体；1：思源黑体；2：庞门正道标题体；3：数黑体
+   * @param options.label.color=#ffffff {string} 字体颜色
+   * @param options.label.lineWidth=4 {number} 引线宽
+   * @param options.label.lineColor=#00ffff80 {string} 引线颜色
+   * @param options.label.pixelOffset=20 {number} 字体偏移(引线长度)
+   * @param options.label.backgroundColor=['#00ffff80', '#00ffff80'] {array} 背景颜色
+   * @param options.label.scaleByDistance {boolean} 距离缩放
+   * @param options.label.near=2000 {number} 视野缩放最近距离
+   * @param options.label.far=100000 {number} 视野缩放最远距离
+   * @param options.attribute {object} 属性内容
+   * @param options.attribute.link={} {object} 链接
+   * @param options.attribute.link.content=[]] {array} 链接内容
+   * @param options.attribute.link.content[].name {string} 链接名称
+   * @param options.attribute.link.content[].url {string} 链接地址
+   * @param options.richTextContent {string} 富文本内容
+   * @param options.customView {object} 默认视角
+   * @param options.customView.orientation {object} 默认视角方位
+   * @param options.customView.orientation.heading {number} 航向角
+   * @param options.customView.orientation.pitch {number} 俯仰角
+   * @param options.customView.orientation.roll {number} 翻滚角
+   * @param options.customView.relativePosition {object} 视角相对位置
+   * @param options.customView.relativePosition.lng {number} 经度
+   * @param options.customView.relativePosition.lat {number} 纬度
+   * @param options.customView.relativePosition.alt {number} 高度
    * */
   constructor(sdk, options = {}, _Dialog = {}) {
     super(sdk, options);
@@ -40,7 +82,7 @@ class AttackArrowObject extends Base {
     this.options.heightMode = (options.heightMode || options.heightMode == 0) ? options.heightMode : 2
     this.options.line = options.line || {}
     this.options.line.width = ((this.options.line.width || this.options.line.width === 0) ? this.options.line.width : 3)
-    this.options.line.color = this.options.line.color || 'rgba(255, 0, 0, 0.5)'
+    this.options.line.color = this.options.line.color || 'rgba(255, 0, 0, 1)'
     this.options['area-unit'] = options['area-unit'] || '平方米'
     this.entity
     this.event = new MouseEvent(this.sdk)
@@ -324,7 +366,7 @@ class AttackArrowObject extends Base {
   }
   set labelShow(v) {
     this.options.label.show = v
-    if (this.show) {
+    if (this.show && !this.showView || this.showView == 3) {
       this.label.show = v
     }
     else {

src/Obj/Base/BaseSource/BaseLayer/index.js

@@ -9,7 +9,7 @@
 import Dialog from '../../../Element/Dialog';
 import CoordTransform from "../../../../transform/CoordTransform";
 import BaseSource from "../index";
-import { syncData } from '../../../../Global/MultiViewportMode'
+import { syncData, get2DView } from '../../../../Global/MultiViewportMode'
 import { setSplitDirection, syncSplitData } from '../../../../Global/SplitScreen'
 import { setActiveViewer, closeRotateAround, closeViewFollow } from '../../../../Global/global'
 
@@ -244,8 +244,19 @@ class BaseLayer extends BaseSource {
         this.originalOptions = this.deepCopyObj(this.options)
         this._DialogObject.close()
         this.Dialog.confirmCallBack && this.Dialog.confirmCallBack(this.originalOptions)
-        syncData(this.sdk, this.options.id)
+        // syncData(this.sdk, this.options.id)
         syncSplitData(this.sdk, this.options.id)
+        let sdk2D = get2DView()
+        if (sdk2D && sdk2D != this.sdk) {
+          for(let i=0;i<sdk2D.viewer.imageryLayers._layers.length;i++) {
+            let layer = sdk2D.viewer.imageryLayers._layers[i]
+            if(layer._id && layer._id == this.options.id) {
+              layer.alpha = this.options.alpha
+              break
+            }
+          }
+
+        }
       },
       closeCallBack: () => {
         this.reset()

src/Obj/Base/BaseSource/BaseModel/Model/_element.js

@@ -56,7 +56,7 @@ function html(that) {
         </div>
       </div>
       <div class="col">
-        <span class="label">固定大小</span>
+        <span class="label" style="flex: 0 0 60px;">固定大小</span>
         <input class="btn-switch" type="checkbox" @model="scaleByDistance">
       </div>
     </div>

src/Obj/Base/BaseSource/BaseModel/Model/index.js

@@ -17,30 +17,62 @@ import { setActiveViewer, closeRotateAround, closeViewFollow } from '../../../..
 class Model extends BaseModel {
   #timeoutEventObject = null
   /**
-* @constructor
-* @description 加载模型
-* @param sdk {object} sdk
-* @param options {object} 模型参数
-* @param options.id {string} 对象id
-* @param options.show=true {boolean} 模型显隐
-* @param options.name {string} 名称
-* @param options.url {string} 资源地址
-* @param options.position {object} 模型位置
-* @param options.position.lng {number} 经度
-* @param options.position.lat {number} 纬度
-* @param options.position.alt {number} 高度
-* @param options.scale {object} 比例
-* @param options.scale.x=1 {number} 比例
-* @param options.scale.y=1 {number} 比例
-* @param options.scale.z=1 {number} 比例
-* @param options.maximumScale=100 {number} 最大比例
-* @param options.minimumPixelSize=60 {number} 最小像素
-* @param options.scaleByDistance=true {boolean} 随视野缩放
-* @param options.rotate {object} 旋转角度
-* @param options.rotate.x {number} x轴旋转度数
-* @param options.rotate.y {number} y轴旋转度数
-* @param options.rotate.z {number} z轴旋转度数
-* @param options.img {string} 图片地址
+   * @constructor
+   * @description 加载模型
+   * @param sdk {object} sdk
+   * @param options {object} 模型参数
+   * @param options.id {string} 唯一标识
+   * @param options.show=true {boolean} 模型显隐
+   * @param options.name {string} 名称
+   * @param options.url {string} 资源地址
+   * @param options.position {object} 模型位置
+   * @param options.position.lng {number} 经度
+   * @param options.position.lat {number} 纬度
+   * @param options.position.alt {number} 高度
+   * @param options.scale {object} 比例
+   * @param options.scale.x=1 {number} x轴比例
+   * @param options.scale.y=1 {number} y轴比例
+   * @param options.scale.z=1 {number} z轴比例
+   * @param options.maximumScale=100 {number} 最大比例
+   * @param options.minimumPixelSize=60 {number} 最小像素
+   * @param options.scaleByDistance=true {boolean} 随视野缩放
+   * @param options.rotate {object} 旋转角度
+   * @param options.rotate.x {number} x轴旋转度数
+   * @param options.rotate.y {number} y轴旋转度数
+   * @param options.rotate.z {number} z轴旋转度数
+   * @param options.label {object} 标签对象
+   * @param options.label.text {string} 标签文本
+   * @param options.label.show {string} 标签显隐
+   * @param options.label.position {string} 标签位置
+   * @param options.label.position {object} 标签位置
+   * @param options.label.position.lng {number} 经度
+   * @param options.label.position.lat {number} 纬度
+   * @param options.label.position.alt {number} 高度
+   * @param options.label.fontSize=20 {number} 字体大小
+   * @param options.label.fontFamily=0 {number} 字体项 0：黑体；1：思源黑体；2：庞门正道标题体；3：数黑体
+   * @param options.label.color=#ffffff {string} 字体颜色
+   * @param options.label.lineWidth=4 {number} 引线宽
+   * @param options.label.lineColor=#00ffff80 {string} 引线颜色
+   * @param options.label.pixelOffset=20 {number} 字体偏移(引线长度)
+   * @param options.label.backgroundColor=['#00ffff80', '#00ffff80'] {array} 背景颜色
+   * @param options.label.scaleByDistance {boolean} 距离缩放
+   * @param options.label.near=2000 {number} 视野缩放最近距离
+   * @param options.label.far=100000 {number} 视野缩放最远距离
+   * @param options.attribute {object} 属性内容
+   * @param {object} options.attribute.link={} 链接
+   * @param options.attribute.link.content=[]] {array} 链接内容
+   * @param options.attribute.link.content[].name {string} 链接名称
+   * @param options.attribute.link.content[].url {string} 链接地址
+   * @param options.richTextContent {string} 富文本内容
+   * @param options.customView {object} 默认视角
+   * @param options.customView.orientation {object} 默认视角方位
+   * @param options.customView.orientation.heading {number} 航向角
+   * @param options.customView.orientation.pitch {number} 俯仰角
+   * @param options.customView.orientation.roll {number} 翻滚角
+   * @param options.customView.relativePosition {object} 视角相对位置
+   * @param options.customView.relativePosition.lng {number} 经度
+   * @param options.customView.relativePosition.lat {number} 纬度
+   * @param options.customView.relativePosition.alt {number} 高度
 * */
   constructor(earth, options = {}, _Dialog = {}) {
     super(earth, options, _Dialog = {})
@@ -637,7 +669,7 @@ class Model extends BaseModel {
 
   set labelShow(v) {
     this.options.label.show = v
-    if (this.show) {
+    if (this.show && !this.showView || this.showView == 3) {
       this.label && (this.label.show = v)
     }
     else {

src/Obj/Base/BaseSource/BaseTerrain/index.js

@@ -8,7 +8,7 @@
 import Dialog from '../../../Element/Dialog';
 import { getHost } from "../../../../on";
 import BaseSource from "../index";
-import { setActiveViewer, closeRotateAround, closeViewFollow} from '../../../../Global/global'
+import { setActiveViewer, closeRotateAround, closeViewFollow } from '../../../../Global/global'
 import { setSplitDirection, syncSplitData } from '../../../../Global/SplitScreen'
 
 class BaseTerrain extends BaseSource {
@@ -78,6 +78,11 @@ class BaseTerrain extends BaseSource {
   close() {
     this.sdk.viewer.scene.terrainProvider =
       new Cesium.EllipsoidTerrainProvider({})
+    for (let i = 0; i < YJ.Analysis.AnalysesResults.length; i++) {
+      if (YJ.Analysis.AnalysesResults[i].type === 'ContourAnalysis') {
+        YJ.Analysis.AnalysesResults[i].destroy()
+      }
+    }
     syncSplitData(this.sdk, this.options.id)
 
     clearTimeout(this.#updateModelTimeout)
@@ -156,7 +161,7 @@ class BaseTerrain extends BaseSource {
     }
     setActiveViewer(0)
     closeRotateAround(this.sdk)
-  closeViewFollow(this.sdk)
+    closeViewFollow(this.sdk)
 
     if (this.options.customView && this.options.customView.relativePosition && this.options.customView.orientation) {
       let orientation = {

src/Obj/Base/BatchModel/_element_拓展.js

@@ -0,0 +1,229 @@
+import { attributeElm } from '../../Element/elm_html'
+
+function html(that) {
+  return `
+    <span class="custom-divider"></span>
+    <div class="div-item">
+        <div class="row">
+            <div class="col">
+                <span class="label">颜色</span>
+                <div class="color"></div>
+            </div>
+            <div class="col">
+            </div>
+        </div>
+    </div>
+    <span class="custom-divider"></span>
+    <div class="div-item">
+        <div class="row">
+            <div style="width: 46%;">
+                <div class="row add-type-box">
+                    <div class="lable-left-line">添加方式
+                        <div class="input input-select add-type" style="margin-left: 20px;"></div>
+                    </div>
+                </div>
+            </div>
+            <div style="width: 50%;">
+                <div class="row" style="margin-bottom: 5px;">
+                    <div class="col">
+                        <span class="label">朝向偏移</span>
+                        <div class="input-number input-number-unit-1">
+                            <input class="input" type="number" title="" min="0" max="360" @model="deviation">
+                            <span class="unit">°</span>
+                            <span class="arrow"></span>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <h4>模型间隔</h4>
+        <div class="row">
+            <div class="col">
+                <div class="YJ-custom-checkbox-box" style="display: flex;align-items: center;cursor: pointer;">
+                    <input type="checkbox" class="YJ-custom-checkbox">
+                    <span style="margin-left: 10px; margin-bottom: 1px;user-select: none;">自定义距离</span>
+                </div>
+            </div>
+            <div class="col">
+                <div class="YJ-custom-checkbox-box" style="display: flex;align-items: center;cursor: pointer;">
+                    <input type="checkbox" class="YJ-custom-checkbox">
+                    <span style="margin-left: 10px; margin-bottom: 1px;user-select: none;">固定距离</span>
+                </div>
+            </div>
+            <div class="col">
+                <span class="label">模型间隔</span>
+                <div class="input-number input-number-unit-1">
+                    <input class="input" type="number" title="" min="0" max="360" @model="spacing">
+                    <span class="unit">米</span>
+                    <span class="arrow"></span>
+                </div>
+            </div>
+        </div>
+        <h4>线型选择</h4>
+        <div class="row">
+            <div class="col">
+                <div class="YJ-custom-checkbox-box" style="display: flex;align-items: center;cursor: pointer;">
+                    <input type="checkbox" class="YJ-custom-checkbox">
+                    <span style="margin-left: 10px; margin-bottom: 1px;user-select: none;">折线</span>
+                </div>
+            </div>
+            <div class="col">
+                <div class="YJ-custom-checkbox-box" style="display: flex;align-items: center;cursor: pointer;">
+                    <input type="checkbox" class="YJ-custom-checkbox">
+                    <span style="margin-left: 10px; margin-bottom: 1px;user-select: none;">曲线</span>
+                </div>
+            </div>
+            <div class="col">
+                <span class="label">线条数量</span>
+                <div class="input-number input-number-unit-1">
+                    <input class="input" type="number" title="" min="0" max="360" @model="lineNum">
+                    <span class="unit">条</span>
+                    <span class="arrow"></span>
+                </div>
+            </div>
+            <div class="col">
+                <span class="label">线条间隔</span>
+                <div class="input-number input-number-unit-1">
+                    <input class="input" type="number" title="" min="0" max="360" @model="lineSpacing">
+                    <span class="unit">米</span>
+                    <span class="arrow"></span>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col">
+                <div class="YJ-custom-checkbox-box" style="display: flex;align-items: center;cursor: pointer;">
+                    <input type="checkbox" class="YJ-custom-checkbox">
+                    <span style="margin-left: 10px; margin-bottom: 1px;user-select: none;">随机采样</span>
+                </div>
+            </div>
+            <div class="col">
+                <span class="label">随机数量</span>
+                <div class="input-number input-number-unit-1">
+                    <input class="input" type="number" title="" min="0" max="360" @model="lineNum">
+                    <span class="unit">个</span>
+                    <span class="arrow"></span>
+                </div>
+            </div>
+            <div class="col"></div>
+        </div>
+        <div class="row">
+            <div class="col">
+                <div class="YJ-custom-checkbox-box" style="display: flex;align-items: center;cursor: pointer;">
+                    <input type="checkbox" class="YJ-custom-checkbox">
+                    <span style="margin-left: 10px; margin-bottom: 1px;user-select: none;">网格采样</span>
+                </div>
+            </div>
+            <div class="col">
+                <span class="label">首边间隔</span>
+                <div class="input-number input-number-unit-1">
+                    <input class="input" type="number" title="" min="0" max="360" @model="fistLineSpacing">
+                    <span class="unit">米</span>
+                    <span class="arrow"></span>
+                </div>
+            </div>
+            <div class="col">
+                <span class="label">次边间隔</span>
+                <div class="input-number input-number-unit-1">
+                    <input class="input" type="number" title="" min="0" max="360" @model="secondLineSpacing">
+                    <span class="unit">米</span>
+                    <span class="arrow"></span>
+                </div>
+            </div>
+        </div>
+    </div>
+    <span class="custom-divider"></span>
+    <div class="row">
+        <DIV-cy-tabs id="point-object-edit-tabs">
+            <DIV-cy-tab-pane label="空间信息">
+                <div class="row">
+                    <div class="col height-mode-box">
+                        <span class="label" style="flex: 0 0 56px;">高度模式</span>
+                        <div class="height-mode"></div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div style="width: 46%;">
+                        <div class="row add-type-box">
+                            <div class="lable-left-line">缩放
+                                <div class="YJ-custom-checkbox-box" style="display: flex;align-items: center;cursor: pointer;">
+                                    <input type="checkbox" class="YJ-custom-checkbox">
+                                    <span style="margin-left: 10px; margin-bottom: 1px;user-select: none;">是否等比例缩放</span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </DIV-cy-tab-pane>
+            <DIV-cy-tab-pane label="标注风格">
+                <div>
+                    <div class="row" style="margin-bottom: 10px;">
+                      <div class="col">
+                          <span class="label">新增模型风格设置</span>
+                          <button @click="openRichTextEditor">初始风格</button>
+                      </div>
+                      <div class="col">
+                          <button @click="openRichTextEditor">当前风格</button>
+                      </div>
+                    </div>
+
+                    <div class="row" style="margin-bottom: 10px;">
+                        <div class="col" style="flex: 0 0 80px;">
+                            <span class="label" style="flex: none;">显隐</span>
+                            <input class="btn-switch" type="checkbox" @model="billboardShow">
+                        </div>
+                        <div class="col" style="flex: 0 0 90px;">
+                            <span class="label" style="flex: none;">图标</span>
+                            <div class="image-box" @click="clickChangeImage">
+                                <img class="image" src="" alt="" @model="billboardImage">
+                            </div>
+                        </div>
+                        <div class="col" style="flex: 0 0 90px;">
+                            <span class="label" style="flex: none;">默认图标</span>
+                            <div class="image-box" @click="clickChangeDefaultImage">
+                                <img class="image" src="" alt="" @model="billboardDefaultImage">
+                            </div>
+                        </div>
+                        <div class="col">
+                            <span class="label">图标倍数</span>
+                            <div class="input-number input-number-unit-2">
+                                <input class="input" type="number" title="" min="0.1" max="99" @model="billboardScale">
+                                <span class="unit">倍</span>
+                                <span class="arrow"></span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div>
+                    <h4>文字设置</h4>
+                    <div class="row">
+                        <div class="col" style="flex: 0 0 80px;">
+                            <span class="label" style="flex: none;">显隐</span>
+                            <input class="btn-switch" type="checkbox" @model="labelShow">
+                        </div>
+                        <div class="col font-select-box">
+                            <span class="label" style="flex: none;">字体选择</span>
+                            <div class="input input-select font-select"></div>
+                        </div>
+                        <div class="col">
+                            <span class="label">文字大小</span>
+                            <div class="input-number input-number-unit-2">
+                                <input class="input" type="number" title="" min="1" max="99" @model="labelFontSize" style="width: 70px;">
+                                <span class="unit">px</span>
+                                <span class="arrow"></span>
+                            </div>
+                        </div>
+                        <div class="col">
+                            <span class="label">文字颜色</span>
+                            <div class="labelColor"></div>
+                        </div>
+                    </div>
+                </div>
+            </DIV-cy-tab-pane>
+        </DIV-cy-tabs>
+    </div>
+    <span class="custom-divider"></span>
+    `
+}
+
+export { html }

src/Obj/Base/BatchModel/index.js

@@ -5,6 +5,7 @@ import Dialog from '../../Element/Dialog';
 import { html } from "./_element";
 import EventBinding from '../../Element/Dialog/eventBinding';
 import Base from "../index";
+import Tools from "../../../Tools";
 import { syncData } from '../../../Global/MultiViewportMode'
 import Model from '../BaseSource/BaseModel/Model'
 import { legp } from '../../Element/datalist'
@@ -13,7 +14,7 @@ import DrawPolyline from '../../../Draw/drawPolyline'
 import DrawPolygon from '../../../Draw/drawPolygon'
 import DrawThreeRect from '../../../Draw/drawThreeRect'
 import DrawPoint from '../../../Draw/drawPoint'
-import { setActiveViewer, closeRotateAround, closeViewFollow } from '../../../Global/global'
+import { setActiveViewer, closeRotateAround, closeViewFollow, CesiumContainer } from '../../../Global/global'
 
 import { setSplitDirection, syncSplitData, setActiveId } from '../../../Global/SplitScreen'
 
@@ -37,7 +38,7 @@ class BatchModel extends Base {
     this.options.name = options.name || '批量模型'
     this.options.type = options.type || '面'
     this.options.url = options.url || ''
-    this.options.spacing = options.spacing || 50
+    this.options.spacing = options.spacing * 1 || 50
     this.options.positions = options.positions || []
     this.options.show = (options.show || options.show === false) ? options.show : true
     this.callback = callback
@@ -46,9 +47,14 @@ class BatchModel extends Base {
     this._elms = {};
     this.pointArr = []
     this.sdk.addIncetance(this.options.id, this)
+    let tools = new Tools(sdk)
     // BatchModel.computeDis(this)
     // if (this.options.positions.length > 0 || this.options.positions.lng) {
-    if (options.type && options.spacing != undefined) {
+    if (this.options.spacing < 0 || options.spacing * 1 === 0) {
+      tools.message({ type: 'warning', text: '请输入正确的间距！' })
+      return;
+    }
+    if ((options.type && options.spacing != undefined) || options.type == '点') {
       // BatchModel.computeDis(this)
 
       let Draw
@@ -67,6 +73,32 @@ class BatchModel extends Base {
       }
       Draw && Draw.start((a, positions) => {
         this.options.positions = positions;
+        //判断范围是否过大
+        if (options.type == '面') {
+          let posi = positions.map(v => {
+            return Cesium.Cartesian3.fromDegrees(v.lng, v.lat)
+          })
+          let dis1 = Cesium.Cartesian3.distance(posi[0], posi[1])
+          let dis2 = Cesium.Cartesian3.distance(posi[1], posi[2])
+          let num1 = dis1 / this.options.spacing
+          let num2 = dis2 / this.options.spacing
+          if (num1 * num2 > 100) {
+            tools.message({ type: 'warning', text: '数量大于100，请重新绘制' })
+            return;
+          }
+        } else if (options.type == '线') {
+          let posi = positions.map(v => {
+            return Cesium.Cartesian3.fromDegrees(v.lng, v.lat)
+          })
+          let dis = 0
+          for (let i = 0; i < posi.length - 2; i++) {
+            dis += Cesium.Cartesian3.distance(posi[i], posi[i + 1])
+          }
+          if (dis / this.options.spacing > 100) {
+            tools.message({ type: 'warning', text: '数量大于100，请重新绘制' })
+            return;
+          }
+        }
         // this.callback(this.options);
         (this.options.positions.length || this.options.positions.lng) && BatchModel.computeDis(this)
       })

src/Obj/Base/BillboardObject/index.js

@@ -29,7 +29,8 @@ import MouseTip from '../../../MouseTip'
 import {
   setSplitDirection,
   syncSplitData,
-  setActiveId
+  setActiveId,
+  getState
 } from '../../../Global/SplitScreen'
 import {
   setActiveViewer,
@@ -40,32 +41,71 @@ import {
 import { getGoodsList } from '../../../Tools/getGoodsList'
 
 class BillboardObject extends Base {
+  #_postRenderEvent = null
+  #_destroyMouseEvent = null
+  #_billboardHeight = 0
+
+
   /**
    * @constructor
-   * @description 创建点标注
-   * @param sdk {object} sdk
-   * @param options {object} 标注参数
+   * @description 点标注
+   * @param options {object} 属性
    * @param options.id {string} 标注id
-   * @param {object} options.positions 位置
-   * @param {number} options.positions.lng 经度
-   * @param {number} options.positions.lat 纬度
-   * @param {number} options.positions.alt 高度
+   * @param options.show=true {boolean} 标注整体的显隐
+   * @param options.name {string} 名称
+   * @param {object} options.position={} 必填，位置
+   * @param {number} options.position.lng 经度
+   * @param {number} options.position.lat 纬度
+   * @param {number} options.position.alt 高度
    * @param {number} options.heightMode=3 高度模式（0：海拔高度；1：相对地表；2：依附地表; 3：依附模型）
-   * @param [options.scaleByDistance=true] {boolean} 图标是否跟随视角变化进行字段缩放
-   * @param [options.show=true] {boolean} 标注整体的显示/隐藏
-   * @param [options.near=2000] {number} 近端可视距离 scaleByDistance为true时生效
-   * @param [options.far=100000]  {number} 远端可视距离 scaleByDistance为true时生效
-   * @param options.billboard {object} 标注中图标的参数
-   * @param [options.billboard.show=true] {boolean} 标注中图标的显示与隐藏
+   * @param [options.scaleByDistance=true] {boolean} 是否开启跟随视野缩放
+   * @param [options.near=2000] {number} 视野缩放最近距离
+   * @param [options.far=100000]  {number} 视野缩放最远距离
+   * @param options.billboard {object} 图标参数
+   * @param [options.billboard.show=true] {boolean} 图标显隐
    * @param options.billboard.image {string} 图标路径
    * @param options.billboard.defaultImage {string} 默认图标的唯一标识
-   * @param [options.billboard.scale=3] {number} 图标倍数
-   *@param options.label {object} 标注文字的参数
-   *@param [options.label.text] {string} 标注中文字
-   *@param [options.label.show=true] {boolean} 标注文字显示/隐藏
-   *@param [options.label.fontFamily=0] {number} 标注文字字体 0：黑体；1：思源黑体；2：庞门正道标题体；3：数黑体
-   *@param [options.label.fontSize=39] {number} 标注文字大小 单位px，微软雅黑
-   *@param [options.label.color=#00ffff] {string} 标注文字颜色
+   * @param [options.billboard.scale=3] {number} 图标放大倍数
+   * @param options.label {object} 文字参数
+   * @param [options.label.text] {string} 文字内容
+   * @param [options.label.show=true] {boolean} 文字显隐
+   * @param [options.label.fontFamily=0] {number} 文字字体项 0：黑体；1：思源黑体；2：庞门正道标题体；3：数黑体
+   * @param [options.label.fontSize=39] {number} 文字大小, 单位px
+   * @param [options.label.color=#00ffff] {string} 文字颜色
+   * @param options.attribute {object} 属性内容
+   * @param {object} options.attribute.link={}  链接
+   * @param options.attribute.link.content=[]] {array} 链接内容
+   * @param options.attribute.link.content[].name {string} 链接名称
+   * @param options.attribute.link.content[].url {string} 链接地址
+   * @param {object} options.attribute.vr={} 全景图
+   * @param options.attribute.vr.content=[]] {array} 全景图内容
+   * @param options.attribute.vr.content[].name {string} 名称
+   * @param options.attribute.vr.content[].url {string} 地址
+   * @param {object} ptions.attribute.camera={} 摄像头
+   * @param options.attribute.camera.content=[]] {array} 摄像头内容
+   * @param {object} options.attribute.ISC={} ISC
+   * @param options.attribute.ISC.content=[]] {array} ISC内容
+   * @param {object} options.attribute.goods={} 物资
+   * @param options.attribute.goods.content=[]] {array} 物资内容
+   * @param options.attribute.goods.content[].ID {string} ID
+   * @param options.attribute.goods.content[].name {string} 名称
+   * @param options.attribute.goods.content[].cnt {string} 数量
+   * @param options.richTextContent {string} 富文本内容
+   * @param options.customView {object} 默认视角
+   * @param options.customView.orientation {object} 默认视角方位
+   * @param options.customView.orientation.heading {number} 航向角
+   * @param options.customView.orientation.pitch {number} 俯仰角
+   * @param options.customView.orientation.roll {number} 翻滚角
+   * @param options.customView.relativePosition {object} 视角相对位置
+   * @param options.customView.relativePosition.lng {number} 经度
+   * @param options.customView.relativePosition.lat {number} 纬度
+   * @param options.customView.relativePosition.alt {number} 高度
+   * 
+
+
+
+
+
    *@param _Dialog {object} 弹框事件
    *@param _Dialog.confirmCallBack {function} 弹框确认时的回调
    *@param _Dialog.instructSubmit(id,name,instruct) {function} 提交指令（ID, 名称，指令内容）
@@ -118,6 +158,7 @@ class BillboardObject extends Base {
     this.options.positions.alt = Number(
       Number(options.positions.alt || 0).toFixed(2)
     )
+    this.#_billboardHeight = this.options.positions.alt
     // this.options.diffuseShow = options.diffuseShow || false
     // this.options.diffuseRadius = (options.diffuseRadius || options.diffuseRadius === 0) ? options.diffuseRadius : 10
     // this.options.diffuseDuration = (options.diffuseDuration || options.diffuseDuration === 0) ? options.diffuseDuration : 2000
@@ -145,11 +186,18 @@ class BillboardObject extends Base {
       this.options.attribute.goods.content || []
     this.options.attributeType = options.attributeType || 'richText'
     this.options.coordinate = options.coordinate || ''
+    this.options.attributeBoxState = options.attributeBoxState || false
     this.operate = {}
     this._elms = {}
     this.previous = {
       positions: { ...this.options.positions }
     }
+    this.options.attributePos = options.attributePos || {
+      x: 60,
+      y: 60,
+      width: 200,
+      height: 120
+    }
     this.entity
     this._proj = this.sdk.proj
 
@@ -182,7 +230,111 @@ class BillboardObject extends Base {
 
 
 
+    this.#_destroyMouseEvent = () => {
+      this.attributeElm && (this.attributeElm.style.pointerEvents = 'unset')
+      if(this.sdk && this.sdk.viewer && this.sdk.viewer._element) {
+        this.sdk.viewer._element.onmousemove = null
+      }
+      document.removeEventListener('mouseup', this.#_destroyMouseEvent)
+      document.removeEventListener('mouseleave', this.#_destroyMouseEvent)
+    }
 
+    this.#_postRenderEvent = () => {
+      let siteInfoPosition = Cesium.Cartesian3.fromDegrees(
+        this.options.positions.lng,
+        this.options.positions.lat,
+        this.#_billboardHeight
+      )
+      if (this.attributeElm && this.entity) {
+        let winpos = this.sdk.viewer.scene.cartesianToCanvasCoordinates(
+          siteInfoPosition
+        )
+        let pixelOffset = this.entity.label.pixelOffset.getValue()
+        if (winpos) {
+          let scale = getCurrentBillboardScale(this.entity, this.sdk.viewer.scene)
+          let height = ((this.entity.billboard.height.getValue() * (this.options.billboard.scale || 0)) + this.options.label.fontSize) * (1 - (scale * scale))
+          let flag = false
+          let lineElm = this.attributeElm.getElementsByClassName('billboard-attribute-box-line')[0]
+          let leftTopElm = this.attributeElm.getElementsByClassName('left-top')[0]
+          let rightTopElm = this.attributeElm.getElementsByClassName('right-top')[0]
+          this.attributeElm.style.left = (winpos.x + this.options.attributePos.x).toFixed(0) + 'px'
+          this.attributeElm.style.top = (winpos.y + pixelOffset.y - (this.options.label.show ? (this.options.label.fontSize / 2) : -(this.options.label.fontSize / 2)) - this.attributeElm.offsetHeight - this.options.attributePos.y + height).toFixed(0) + 'px'
+          this.attributeElm.style.width = this.options.attributePos.width + 'px'
+          this.attributeElm.style.height = this.options.attributePos.height + 'px'
+          lineElm.style.zIndex = '-1'
+          if (this.options.attributePos.x < -this.options.attributePos.width / 2) {
+            flag = true
+            lineElm.style.left = 'unset'
+            lineElm.style.right = '0'
+            leftTopElm.style.display = 'block'
+            rightTopElm.style.display = 'none'
+          }
+          else {
+            lineElm.style.left = '0'
+            lineElm.style.right = 'unset'
+            leftTopElm.style.display = 'none'
+            rightTopElm.style.display = 'block'
+          }
+
+          let lineLength
+          let lineAngleRad
+          let lineAngle
+          let x
+          let y
+          if (flag) {
+            x = this.attributeElm.offsetWidth + this.options.attributePos.x
+            y = this.options.attributePos.y ? this.options.attributePos.y : 0
+          }
+          else {
+            x = this.options.attributePos.x
+            y = this.options.attributePos.y ? this.options.attributePos.y : 0
+          }
+          lineLength = Math.sqrt((x * x) + (y * y)).toFixed(2);
+          lineAngleRad = Math.atan(x / y);
+          lineAngle = parseFloat((lineAngleRad * 180 / Math.PI).toFixed(2));
+          if (this.options.attributePos.y < 0) {
+            lineAngle = lineAngle + 180
+          }
+          // if(this.options.attributePos.y<-this.options.attributePos.height/2) {
+          //   lineElm.style.bottom = 'unset'
+          //   lineElm.style.top = '0'
+          // }
+          // else {
+          //   lineElm.style.bottom = -lineLength + 'px'
+          //   lineElm.style.top = 'unset'
+          // }
+          lineElm.style.height = lineLength + 'px'
+          lineElm.style.transform = 'rotate(' + lineAngle + 'deg)'
+        }
+      }
+    }
+
+    function getCurrentBillboardScale(entity, scene) {
+      // 获取相机到Billboard的距离
+      const distance = Cesium.Cartesian3.distance(
+        scene.camera.positionWC,
+        entity.position.getValue()
+      );
+      // 获取缩放距离配置
+      const scaleByDistance = entity.billboard.scaleByDistance ? entity.billboard.scaleByDistance.getValue() : undefined;
+
+      if (!scaleByDistance) {
+        // 如果没有设置距离缩放，则使用基础缩放值
+        return 1.0;
+      }
+
+      // 解析缩放距离参数 [near, nearScale, far, farScale]
+      const { near, nearValue, far, farValue } = scaleByDistance;
+      if (distance <= near) {
+        return nearValue;
+      } else if (distance >= far) {
+        return farValue;
+      } else {
+        // 计算中间距离的缩放值（线性插值）
+        const t = (distance - near) / (far - near);
+        return Cesium.Math.lerp(nearValue, farValue, t);
+      }
+    }
 
 
     this.sdk.addIncetance(this.options.id, this)
@@ -243,6 +395,7 @@ class BillboardObject extends Base {
             that.entity.billboard.imgHeight = 0
             that.entity.billboard.image = canvas
             addCluster(that.sdk, that.entity)
+            that.attributeBoxState && (that.attributeBoxState = true)
           }
           return
         }
@@ -267,13 +420,14 @@ class BillboardObject extends Base {
             return img
           }, false)
           addCluster(that.sdk, that.entity)
+          that.attributeBoxState && (that.attributeBoxState = true)
         }
       })
     }
     else {
       let image = new Image()
       image.src =
-      url ||
+        url ||
         that.getSourceRootPath() + '/img/A-ablu-blank.png'
       switch (that.options.heightMode) {
         case 2:
@@ -298,6 +452,7 @@ class BillboardObject extends Base {
           that.entity.billboard.imgHeight = height
           that.entity.billboard.image = canvas
           addCluster(that.sdk, that.entity)
+          that.attributeBoxState && (that.attributeBoxState = true)
         }
       }
       image.onerror = function (err) {
@@ -309,6 +464,7 @@ class BillboardObject extends Base {
           that.entity.billboard.imgHeight = 0
           that.entity.billboard.image = canvas
           addCluster(that.sdk, that.entity)
+          that.attributeBoxState && (that.attributeBoxState = true)
         }
       };
     }
@@ -465,14 +621,45 @@ class BillboardObject extends Base {
     return this.options.show
   }
   set show(v) {
-    this.options.show = v
-    this.originalOptions.show = v
-    this.entity && (this.entity.show = v)
+    if (!this.isShowView) {
+      this.options.show = v
+      this.originalOptions.show = v
+    }
+    if (!this.showView || this.showView == 3) {
+      this.entity && (this.entity.show = this.options.show)
+      if (this.attributeBoxState && this.options.show) {
+        this.attributeBoxState = this.options.show
+      }
+      else {
+        // 关闭属性框
+        document.addEventListener('mouseup', this.#_destroyMouseEvent);
+        document.addEventListener('mouseleave', this.#_destroyMouseEvent);
+        if (this.attributeElm) {
+          this.sdk.viewer._element.removeChild(this.attributeElm)
+          this.attributeElm = null
+        }
+        this.sdk.viewer.scene.postRender.removeEventListener(this.#_postRenderEvent)
+      }
+    }
+    else {
+      this.entity && (this.entity.show = false)
+      // 关闭属性框
+      document.addEventListener('mouseup', this.#_destroyMouseEvent);
+      document.addEventListener('mouseleave', this.#_destroyMouseEvent);
+      if (this.attributeElm) {
+        this.sdk.viewer._element.removeChild(this.attributeElm)
+        this.attributeElm = null
+      }
+      this.sdk.viewer.scene.postRender.removeEventListener(this.#_postRenderEvent)
+    }
     syncData(this.sdk, this.options.id)
     syncSplitData(this.sdk, this.options.id)
+
     if (this._DialogObject && this._DialogObject.showBtn) {
-      this._DialogObject.showBtn.checked = v
+      this._DialogObject.showBtn.checked = this.options.show
     }
+
+    this.isShowView = false
     // if (v) {
     //   if (this.diffuseShow) {
     //     this.diffuseShow = true
@@ -552,6 +739,26 @@ class BillboardObject extends Base {
     if (this.entity) {
       this.entity.billboard.heightReference = heightMode
       this.entity.label.heightReference = heightMode
+      if(heightMode == Cesium.HeightReference.CLAMP_TO_GROUND) {
+        if (this.sdk.viewer.scene.terrainProvider.availability) {
+          Cesium.sampleTerrainMostDetailed(
+            this.sdk.viewer.scene.terrainProvider,
+            [
+              Cesium.Cartographic.fromDegrees(
+                this.options.positions.lng,
+                this.options.positions.lat
+              )
+            ]
+          ).then(position => {
+            this.#_billboardHeight = position[0].height
+          })
+        } else {
+          this.#_billboardHeight = 0
+        }
+      }
+      else {
+        this.#_billboardHeight = this.options.positions.alt
+      }
     }
     this._elms.heightMode && (this._elms.heightMode.value = heightModeName)
   }
@@ -606,6 +813,7 @@ class BillboardObject extends Base {
   }
   set alt(v) {
     this.options.positions.alt = Number(Number(v).toFixed(2))
+    this.#_billboardHeight = this.options.positions.alt
     // this.scan && (this.scan.alt = v)
     // this.diffuse && (this.diffuse.alt = v)
     this.renewPoint()
@@ -766,6 +974,8 @@ class BillboardObject extends Base {
       _this._frameImages = []
       superGif.load(function (status) {
         if (status == 404) {
+          let width = 31
+          let height = 36
           canvas = document.createElement('canvas')
           canvas.width = 0
           canvas.height = 0
@@ -855,6 +1065,8 @@ class BillboardObject extends Base {
         billboardH = height * (31 / width)
       }
       image.onerror = function (err) {
+        let width = 31
+        let height = 36
         canvas.width = 0
         canvas.height = 0
         billboardH = 0
@@ -1702,6 +1914,22 @@ class BillboardObject extends Base {
         this.cameraSelect && this.cameraSelect()
         this.ISCSelect && this.ISCSelect()
         this.goodsSelect && this.goodsSelect()
+
+        let col = document.createElement('div')
+        col.className = 'col'
+        col.style.flex = '0 0 110px'
+        col.innerHTML = `
+          <span class="label">属性框</span>
+          <input class="btn-switch" type="checkbox">
+        `
+
+        let row = this._DialogObject._element.content.getElementsByClassName('attribute')[0].getElementsByClassName('row')[0]
+        row.appendChild(col)
+        let boxSwitch = col.getElementsByClassName('btn-switch')[0]
+        boxSwitch.checked = this.attributeBoxState
+        boxSwitch.addEventListener('change', (e) => {
+          this.attributeBoxState = boxSwitch.checked
+        })
         let tagData = this.attributeSelect
         let attributeElm = this._DialogObject._element.content.getElementsByClassName(
           'attribute-select-box'
@@ -2213,6 +2441,7 @@ class BillboardObject extends Base {
     this.attributeCamera = this.options.attribute.camera.content
     this.attributeGoods = this.options.attribute.goods.content
     this.attributeISC = this.options.attribute.ISC.content
+    this.attributeBoxState = this.options.attributeBoxState
     this.cameraSelect && this.cameraSelect()
     this.goodsSelect && this.goodsSelect()
   }
@@ -2220,6 +2449,7 @@ class BillboardObject extends Base {
   async remove() {
     await remove_entity_from_cluster(this.sdk.viewer, this.entity)
     this.entity = null
+    this.attributeBoxState = false
     if (!this.sdk.viewer || !this.sdk.viewer.entities) {
       return
     }
@@ -2344,6 +2574,9 @@ class BillboardObject extends Base {
   }
 
   async updateHeight() {
+    if (!this.sdk || !this.sdk.viewer || !this.sdk.viewer.scene) {
+      return
+    }
     let height
     let height2
     let point1 = new Cesium.Cartesian3.fromDegrees(
@@ -2407,6 +2640,7 @@ class BillboardObject extends Base {
     }
     if (height !== undefined) {
       this.options.positions.alt = Number(Number(height).toFixed(2))
+      this.#_billboardHeight = this.options.positions.alt
       this._elms.alt &&
         this._elms.alt.forEach(item => {
           item.value = this.options.positions.alt
@@ -2422,6 +2656,7 @@ class BillboardObject extends Base {
           switch (this._elms.heightMode.value) {
             case '海拔高度':
               heightElm.value = this.options.positions.alt
+              this.#_billboardHeight = this.options.positions.alt
               break
             case '相对地表':
               if (this.sdk.viewer.scene.terrainProvider.availability) {
@@ -2437,15 +2672,18 @@ class BillboardObject extends Base {
                   heightElm.value = Number(
                     (this.options.positions.alt - position[0].height).toFixed(2)
                   )
+                  this.#_billboardHeight = this.options.positions.alt
                 })
               } else {
                 heightElm.value = this.options.positions.alt
+                this.#_billboardHeight = this.options.positions.alt
               }
               break
             case '依附地表':
               break
             case '依附模型':
               heightElm.value = this.options.positions.alt
+              this.#_billboardHeight = this.options.positions.alt
               break
           }
         }
@@ -2719,6 +2957,219 @@ class BillboardObject extends Base {
         (this.originalOptions.customView = this.options.customView)
     }
   }
+
+  get attributeBoxState() {
+    return this.options.attributeBoxState
+  }
+
+  set attributeBoxState(state) {
+    state = state ? true : false
+    this.options.attributeBoxState = state
+    document.addEventListener('mouseup', this.#_destroyMouseEvent);
+    document.addEventListener('mouseleave', this.#_destroyMouseEvent);
+    if (this.attributeElm) {
+      this.sdk.viewer._element.removeChild(this.attributeElm)
+      this.attributeElm = null
+    }
+    this.sdk.viewer.scene.postRender.removeEventListener(this.#_postRenderEvent)
+    if (state && this.sdk && this.sdk.viewer && this.sdk.viewer._element && this.show) {
+      let attributeElm = document.createElement('div')
+      this.attributeElm = attributeElm
+      attributeElm.className = 'billboard-attribute-box'
+      attributeElm.style.top = '0px'
+      attributeElm.style.left = '0px'
+      attributeElm.style.width = 0
+      attributeElm.style.height = 0
+      if(getState()) {
+        attributeElm.style.display = 'none'
+      }
+      // attributeElm.innerHTML = this.options.richTextContent
+      this.sdk.viewer._element.appendChild(attributeElm)
+      let linkHtml = ''
+      let goodsHtml = ''
+      let richTextHtml = ''
+      for (let i = 0; i < this.options.attribute.link.content.length; i++) {
+        linkHtml += `<DIV-cy-tab-pane label="${this.options.attribute.link.content[i].name}"><iframe width='100%' height='100%' src="${this.options.attribute.link.content[i].url}" ></iframe></DIV-cy-tab-pane>`
+      }
+      if (this.options.attribute.goods && this.options.attribute.goods.content && this.options.attribute.goods.content.length > 0) {
+        goodsHtml += `<DIV-cy-tab-pane label="物资">
+        <div class="table">
+          <div class="table-head">
+            <div class="tr">
+              <div class="th" style="width: 20%; flex: 0 20%;">序号</div>
+              <div class="th" style="width: 40%; flex: 0 40%;">名称</div>
+              <div class="th" style="width: 40%; flex: 0 40%;">数量</div>
+            </div>
+          </div>
+          <div class="table-body">
+        `
+        for (let i = 0; i < this.options.attribute.goods.content.length; i++) {
+          goodsHtml += `<div class="tr">
+            <div class="td" style="width: 20%; flex: 0 20%;">${i + 1}</div>
+            <div class="td" style="width: 40%; flex: 0 40%;">${this.options.attribute.goods.content[i].name}</div>
+            <div class="td" style="width: 40%; flex: 0 40%;">${this.options.attribute.goods.content[i].cnt}</div>
+          </div>`
+        }
+        goodsHtml += `</div></div></DIV-cy-tab-pane>`
+      }
+      if (this.options.richTextContent) {
+        richTextHtml = `<DIV-cy-tab-pane label="富文本">
+          ${this.options.richTextContent}
+        </DIV-cy-tab-pane>`
+      }
+
+      let boxHtml = `
+        <span class="drag-nook left-top"></span>
+        <span class="drag-nook right-top"></span>
+        `
+
+      if (!linkHtml && !goodsHtml && !richTextHtml) {
+        boxHtml = boxHtml + '<p style="margin: 0;width: 100%;height: 100%;display: flex;justify-content: center;align-items: center;backdrop-filter: blur(2px);">暂无属性信息</p><div class="billboard-attribute-box-line"></div>'
+      }
+      else {
+        boxHtml = boxHtml + `
+        <DIV-cy-tabs class="tabs">
+          ${richTextHtml}
+          ${goodsHtml}
+          ${linkHtml}
+        </DIV-cy-tabs>
+        <div class="billboard-attribute-box-line"></div>`
+      }
+
+      attributeElm.innerHTML = boxHtml
+
+      if (attributeElm.getElementsByClassName('tabs')[0]) {
+        let tabsElm = new cy_tabs(attributeElm.getElementsByClassName('tabs')[0], undefined, this.sdk)
+      }
+
+      let imgElm = attributeElm.getElementsByTagName('img')
+      for (let i = 0; i < imgElm.length; i++) {
+        if (!imgElm[i].style.width) {
+          imgElm[i].style.width = '100%'
+        }
+      }
+
+      this.sdk.viewer.scene.postRender.addEventListener(this.#_postRenderEvent)
+      let leftOnmousedown = (e) => {
+        if (this.options.attributePos.width < 200) {
+          this.options.attributePos.width = 200
+        }
+        if (this.options.attributePos.height < 120) {
+          this.options.attributePos.height = 120
+        }
+        let x = e.x
+        let y = e.y
+        let width = this.options.attributePos.width
+        let height = this.options.attributePos.height
+        let positionx = this.options.attributePos.x
+        this.sdk.viewer._element.onmousemove = (e2) => {
+          this.options.attributePos.width = width + (x - e2.x)
+          this.options.attributePos.height = height + (y - e2.y)
+          if (this.options.attributePos.width < 200) {
+            this.options.attributePos.width = 200
+          }
+          else {
+            this.options.attributePos.x = positionx - (x - e2.x)
+          }
+          if (this.options.attributePos.height < 120) {
+            this.options.attributePos.height = 120
+          }
+          // this.options.attributePos.y = positiony + (y - e2.y)
+        }
+        document.addEventListener('mouseup', this.#_destroyMouseEvent);
+        document.addEventListener('mouseleave', this.#_destroyMouseEvent);
+      }
+      let rightOnmousedown = (e) => {
+        let x = e.x
+        let y = e.y
+        if (this.options.attributePos.width < 200) {
+          this.options.attributePos.width = 200
+        }
+        if (this.options.attributePos.height < 120) {
+          this.options.attributePos.height = 120
+        }
+        let width = this.options.attributePos.width
+        let height = this.options.attributePos.height
+        this.sdk.viewer._element.onmousemove = (e2) => {
+          this.options.attributePos.width = width + (e2.x - x)
+          this.options.attributePos.height = height + (y - e2.y)
+        }
+        document.addEventListener('mouseup', this.#_destroyMouseEvent);
+        document.addEventListener('mouseleave', this.#_destroyMouseEvent);
+      }
+      // leftTopElm.onmousedown = (e) => {
+      //   console.log(1111111111)
+      //   if (this.options.attributePos.width < 200) {
+      //     this.options.attributePos.width = 200
+      //   }
+      //   if (this.options.attributePos.height < 120) {
+      //     this.options.attributePos.height = 120
+      //   }
+      //   let x = e.x
+      //   let y = e.y
+      //   let width = this.options.attributePos.width
+      //   let height = this.options.attributePos.height
+      //   let positionx = this.options.attributePos.x
+      //   this.sdk.viewer._element.onmousemove = (e2) => {
+      //     this.options.attributePos.width = width + (x - e2.x)
+      //     this.options.attributePos.height = height + (y - e2.y)
+      //     if (this.options.attributePos.width < 200) {
+      //       this.options.attributePos.width = 200
+      //     }
+      //     else {
+      //       this.options.attributePos.x = positionx - (x - e2.x)
+      //     }
+      //     if (this.options.attributePos.height < 120) {
+      //       this.options.attributePos.height = 120
+      //     }
+      //     // this.options.attributePos.y = positiony + (y - e2.y)
+      //   }
+      //   document.addEventListener('mouseup', this.#_destroyMouseEvent);
+      //   document.addEventListener('mouseleave', this.#_destroyMouseEvent);
+      // }
+      // rightTopElm.onmousedown = (e) => {
+      //   let x = e.x
+      //   let y = e.y
+      //   if (this.options.attributePos.width < 200) {
+      //     this.options.attributePos.width = 200
+      //   }
+      //   if (this.options.attributePos.height < 120) {
+      //     this.options.attributePos.height = 120
+      //   }
+      //   let width = this.options.attributePos.width
+      //   let height = this.options.attributePos.height
+      //   this.sdk.viewer._element.onmousemove = (e2) => {
+      //     this.options.attributePos.width = width + (e2.x - x)
+      //     this.options.attributePos.height = height + (y - e2.y)
+      //   }
+      //   document.addEventListener('mouseup', this.#_destroyMouseEvent);
+      //   document.addEventListener('mouseleave', this.#_destroyMouseEvent);
+      // }
+
+      attributeElm.onmousedown = (e) => {
+        attributeElm.style.pointerEvents = 'none'
+        if (e.target.className.indexOf('left-top') != -1) {
+          leftOnmousedown(e)
+        }
+        else if (e.target.className.indexOf('right-top') != -1) {
+          rightOnmousedown(e)
+        }
+        else {
+          let x = e.x
+          let y = e.y
+          let oldX = this.options.attributePos.x
+          let oldXY = this.options.attributePos.y
+          let height = this.options.attributePos.height
+          this.sdk.viewer._element.onmousemove = (e2) => {
+            this.options.attributePos.x = oldX + (e2.x - x)
+            this.options.attributePos.y = oldXY - (e2.y - y)
+          }
+          document.addEventListener('mouseup', this.#_destroyMouseEvent);
+          document.addEventListener('mouseleave', this.#_destroyMouseEvent);
+        }
+      }
+    }
+  }
 }
 
 export default BillboardObject

src/Obj/Base/CircleDiffuse/index.js

@@ -6,7 +6,7 @@ import EventBinding from '../../Element/Dialog/eventBinding';
 import richText from "../../Element/richText";
 import MouseEvent from '../../../Event/index'
 import LabelObject from '../LabelObject'
-import { syncData } from '../../../Global/MultiViewportMode'
+import { syncData, getSdk as get2DSdk } from '../../../Global/MultiViewportMode'
 import { legp } from '../../Element/datalist';
 import { getFontList, getFontFamilyName } from '../../Element/fontSelect'
 import MouseTip from '../../../MouseTip'
@@ -21,23 +21,53 @@ class CircleDiffuse extends Base {
    * @param sdk 
    * @param options {object} 圆属性
    * @param options.id {string} 标注id
-   * @param [options.show=true] {boolean} 显示/隐藏
+   * @param options.show=true {boolean} 显示/隐藏
    * @param options.lng {number} 经度
    * @param options.lat {number} 维度
    * @param options.color=#1FA8E3 {string} 基础颜色
-   * @param options.colors=[] {string} 范围颜色
    * @param options.speed=5 {number} 速度
    * @param options.count=3 {number} 波纹数量
-   * @param options.circle=[{radius, color}] {object} 圆属性；radius:半径，color:颜色
-   * @param _Dialog {object} 弹框事件
-   * @param _Dialog.confirmCallBack {function} 弹框确认时的回调
+   * @param options.circle=[]] {array} 圆属性
+   * @param options.circle[].radius {number} 半径
+   * @param options.circle[].color {string} 颜色
+   * @param options.label {object} 标签对象
+   * @param options.label.show {string} 标签显隐
+   * @param options.label.position {string} 标签位置
+   * @param options.label.position {object} 标签位置
+   * @param options.label.position.lng {number} 经度
+   * @param options.label.position.lat {number} 纬度
+   * @param options.label.position.alt {number} 高度
+   * @param options.label.fontSize=20 {number} 字体大小
+   * @param options.label.fontFamily=0 {number} 字体项 0：黑体；1：思源黑体；2：庞门正道标题体；3：数黑体
+   * @param options.label.color=#ffffff {string} 字体颜色
+   * @param options.label.lineWidth=4 {number} 引线宽
+   * @param options.label.lineColor=#00ffff80 {string} 引线颜色
+   * @param options.label.pixelOffset=20 {number} 字体偏移(引线长度)
+   * @param options.label.backgroundColor=['#00ffff80', '#00ffff80'] {array} 背景颜色
+   * @param options.label.scaleByDistance {boolean} 距离缩放
+   * @param options.label.near=2000 {number} 视野缩放最近距离
+   * @param options.label.far=100000 {number} 视野缩放最远距离
+   * @param options.attribute {object} 属性内容
+   * @param {object} options.attribute.link={} 链接
+   * @param options.attribute.link.content=[]] {array} 链接内容
+   * @param options.attribute.link.content[].name {string} 链接名称
+   * @param options.attribute.link.content[].url {string} 链接地址
+   * @param options.richTextContent {string} 富文本内容
+   * @param options.customView {object} 默认视角
+   * @param options.customView.orientation {object} 默认视角方位
+   * @param options.customView.orientation.heading {number} 航向角
+   * @param options.customView.orientation.pitch {number} 俯仰角
+   * @param options.customView.orientation.roll {number} 翻滚角
+   * @param options.customView.relativePosition {object} 视角相对位置
+   * @param options.customView.relativePosition.lng {number} 经度
+   * @param options.customView.relativePosition.lat {number} 纬度
+   * @param options.customView.relativePosition.alt {number} 高度
    */
   constructor(sdk, options = {}, _Dialog = {}) {
     super(sdk, options);
     this.options.lng = options.lng
     this.options.lat = options.lat
     this.options.color = options.color || '#1FA8E3'
-    this.options.colors = options.colors || []
     this.options.transparency = (options.transparency || options.transparency === 0) ? options.transparency : 1
     if (this.options.transparency > 1) {
       this.options.transparency = 1
@@ -181,7 +211,7 @@ class CircleDiffuse extends Base {
       }
       that.sdk._entityZIndex++
       if (that.sdk.viewer._element.className === 'cesium-viewer 2d') {
-        that.entity.ellipse.height = 1000000
+        that.entity.ellipse.height = 1
       }
       CircleDiffuse.createLabel(that)
       syncData(that.sdk, that.options.id)
@@ -223,16 +253,31 @@ class CircleDiffuse extends Base {
 
   set show(v) {
     if (typeof v === "boolean") {
-      this.options.show = v
-      this.entity.show = v
+      let sdkD = get2DSdk().sdkD
+      if (!this.isShowView || !sdkD) {
+        this.options.show = v
+      }
+      if (!this.showView || this.showView == 3 || !sdkD) {
+        this.entity.show = this.options.show 
+        if (this.options.label.show) {
+          this.label.show = this.options.show 
+        }
+      }
+      else {
+        this.entity.show = false
+        if (this.options.label.show) {
+          this.label.show = false
+        }
+      }
+
+      this.isShowView = false
+      
       syncData(this.sdk, this.options.id)
       syncSplitData(this.sdk, this.options.id)
       if (this._DialogObject && this._DialogObject.showBtn) {
         this._DialogObject.showBtn.checked = v
       }
-      if (this.options.label.show) {
-        this.label.show = v
-      }
+      
     } else {
       console.error("参数必须为boolean")
     }
@@ -362,6 +407,7 @@ class CircleDiffuse extends Base {
     return this.options.circle
   }
   set circle(v) {
+    console.log(v)
     this.options.circle = v || [{ radius: 10 }]
     for (let i = 0; i < this.options.circle.length; i++) {
       if(this.options.circle[i].radius>999999) {
@@ -414,21 +460,13 @@ class CircleDiffuse extends Base {
     })
   }
 
-  get colors() {
-    return this.options.colors
-  }
-
-  set colors(v) {
-    this.options.colors = v
-    CircleDiffuse.create(this)
-  }
-
   get labelShow() {
     return this.options.label.show
   }
   set labelShow(v) {
+    let sdkD = get2DSdk().sdkD
     this.options.label.show = v
-    if (this.show) {
+    if (this.show && (!this.showView || this.showView == 3 || !sdkD)) {
       this.label.show = v
     }
     else {
@@ -1321,7 +1359,7 @@ class CircleDiffuse extends Base {
   }
 
   async remove() {
-    this.label.remove()
+    this.label && this.label.remove()
     this.entity && this.sdk.viewer.entities.remove(this.entity)
     this.entity2 && this.sdk.viewer.entities.remove(this.entity2)
     this.entity = null
@@ -1405,7 +1443,7 @@ class CircleDiffuse extends Base {
                   }
                 }
                 this._radius = radius
-                inputElm.value = value
+                // inputElm.value = value
                 CircleDiffuse.create(this)
               }
             }

src/Obj/Base/CircleObject/index.js

@@ -18,22 +18,63 @@ import { setActiveViewer, closeRotateAround, closeViewFollow } from '../../../Gl
 class CircleObject extends Base {
   /**
    * @constructor
+   * @param sdk
    * @description 创建圆
-   * @param options {object} 圆属性
    * @param options.id {string} 标注id
    * @param options.name {string} 名称
    * @param options.show=true {boolean} 显示/隐藏
    * @param options.color="#ff000080" {string} 颜色
-   * @param options.center {object} 位置
-   * @param options.center.lng {object} 经度
-   * @param options.center.lat {object} 纬度
-   * @param options.center.alt {object} 高度
-   * @param options.radius=10 {object}半径
+   * @param options.center {object} 中心位置
+   * @param options.center.lng {number} 经度
+   * @param options.center.lat {number} 纬度
+   * @param options.center.alt {number} 高度
+   * @param options.radius=10 {number}半径
    * @param options.line {object} 边框
-   * @param options.line.width=2 {string} 边框宽
+   * @param options.line.width=3 {number} 边框宽
    * @param options.line.color="#ff000080" {string} 边框颜色
-   * @param options.label {object} 标注
    * @param options.heightMode=2{number} 高度模式（0：海拔高度；1：相对地表；2：依附模式）
+   * @param options.areaUnit='平方米' {string} 面积单位
+   * @param options.customView {object} 默认视角
+   * @param options.customView.orientation {object} 默认视角方位
+   * @param options.customView.orientation.heading {number} 航向角
+   * @param options.customView.orientation.pitch {number} 俯仰角
+   * @param options.customView.orientation.roll {number} 翻滚角
+   * @param options.customView.relativePosition {object} 视角相对位置
+   * @param options.customView.relativePosition.lng {number} 经度
+   * @param options.customView.relativePosition.lat {number} 纬度
+   * @param options.customView.relativePosition.alt {number} 高度
+   * @param options.label {object} 标签对象
+   * @param options.label.text {string} 标签文本
+   * @param options.label.show {string} 标签显隐
+   * @param options.label.position {object} 标签位置
+   * @param options.label.position.lng {number} 经度
+   * @param options.label.position.lat {number} 纬度
+   * @param options.label.position.alt {number} 高度
+   * @param options.label.fontSize=20 {number} 字体大小
+   * @param options.label.fontFamily=0 {number} 字体项 0：黑体；1：思源黑体；2：庞门正道标题体；3：数黑体
+   * @param options.label.color=#ffffff {string} 字体颜色
+   * @param options.label.lineWidth=4 {number} 引线宽
+   * @param options.label.lineColor=#00ffff80 {string} 引线颜色
+   * @param options.label.pixelOffset=20 {number} 字体偏移(引线长度)
+   * @param options.label.backgroundColor=['#00ffff80', '#00ffff80'] {array} 背景颜色
+   * @param options.label.scaleByDistance {boolean} 距离缩放
+   * @param options.label.near=2000 {number} 视野缩放最近距离
+   * @param options.label.far=100000 {number} 视野缩放最远距离
+   * @param options.attribute {object} 属性内容
+   * @param options.attribute.link {object} 链接
+   * @param options.attribute.link.content=[]] {array} 链接内容
+   * @param options.attribute.link.content[].name {string} 链接名称
+   * @param options.attribute.link.content[].url {string} 链接地址
+   * @param options.richTextContent {string} 富文本内容
+   * @param options.customView {object} 默认视角
+   * @param options.customView.orientation {object} 默认视角方位
+   * @param options.customView.orientation.heading {number} 航向角
+   * @param options.customView.orientation.pitch {number} 俯仰角
+   * @param options.customView.orientation.roll {number} 翻滚角
+   * @param options.customView.relativePosition {object} 视角相对位置
+   * @param options.customView.relativePosition.lng {number} 经度
+   * @param options.customView.relativePosition.lat {number} 纬度
+   * @param options.customView.relativePosition.alt {number} 高度
    */
   constructor(sdk, options = {}) {
     super(sdk, options);
@@ -45,7 +86,7 @@ class CircleObject extends Base {
     this.options.center = options.center || {}
     this.options.line = options.line || {}
     this.options.line.width = ((this.options.line.width || this.options.line.width === 0) ? this.options.line.width : 3)
-    this.options.line.color = this.options.line.color || 'rgba(255, 0, 0, 0.5)'
+    this.options.line.color = this.options.line.color || 'rgba(255, 0, 0, 1)'
     this.options['area-unit'] = options['area-unit'] || '平方米'
     options.label = options.label || {}
     this._elms = {};
@@ -333,7 +374,7 @@ class CircleObject extends Base {
   }
   set labelShow(v) {
     this.options.label.show = v
-    if (this.show) {
+    if (this.show && (!this.showView || this.showView == 3)) {
       this.label.show = v
     }
     else {

src/Obj/Base/CurvelineObject/index.js

@@ -21,30 +21,57 @@ class CurvelineObject extends Base {
   /**
    * @constructor
    * @param sdk
-   * @description 折线
+   * @description 曲线
    * @param options {object} 线属性
    * @param options.name{string} 名称
    * @param options.width=3{number} 线宽
    * @param options.color=#ff0000 {string} 颜色
-   * @param options.type=0 {number} 材质类型 0-实线 1-虚线 2-泛光
-   * @param options.heightMode{number} 高度模式（0：海拔高度；1：相对高度；2：依附模式）
-   * @param options['nose-to-tail']=false {boolean} 首尾相连
+   * @param options.type=0 {number} 材质类型 0-实线 1-虚线 2-泛光...
+   * @param options.heightMode=2{number} 高度模式（0：海拔高度；1：相对高度；2：依附模式）
+   * @param options.noseToTail=false {boolean} 首尾相连
    * @param options.extend=false {boolean} 线缓冲
-   * @param options['extend-width']=1 {number} 线缓冲宽度
-   * @param options['extend-color']=#ffde00 {number} 线缓冲颜色
+   * @param options.extendWidth=10 {number} 线缓冲宽度
+   * @param options.extendColor=rgba(255,255,80,0.3) {number} 线缓冲颜色
    * @param options.show=true {boolean} 显隐
-   * @param {Array.<object>} options.positions 坐标数组 [{lng,lat},...]
-   * @param options.label {object} 标注
-   * @param options.label.show=false {boolean} 标注显隐
-   * @param options.label.fontSize=20 {number} 标注字体大小
-   * @param options.label.color=#ffffff {string} 标注字体颜色
-   * @param options.label.lineWidth=1 {number} 标注引线宽
-   * @param options.label.pixelOffset=20 {string} 标注引线长度
-   * @param options.label.backgroundColor=['#42c6ef', '#42c6ef'] {Array} 标注背景
-   * @param options.label.lineColor=#fff000 {string} 标注引线颜色
-   * @param options.label.scaleByDistance=false {boolean} 标注是否随视野缩放
-   * @param options.label.near=2000 {boolean} 标注随视野缩放最近距离
-   * @param options.label.far=100000 {boolean} 标注随视野缩放最远距离
+   * @param {Array.<object>} options.positions 必填，经纬度和高度的列表，值交替 [{lon,lat,alt},...]
+   * @param options.positions[].lng {number} 经度
+   * @param options.positions[].lat {number} 纬度
+   * @param options.positions[].alt {number} 高度
+   * @param options.label {object} 标签对象
+   * @param options.label.text {string} 标签文本
+   * @param options.label.show {string} 标签显隐
+   * @param options.label.position {string} 标签位置
+   * @param options.label.position {object} 标签位置
+   * @param options.label.position.lng {number} 经度
+   * @param options.label.position.lat {number} 纬度
+   * @param options.label.position.alt {number} 高度
+   * @param options.label.fontSize=20 {number} 字体大小
+   * @param options.label.fontFamily=0 {number} 字体项 0：黑体；1：思源黑体；2：庞门正道标题体；3：数黑体
+   * @param options.label.color=#ffffff {string} 字体颜色
+   * @param options.label.lineWidth=4 {number} 引线宽
+   * @param options.label.lineColor=#00ffff80 {string} 引线颜色
+   * @param options.label.pixelOffset=20 {number} 字体偏移(引线长度)
+   * @param options.label.backgroundColor=['#00ffff80', '#00ffff80'] {array} 背景颜色
+   * @param options.label.scaleByDistance {boolean} 距离缩放
+   * @param options.label.near=2000 {number} 视野缩放最近距离
+   * @param options.label.far=100000 {number} 视野缩放最远距离
+   * @param options.attribute {object} 属性内容
+   * @param options.attribute.link={} {string} 链接
+   * @param options.attribute.link.content=[]] {array} 链接内容
+   * @param options.attribute.link.content[].name {string} 链接名称
+   * @param options.attribute.link.content[].url {string} 链接地址
+   * @param options.richTextContent {string} 富文本内容
+   * @param options.customView {object} 默认视角
+   * @param options.customView.orientation {object} 默认视角方位
+   * @param options.customView.orientation.heading {number} 航向角
+   * @param options.customView.orientation.pitch {number} 俯仰角
+   * @param options.customView.orientation.roll {number} 翻滚角
+   * @param options.customView.relativePosition {object} 视角相对位置
+   * @param options.customView.relativePosition.lng {number} 经度
+   * @param options.customView.relativePosition.lat {number} 纬度
+   * @param options.customView.relativePosition.alt {number} 高度
+   * 
+   * 
    * @param _Dialog {object} 弹框事件
    * @param _Dialog.confirmCallBack {function} 弹框确认时的回调
    * */
@@ -66,8 +93,8 @@ class CurvelineObject extends Base {
     this.options['extend-width'] =
       options['extend-width'] || options['extend-width'] === 0
         ? options['extend-width']
-        : 1
-    this.options['extend-color'] = options['extend-color'] || '#ffde00'
+        : 10
+    this.options['extend-color'] = options['extend-color'] || 'rgba(255,255,80,0.3)'
     this.options.show =
       options.show || options.show === false ? options.show : true
     this.options.heightMode = (options.heightMode || options.heightMode == 0) ? options.heightMode : 2
@@ -666,7 +693,7 @@ class CurvelineObject extends Base {
   }
   set labelShow(v) {
     this.options.label.show = v
-    if (this.show) {
+    if (this.show && !this.showView || this.showView == 3) {
       this.label.show = v
       setTimeout(() => {
         this.label.position = [
@@ -1384,10 +1411,10 @@ class CurvelineObject extends Base {
       that.options.lengthByMeter = res
       that.lengthUnit = that.options['length-unit']
       syncData(that.sdk, that.options.id)
-      if (that.options.show) {
-        setSplitDirection(0, that.options.id)
-      }
     })
+    if (that.options.show) {
+      setSplitDirection(0, that.options.id)
+    }
 
     // if (this.options['nose-to-tail']) {
     //   let array = []

src/Obj/Base/EllipseObject/index.js

@@ -18,13 +18,14 @@ import { setActiveViewer, closeRotateAround, closeViewFollow } from '../../../Gl
 class EllipseObject extends Base {
   /**
    * @constructor
+   * @param sdk
    * @description 创建椭圆
    * @param options {object} 圆属性
    * @param options.id {string} 标注id
    * @param options.name {string} 名称
    * @param options.show=true {boolean} 显示/隐藏
-   * @param options.center {object} 位置
-   * @param options.color="#ff000080" {string} 颜色
+   * @param options.center {object} 中心位置
+   * @param options.color="rgba(255, 0, 0, 0.5)" {string} 颜色
    * @param options.center.lng {object} 经度
    * @param options.center.lat {object} 维度
    * @param options.semiMinorAxis=10 {number} 短半轴长度
@@ -32,14 +33,47 @@ class EllipseObject extends Base {
    * @param options.bearing=0 {number} 旋转角度
    * @param options.line {object} 边框
    * @param options.line.width=2 {string} 边框宽
-   * @param options.line.color="#ff000080" {string} 边框颜色
-   * @param options.label {object} 标注
+   * @param options.line.color="rgba(255, 0, 0, 1)" {string} 边框颜色
    * @param options.heightMode=2{number} 高度模式（0：海拔高度；1：相对地表；2：依附模式）
+   * @param options.areaUnit='平方米' {string} 面积单位
+   * @param options.label {object} 标签对象
+   * @param options.label.text {string} 标签文本
+   * @param options.label.show {string} 标签显隐
+   * @param options.label.position {string} 标签位置
+   * @param options.label.position {object} 标签位置
+   * @param options.label.position.lng {number} 经度
+   * @param options.label.position.lat {number} 纬度
+   * @param options.label.position.alt {number} 高度
+   * @param options.label.fontSize=20 {number} 字体大小
+   * @param options.label.fontFamily=0 {number} 字体项 0：黑体；1：思源黑体；2：庞门正道标题体；3：数黑体
+   * @param options.label.color=#ffffff {string} 字体颜色
+   * @param options.label.lineWidth=4 {number} 引线宽
+   * @param options.label.lineColor=#00ffff80 {string} 引线颜色
+   * @param options.label.pixelOffset=20 {number} 字体偏移(引线长度)
+   * @param options.label.backgroundColor=['#00ffff80', '#00ffff80'] {array} 背景颜色
+   * @param options.label.scaleByDistance {boolean} 距离缩放
+   * @param options.label.near=2000 {number} 视野缩放最近距离
+   * @param options.label.far=100000 {number} 视野缩放最远距离
+   * @param options.attribute {object} 属性内容
+   * @param options.attribute.link {object} 链接
+   * @param options.attribute.link.content=[]] {array} 链接内容
+   * @param options.attribute.link.content[].name {string} 链接名称
+   * @param options.attribute.link.content[].url {string} 链接地址
+   * @param options.richTextContent {string} 富文本内容
+   * @param options.customView {object} 默认视角
+   * @param options.customView.orientation {object} 默认视角方位
+   * @param options.customView.orientation.heading {number} 航向角
+   * @param options.customView.orientation.pitch {number} 俯仰角
+   * @param options.customView.orientation.roll {number} 翻滚角
+   * @param options.customView.relativePosition {object} 视角相对位置
+   * @param options.customView.relativePosition.lng {number} 经度
+   * @param options.customView.relativePosition.lat {number} 纬度
+   * @param options.customView.relativePosition.alt {number} 高度
    */
   constructor(sdk, options = {}) {
     super(sdk, options);
     this.options.name = options.name || '未命名对象'
-    this.options.color = options.color || "#ff000080"
+    this.options.color = options.color || "rgba(255, 0, 0, 0.5)"
     this.options.heightMode = (options.heightMode || options.heightMode == 0) ? options.heightMode : 2
     this.options.semiMinorAxis = (options.semiMinorAxis || options.semiMinorAxis === 0) ? options.semiMinorAxis : 10
     this.options.semiMajorAxis = (options.semiMajorAxis || options.semiMajorAxis === 0) ? options.semiMajorAxis : 20
@@ -47,7 +81,7 @@ class EllipseObject extends Base {
     this.options.center = options.center || {}
     this.options.line = options.line || {}
     this.options.line.width = ((this.options.line.width || this.options.line.width === 0) ? this.options.line.width : 3)
-    this.options.line.color = this.options.line.color || 'rgba(255, 0, 0, 0.5)'
+    this.options.line.color = this.options.line.color || 'rgba(255, 0, 0, 1)'
     this.options['area-unit'] = options['area-unit'] || '平方米'
     options.label = options.label || {}
     this._elms = {};
@@ -347,7 +381,7 @@ class EllipseObject extends Base {
   }
   set labelShow(v) {
     this.options.label.show = v
-    if (this.show) {
+    if (this.show && !this.showView || this.showView == 3) {
       this.label.show = v
     }
     else {

src/Obj/Base/Explosion/index.js

@@ -13,6 +13,15 @@ class Explosion extends Base {
   * @description 爆炸
   * @param sdk
   * @param options {object} 爆炸属性
+  * @param options.id {string} 唯一标识
+  * @param options.show=true {boolean} 显隐
+  * @param options.name {string} 名称
+  * @param {object} options.position={} 位置
+  * @param {number} options.position.lng 经度
+  * @param {number} options.position.lat 纬度
+  * @param {number} options.position.alt 高度
+  * @param options.scaleByDistance=true {boolean} 是否开启跟随视野缩放
+  * @param options.size=80 {number} 大小(爆炸范围)
   * */
   constructor(sdk, options = {}, _Dialog = {}) {
     super(sdk, options);

src/Obj/Base/FlyRoam/index.js

@@ -9,6 +9,25 @@ import { setActiveViewer, closeRotateAround, closeViewFollow} from '../../../Glo
 
 class FlyRoam extends Base {
   #clickHandler = undefined
+  /**
+   * @constructor
+   * @param sdk
+   * @description 飞行漫游
+   * @param options {object}
+   * @param options.id {string} 标注id
+   * @param options.name {string} 名称
+   * @param options.repeat=0 {number} 重复次数
+   * @param options.points=[]] {array} 视点列表
+   * @param options.points[].position {object} 视点位置
+   * @param options.points[].position.lng {number} 经度
+   * @param options.points[].position.lat {number} 纬度
+   * @param options.points[].position.alt {number} 高度
+   * @param options.points[].orientation {object} 视点方向
+   * @param options.points[].orientation.heading=0 {number} 视点航向角
+   * @param options.points[].orientation.pitch=0 {number} 视点俯仰角
+   * @param options.points[].orientation.roll=0 {number} 视点翻滚角
+   * @param options.points[].duration=0 {number} 持续时间
+   **/
   constructor(sdk, options = {}, _Dialog = {}) {
     super(sdk, options)
     this.options.id = options.id || this.randomString()
@@ -162,6 +181,7 @@ class FlyRoam extends Base {
           pitch: viewer.camera.pitch,
           roll: viewer.camera.roll
         }
+        this.message({text: '操作成功'})
       })
 
       let totalTimeElm = contentElm.querySelector("input[name='totalTime']")

src/Obj/Base/GeoJson/index.js

@@ -8,6 +8,8 @@
 import { getHost, getToken } from "../../../on";
 import Base from '../index'
 import Tools from '../../../Tools'
+import { syncSplitData } from "../../../Global/SplitScreen";
+import { syncData, getSdk as get2DSdk } from '../../../Global/MultiViewportMode'
 import { setActiveViewer, closeRotateAround, closeViewFollow} from '../../../Global/global'
 
 class GeoJson extends Base {
@@ -26,6 +28,7 @@ class GeoJson extends Base {
 
     this.primitive = undefined
     this.positions = []
+    
 
     this.loading = true
   }
@@ -48,6 +51,27 @@ class GeoJson extends Base {
     return this.options.show
   }
 
+  // set show(status) {
+  //   let sdkD = get2DSdk().sdkD
+  //   if (!this.isShowView || !sdkD) {
+  //     this.options.show = status
+  //   }
+  //   if (this.entity) {
+  //     if (!this.showView || this.showView == 3 || !sdkD) {
+  //       for (let i = 0; i < this.entity.entities.values.length; i++) {
+  //         this.entity.entities.values[i].show = this.options.show
+  //       }
+  //     }
+  //     else {
+  //       for (let i = 0; i < this.entity.entities.values.length; i++) {
+  //         this.entity.entities.values[i].show = false
+  //       }
+  //     }
+  //   }
+  //   syncData(this.sdk, this.options.id)
+  //   syncSplitData(this.sdk, this.options.id)
+  //   this.isShowView = false
+  // }
   set show(status) {
     this.options.show = status
     if (this.entity) {
@@ -74,6 +98,7 @@ class GeoJson extends Base {
     })
     let json = await rsp.json()
     this.geojson = json
+    // this.sdk.addIncetance(this.options.id, this)
     return GeoJson.addDataToGlobe(this, json.features)
   }
 

src/Obj/Base/GroundImage/_element.js

@@ -1,5 +1,5 @@
 function html() {
-  return `
+    return `
   <span class="custom-divider"></span>
   <div class="div-item">
     <div class="row">
@@ -7,13 +7,21 @@ function html() {
             <span class="label">名称</span>
             <input class="input" maxlength="40" type="text" @model="name">
         </div>
-        <div class="col">
-        </div>
+        <div class="col"></div>
     </div>
   </div>
   <span class="custom-divider"></span>
   <div class="div-item">
     <div class="row">
+        <div class="col">
+            <button class="anchor btn">调整锚点</button>
+        </div>
+        <div class="col mode-box">
+            <span class="label" style="flex: unset;">军标模式</span>
+            <div class="mode"></div>
+        </div>
+    </div>
+    <div class="row" mode="0">
         <div class="col">
             <span class="label">旋转角度</span>
             <input type="range" max="360" min="0" step="0.1" @model="angle">
@@ -24,16 +32,85 @@ function html() {
             </div>
         </div>
     </div>
-    <div class="row">
+    <div class="row" mode="0">
         <div class="col">
             <span class="label">调整大小</span>
-            <input type="range" max="99999" min="0" step="0.1" @model="scale">
+            <input type="range" max="40000" min="0" step="0.1" @model="scale">
             <div class="input-number input-number-unit-1" style="width: 100px;flex: 0 0 100px;margin-left: 10px;">
-                <input class="input" type="number" title="" min="0" max="99999" step="0.1" @model="scale">
+                <input class="input" type="number" title="" min="0" max="40000" step="0.1" @model="scale">
                 <span class="arrow"></span>
             </div>
         </div>
     </div>
+        <div class="row" mode="1">
+            <div class="col height-mode-box" style="flex: 0 0 155px;margin-right: 10px;">
+                <span class="label" style="flex: 0 0 56px;">高度模式</span>
+                <div class="height-mode"></div>
+            </div>
+            <div class="col" style="margin: 0 10px;">
+                <div class="height-box" style="display: flex; align-items: center;">
+                    <span class="label" style="flex: 0 0 56px;">高度</span>
+                    <div class="input-number input-number-unit-1">
+                        <input class="input height" type="number" title="" min="-9999999" max="999999999">
+                        <span class="unit">m</span>
+                        <span class="arrow"></span>
+                    </div>
+                </div>
+            </div>
+            <div class="col" style="margin-left: 10px;">
+                <span class="label">图标倍数</span>
+                <div class="input-number input-number-unit-1">
+                    <input class="input" type="number" title="" data-min="0.1" max="99" @model="billboardScale">
+                    <span class="unit">倍</span>
+                    <span class="arrow"></span>
+                </div>
+            </div>
+        </div>
+        <div class="row" mode="1">
+            <div class="col" style="flex: 0 0 155px;margin-right: 10px;">
+                <span class="label">视野缩放</span>
+                <input class="btn-switch" type="checkbox" @model="billboardScaleByDistance">
+            </div>
+            <div class="col" style="margin: 0 10px;">
+                <span class="label">最近距离</span>
+                <div class="input-number input-number-unit-1">
+                    <input class="input" type="number" title="" min="1" max="99999999" @model="billboardNear">
+                    <span class="unit">m</span>
+                    <span class="arrow"></span>
+                </div>
+            </div>
+            <div class="col" style="margin-left: 10px;">
+                <span class="label">最远距离</span>
+                <div class="input-number input-number-unit-1">
+                    <input class="input" type="number" title="" min="1" max="99999999" @model="billboardFar">
+                    <span class="unit">m</span>
+                    <span class="arrow"></span>
+                </div>
+            </div>
+        </div>
+                <h4 mode="1">文字设置</h4>
+                    <div class="row"  mode="1">
+                        <div class="col" style="flex: 0 0 80px;margin: 0 10px;">
+                            <span class="label" style="flex: none;">显隐</span>
+                            <input class="btn-switch" type="checkbox" @model="labelShow">
+                        </div>
+                        <div class="col font-select-box" style="margin: 0 0px;flex: 0 0 150px;">
+                            <span class="label" style="flex: none;">字体选择</span>
+                            <div class="input input-select font-select"></div>
+                        </div>
+                        <div class="col" style="margin: 0 10px;">
+                            <span class="label">文字大小</span>
+                            <div class="input-number input-number-unit-2">
+                                <input class="input" type="number" title="" min="1" max="99" @model="labelFontSize" style="width: 70px;">
+                                <span class="unit">px</span>
+                                <span class="arrow"></span>
+                            </div>
+                        </div>
+                        <div class="col" style="margin-left: 10px;">
+                            <span class="label">文字颜色</span>
+                            <div class="labelColor"></div>
+                        </div>
+                    </div>
   </div>
   <span class="custom-divider"></span>
   `

src/Obj/Base/GroundSvg/_element.js

@@ -54,7 +54,7 @@ function html(that) {
         <div class="row">
             <div class="col" style="flex: 5;">
                 <span class="label">文字内容</span>
-                <input class="input" type="text" @model="textValue">
+                <input class="input" type="text" @model="textValue" maxlength="30">
             </div>
             <div class="col">
                 <button class="btn" @click="textPosPick">设置位置</span>

src/Obj/Base/GroundSvg/index.js

@@ -10,6 +10,7 @@ import { FontLoader } from '../../../../static/3rdparty/three/jsm/loaders/FontLo
 import { TextGeometry } from '../../../../static/3rdparty/three/jsm/geometries/TextGeometry.js';
 import * as variable from '../../../../static/3rdparty/three/fonts/FZZongYi-M05S_regular.typeface.json'
 import Base from "../index";
+import { setActiveViewer, closeRotateAround, closeViewFollow } from '../../../Global/global'
 import { setSplitDirection, syncSplitData, setActiveId } from '../../../Global/SplitScreen'
 
 class GroundSvg extends Base {
@@ -25,7 +26,7 @@ class GroundSvg extends Base {
    * @param options.scale {object} 比例
    * @param options.scale.x=1 {number} x轴比例
    * @param options.scale.y=1 {number} y轴比例
-   * @param options.url {string} svg图片地址
+   * @param options.url {string} 资源地址
    * @param options.flipe {object} 翻转
    * @param options.flipe.x=false {boolean} 绕X轴翻转
    * @param options.flipe.y=false {boolean} 绕Y轴翻转
@@ -33,8 +34,31 @@ class GroundSvg extends Base {
    * @param options.position.lng {number} 经度
    * @param options.position.lat {number} 纬度
    * @param options.color {string} 颜色
-   * @param _Dialog {object} 弹框事件
-   * @param _Dialog.confirmCallBack {function} 弹框确认时的回调
+   * @param options.text {object} 文字
+   * @param options.text.show=true {boolean} 文字
+   * @param options.text.position.lng {number} 经度
+   * @param options.text.position.lat {number} 纬度
+   * @param options.text.position.alt {number} 高度
+   * @param options.text.fontSize=20 {number} 字体大小
+   * @param options.text.color=#ffffff {string} 字体大小
+   * @param options.text.scaleByDistance {boolean} 距离缩放
+   * @param options.text.near=2000 {number} 视野缩放最近距离
+   * @param options.text.far=100000 {number} 视野缩放最远距离
+   * @param options.attribute {object} 属性内容
+   * @param {object} options.attribute.link={} 链接
+   * @param options.attribute.link.content=[]] {array} 链接内容
+   * @param options.attribute.link.content[].name {string} 链接名称
+   * @param options.attribute.link.content[].url {string} 链接地址
+   * @param options.richTextContent {string} 富文本内容
+   * @param options.customView {object} 默认视角
+   * @param options.customView.orientation {object} 默认视角方位
+   * @param options.customView.orientation.heading {number} 航向角
+   * @param options.customView.orientation.pitch {number} 俯仰角
+   * @param options.customView.orientation.roll {number} 翻滚角
+   * @param options.customView.relativePosition {object} 视角相对位置
+   * @param options.customView.relativePosition.lng {number} 经度
+   * @param options.customView.relativePosition.lat {number} 纬度
+   * @param options.customView.relativePosition.alt {number} 高度
    * */
   #loadEvent = void 0
   #loaded = false
@@ -108,12 +132,18 @@ class GroundSvg extends Base {
     this._isdrag = false
     this._EventBinding = new EventBinding()
 
+    if(this.sdk.entityMap.get(this.options.id)) {
+      return
+    }
     this.sdk.addIncetance(this.options.id, this)
     this.picking = true
 
+    
     if (this.options.show) {
       setSplitDirection(0, this.options.id)
     }
+
+    this._entityArray = []
     
     this.init()
   }
@@ -153,12 +183,18 @@ class GroundSvg extends Base {
 
   set show(v) {
     if (typeof v === "boolean") {
-      super.show = v
-      if (this.options.text && this.options.text.show && this.text) {
-        this.text.show = v
+      if (this.options.text && this.options.text.show) {
+        if(this.text) {
+          if((!this.showView || this.showView == 3)) {
+            this.text.show = v
+          }
+          else {
+            this.text.show = false
+          }
+        }
+        
       }
-      syncData(this.sdk, this.options.id)
-      syncSplitData(this.sdk, this.options.id)
+      super.show = v
     } else {
       console.error("参数必须为boolean")
     }
@@ -304,7 +340,12 @@ class GroundSvg extends Base {
   set textShow(v) {
     this.options.text.show = v
     if (this.show) {
-      this.text && (this.text.show = v)
+      if((!this.showView || this.showView == 3)) {
+        this.text && (this.text.show = v)
+      }
+      else {
+        this.text && (this.text.show = false)
+      }
       if (this.options.text.position) {
         setTimeout(() => {
           if (this.options.text.position.alt) {
@@ -358,7 +399,10 @@ class GroundSvg extends Base {
   }
   set textFontSize(v) {
     this.options.text.fontSize = v
-    this.text && (this.text.fontSize = v)
+    if(this.text) {
+      this.text.fontSize = v
+      this.text.pixelOffset = v
+    }
     this._elms.textFontSize && this._elms.textFontSize.forEach((item) => {
       item.value = v
     })
@@ -820,8 +864,13 @@ class GroundSvg extends Base {
         }
         for (let i = 0; i < this.hierarchys.length; i++) {
           for (let m = 0; m < this.hierarchys[i].length; m++) {
+            let id = this.options.id + `-${i}_${m}}`
+            let oldEntity = this.sdk.viewer.entities.getById(id)
+            if(oldEntity) {
+              this.sdk.viewer.entities.remove(oldEntity)
+            }
             let entity = this.sdk.viewer.entities.add({
-              id: this.options.id + `-${i}_${m}`,
+              id: this.options.id + `-${i}_${m}}`,
               show: this.options.show,
               polygon: {
                 hierarchy: new Cesium.CallbackProperty(() => {
@@ -854,6 +903,7 @@ class GroundSvg extends Base {
                 color: this.geojson.features[i].properties.color
               }
             }
+            this._entityArray.push(entity)
             this.entity.add(entity)
           }
         }
@@ -885,11 +935,10 @@ class GroundSvg extends Base {
         text: that.options.text.value,
         fontSize: that.options.text.fontSize,
         color: that.options.text.color,
-        pixelOffset: that.options.text.pixelOffset,
+        pixelOffset: that.options.text.fontSize,
         backgroundColor: that.options.text.backgroundColor,
-        lineColor: that.options.text.lineColor,
-        lineWidth: that.options.text.lineWidth,
-        pixelOffset: 0,
+        lineColor: '#ffffff00',
+        lineWidth: 0,
         scaleByDistance: that.options.text.scaleByDistance,
         backgroundColor: ['#ffffff00', '#ffffff00'],
         near: that.options.text.near,
@@ -1189,7 +1238,7 @@ class GroundSvg extends Base {
   * @param {boolean} status=false 状态
   */
   drag(status, cd) {
-    if (!this.#loaded) {
+    if (!this.#loaded || !this.sdk || !this.sdk.viewer) {
       return
     }
     this.ismove = false
@@ -1256,6 +1305,9 @@ class GroundSvg extends Base {
           // 中心点到鼠标的距离
           let distance = turf.rhumbDistance(pointC, point2, options);
 
+          let flag = false
+          let flag2 = false
+
           switch (this.pickPoint.id) {
             case 'svg-control-points_0':
               angle = bearing2_0 - bearing1
@@ -1267,12 +1319,39 @@ class GroundSvg extends Base {
               bearingH = (((turf.rhumbBearing(pointC, turf.point(controlPoints[2])) + 360) - this.angle) % 360)
               angleW = bearing2 - bearingW
               angleH = bearing2 - bearingH
-
               if ((angleW > -360 && angleW < -90) || (angleW < 360 && angleW > 90)) {
                 angleW = angleW + 180
+                flag=true
               }
               if ((angleH > -360 && angleH < -90) || (angleH < 360 && angleH > 90)) {
                 angleH = angleH + 180
+                flag2=true
+              }
+              if(flag && flag2) {
+                this.pointEntityCollection.values[1].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                this.pointEntityCollection.values[3].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                this.pointEntityCollection.values[7].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                this.pointEntityCollection.values[9].point.color = Cesium.Color.fromCssColorString('#ff0000')
+              }
+              else {
+                if(flag) {
+                  this.pointEntityCollection.values[1].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                  this.pointEntityCollection.values[3].point.color = Cesium.Color.fromCssColorString('#ff0000')
+                  this.pointEntityCollection.values[7].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                  this.pointEntityCollection.values[9].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                }
+                else if(flag2) {
+                  this.pointEntityCollection.values[1].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                  this.pointEntityCollection.values[3].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                  this.pointEntityCollection.values[7].point.color = Cesium.Color.fromCssColorString('#ff0000')
+                  this.pointEntityCollection.values[9].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                }
+                else {
+                  this.pointEntityCollection.values[1].point.color = Cesium.Color.fromCssColorString('#ff0000')
+                  this.pointEntityCollection.values[3].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                  this.pointEntityCollection.values[7].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                  this.pointEntityCollection.values[9].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                }
               }
 
               radiansW = (Math.PI / 180) * angleW
@@ -1281,8 +1360,8 @@ class GroundSvg extends Base {
               w = (Math.cos(radiansW) * distance) * 2
               h = (Math.cos(radiansH) * distance) * 2
               // scaleY值
-              this.scale.x = w / 3.5
-              this.scale.y = h / 3.5
+              this.scale.x = Math.abs(w) / 3.5
+              this.scale.y = Math.abs(h) / 3.5
               break
             case 'svg-control-points_2':
             case 'svg-control-points_8':
@@ -1291,6 +1370,12 @@ class GroundSvg extends Base {
 
               if ((angleH > -360 && angleH < -90) || (angleH < 360 && angleH > 90)) {
                 angleH = angleH + 180
+                this.pointEntityCollection.values[2].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                this.pointEntityCollection.values[8].point.color = Cesium.Color.fromCssColorString('#ff0000')
+              }
+              else {
+                this.pointEntityCollection.values[2].point.color = Cesium.Color.fromCssColorString('#ff0000')
+                this.pointEntityCollection.values[8].point.color = Cesium.Color.fromCssColorString('#00ff0a')
               }
 
               radiansH = (Math.PI / 180) * angleH
@@ -1308,9 +1393,37 @@ class GroundSvg extends Base {
 
               if ((angleW > -360 && angleW < -90) || (angleW < 360 && angleW > 90)) {
                 angleW = angleW + 180
+                flag=true
               }
               if ((angleH > -360 && angleH < -90) || (angleH < 360 && angleH > 90)) {
                 angleH = angleH + 180
+                flag2=true
+              }
+              if(flag && flag2) {
+                this.pointEntityCollection.values[1].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                this.pointEntityCollection.values[3].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                this.pointEntityCollection.values[7].point.color = Cesium.Color.fromCssColorString('#ff0000')
+                this.pointEntityCollection.values[9].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+              }
+              else {
+                if(flag) {
+                  this.pointEntityCollection.values[1].point.color = Cesium.Color.fromCssColorString('#ff0000')
+                  this.pointEntityCollection.values[3].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                  this.pointEntityCollection.values[7].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                  this.pointEntityCollection.values[9].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                }
+                else if(flag2) {
+                  this.pointEntityCollection.values[1].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                  this.pointEntityCollection.values[3].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                  this.pointEntityCollection.values[7].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                  this.pointEntityCollection.values[9].point.color = Cesium.Color.fromCssColorString('#ff0000')
+                }
+                else {
+                  this.pointEntityCollection.values[1].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                  this.pointEntityCollection.values[3].point.color = Cesium.Color.fromCssColorString('#ff0000')
+                  this.pointEntityCollection.values[7].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                  this.pointEntityCollection.values[9].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                }
               }
 
               radiansW = (Math.PI / 180) * angleW
@@ -1319,8 +1432,8 @@ class GroundSvg extends Base {
               w = (Math.cos(radiansW) * distance) * 2
               h = (Math.cos(radiansH) * distance) * 2
               // scaleY值
-              this.scale.x = w / 3.5
-              this.scale.y = h / 3.5
+              this.scale.x = Math.abs(w) / 3.5
+              this.scale.y = Math.abs(h) / 3.5
               break
             case 'svg-control-points_4':
               bearingW = (((turf.rhumbBearing(pointC, turf.point(controlPoints[4])) + 360) - this.angle) % 360)
@@ -1328,6 +1441,12 @@ class GroundSvg extends Base {
 
               if ((angleW > -360 && angleW < -90) || (angleW < 360 && angleW > 90)) {
                 angleW = angleW + 180
+                this.pointEntityCollection.values[4].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                this.pointEntityCollection.values[6].point.color = Cesium.Color.fromCssColorString('#ff0000')
+              }
+              else {
+                this.pointEntityCollection.values[6].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                this.pointEntityCollection.values[4].point.color = Cesium.Color.fromCssColorString('#ff0000')
               }
 
               radiansW = (Math.PI / 180) * angleW
@@ -1358,6 +1477,12 @@ class GroundSvg extends Base {
 
               if ((angleW > -360 && angleW < -90) || (angleW < 360 && angleW > 90)) {
                 angleW = angleW + 180
+                this.pointEntityCollection.values[6].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                this.pointEntityCollection.values[4].point.color = Cesium.Color.fromCssColorString('#ff0000')
+              }
+              else {
+                this.pointEntityCollection.values[4].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                this.pointEntityCollection.values[6].point.color = Cesium.Color.fromCssColorString('#ff0000')
               }
 
               radiansW = (Math.PI / 180) * angleW
@@ -1503,6 +1628,9 @@ class GroundSvg extends Base {
       controlPoints[9] = turf.destination(point, wh, 0 + angle, options).geometry.coordinates
 
       this.controlPoints = controlPoints
+      if(!this.sdk || !this.sdk.viewer) {
+        return
+      }
       for (let i = 0; i < this.controlPoints.length; i++) {
         let color = '#00ff0a'
         if (i === 5) {
@@ -1991,21 +2119,25 @@ class GroundSvg extends Base {
   }
 
   async remove() {
+    this._worker.onmessage = (event) => {}
+    await this.sdk.removeIncetance(this.options.id)
     if (!this.entity) {
       return
     }
     this.drag(false)
+    if(!this.sdk || !this.sdk.viewer) {
+      return
+    }
     this.sdk.viewer.entities.remove(this.entity)
     this.text && this.text.remove()
     for (let i = this.entity.values.length; i >= 0; i--) {
       this.sdk.viewer.entities.remove(this.entity.values[i])
     }
-    this.entity = null
     if (this._DialogObject && !this._DialogObject.isDestroy) {
       this._DialogObject.close()
       this._DialogObject = null
     }
-    await this.sdk.removeIncetance(this.options.id)
+    
     await syncData(this.sdk, this.options.id)
   }
 
@@ -2065,6 +2197,59 @@ class GroundSvg extends Base {
     }
     this._update()
   }
+
+  async flyTo(options = {}) {
+    if (this._error) {
+      return
+    }
+    setActiveViewer(0)
+    closeRotateAround(this.sdk)
+    closeViewFollow(this.sdk)
+
+    if (this.options.customView && this.options.customView.relativePosition && this.options.customView.orientation) {
+      let orientation = {
+        heading: Cesium.Math.toRadians(this.options.customView.orientation.heading || 0.0),
+        pitch: Cesium.Math.toRadians(this.options.customView.orientation.pitch || -60.0),
+        roll: Cesium.Math.toRadians(this.options.customView.orientation.roll || 0.0)
+      }
+
+      let lng = this.options.customView.relativePosition.lng
+      let lat = this.options.customView.relativePosition.lat
+      let alt = this.options.customView.relativePosition.alt
+      let destination = Cesium.Cartesian3.fromDegrees(lng, lat, alt)
+
+      let position = { ...this.options.position }
+      // 如果没有高度值，则获取紧贴高度计算
+      if (!position.hasOwnProperty('alt')) {
+        position.alt = await this.getClampToHeight(position)
+      }
+      lng = this.options.customView.relativePosition.lng + position.lng
+      lat = this.options.customView.relativePosition.lat + position.lat
+      alt = this.options.customView.relativePosition.alt + position.alt
+      destination = Cesium.Cartesian3.fromDegrees(lng, lat, alt)
+      this.sdk.viewer.camera.flyTo({
+        destination: destination,
+        orientation: orientation
+      })
+    }
+    else {
+      let array = []
+      for (let i = 0; i < this.controlPoints.length; i++) {
+        let height = await this.getClampToHeight({lng: this.controlPoints[i][0], lat: this.controlPoints[i][1]})
+        let cartesian = Cesium.Cartesian3.fromDegrees(this.controlPoints[i][0], this.controlPoints[i][1], height)
+        array.push(cartesian.x, cartesian.y, cartesian.z)
+      }
+      let BoundingSphere = Cesium.BoundingSphere.fromVertices(array)
+
+      this.sdk.viewer.camera.flyToBoundingSphere(BoundingSphere, {
+        offset: options.orientation || {
+          heading: Cesium.Math.toRadians(0.0),
+          pitch: Cesium.Math.toRadians(-60.0),
+          roll: Cesium.Math.toRadians(0.0)
+        }
+      })
+    }
+  }
 }
 
 export default GroundSvg

src/Obj/Base/LabelObject/index.js

@@ -14,6 +14,8 @@ import {
 
 class LabelObject extends Base {
   #updateBillboardImageTimeout
+  #canvas = document.createElement('canvas')
+  #canvas2 = document.createElement('canvas')
   constructor(sdk, options = {}, model) {
     super(sdk, options)
     this.model = model
@@ -65,6 +67,11 @@ class LabelObject extends Base {
     }
     this.originalOptions = copyObj(this.options)
 
+    let id = this.options.id + '-label'
+    let oldEntity = this.sdk.viewer.entities.getById(id)
+    if(oldEntity) {
+      this.sdk.viewer.entities.remove(oldEntity)
+    }
     this.entity = this.sdk.viewer.entities.add({
       show: this.options.show,
       id: this.options.id + '-label',
@@ -433,11 +440,12 @@ class LabelObject extends Base {
     this.updateBillboardImage()
   }
   updateBillboardImage() {
-    clearTimeout(this.#updateBillboardImageTimeout)
-    this.#updateBillboardImageTimeout = setTimeout(() => {
-      clearTimeout(this.#updateBillboardImageTimeout)
-      this.entity.billboard.image = this.getcanvas()
-    }, 500)
+    this.entity.billboard.image = this.getcanvas()
+    // clearTimeout(this.#updateBillboardImageTimeout)
+    // this.#updateBillboardImageTimeout = setTimeout(() => {
+    //   clearTimeout(this.#updateBillboardImageTimeout)
+    //   this.entity.billboard.image = this.getcanvas()
+    // }, 500)
   }
   get lineColor() {
     return this.options.pixelOffset
@@ -484,9 +492,8 @@ class LabelObject extends Base {
   // }
 
   getcanvas() {
-    const canvas = document.createElement('canvas')
-    const ctx = canvas.getContext('2d')
-
+    const ctx = this.#canvas.getContext('2d')
+    ctx.clearRect(0, 0, this.#canvas.width, this.#canvas.height);
     ctx.font = this.options.fontSize + 'px ' + this.font
     let texts = this.options.text.split('\n')
     let canvasWidth = 0
@@ -504,9 +511,8 @@ class LabelObject extends Base {
     if (canvasWidth < this.options.lineWidth) {
       canvasWidth = this.options.lineWidth
     }
-    canvas.width = canvasWidth
-
-    canvas.height = this.options.pixelOffset + canvasHeight
+    this.#canvas.width = canvasWidth
+    this.#canvas.height = this.options.pixelOffset + canvasHeight
     const linearGradient = ctx.createLinearGradient(
       0,
       0,
@@ -553,15 +559,14 @@ class LabelObject extends Base {
     ctx.stroke()
     ctx.closePath()
 
-    const canvas2 = document.createElement('canvas')
-    const ctx2 = canvas2.getContext('2d')
-    canvas2.width = canvas.width + 10
-    canvas2.height = canvas.height + 10
-    ctx2.drawImage(canvas, 5, 5);
+    const ctx2 = this.#canvas2.getContext('2d')
+    this.#canvas2.width = this.#canvas.width + 10
+    this.#canvas2.height = this.#canvas.height + 10
+    ctx2.drawImage(this.#canvas, 5, 5);
 
     // const imageData = ctx.getImageData(0, 0, canvas.width, canvas.height);
     // ctx.putImageData(imageData, 40, 40);
-    return canvas2
+    return this.#canvas2.toDataURL("image/png")
   }
 
   remove() {

src/Obj/Base/ParticleEffects/Flame/index.js

@@ -7,7 +7,7 @@ import EventBinding from './eventBinding'
 import Base from "../../index";
 import MouseEvent from '../../../../Event/index'
 import { syncPrimitives } from '../../../../Global/MultiViewportMode'
-import { syncData } from '../../../../Global/MultiViewportMode'
+import { syncData, getSdk as get2DSdk } from '../../../../Global/MultiViewportMode'
 import MouseTip from '../../../../MouseTip'
 import { setSplitDirection, syncSplitData, setActiveId } from '../../../../Global/SplitScreen'
 import { setActiveViewer, closeRotateAround, closeViewFollow} from '../../../../Global/global'
@@ -18,9 +18,10 @@ class Flame extends Base {
    * @description 火焰特效
    * @param sdk 
    * @param options {object} 粒子属性
+   * @param options.id {string} 标注id
    * @param options.show=true {boolean} 显示/隐藏
    * @param options.name {string} 名称
-   * @param options.url {string | HTMLImageElement | HTMLCanvasElement | HTMLVideoElement} 指定 Image、URL或Canvas 的属性
+   * @param options.url {string} 贴图地址
    * @param options.startColor="#ff0000" {string} 起始颜色
    * @param options.endColor="#fff000" {string} 结束颜色
    * @param options.startScale=0.5 {number} 初始比例
@@ -34,8 +35,15 @@ class Flame extends Base {
    * @param options.lng 经度
    * @param options.lat 纬度
    * @param options.alt 高度
-   * @param _Dialog {object} 弹框事件
-   * @param _Dialog.confirmCallBack {function} 弹框确认时的回调
+   * @param options.customView {object} 默认视角
+   * @param options.customView.orientation {object} 默认视角方位
+   * @param options.customView.orientation.heading {number} 航向角
+   * @param options.customView.orientation.pitch {number} 俯仰角
+   * @param options.customView.orientation.roll {number} 翻滚角
+   * @param options.customView.relativePosition {object} 视角相对位置
+   * @param options.customView.relativePosition.lng {number} 经度
+   * @param options.customView.relativePosition.lat {number} 纬度
+   * @param options.customView.relativePosition.alt {number} 高度
    * */
   constructor(sdk, options, _Dialog = {}) {
     super(sdk, options);
@@ -82,18 +90,34 @@ class Flame extends Base {
 
   set show(v) {
     if (typeof v === "boolean") {
-      this.options.show = v
-      if (this.entity && this.sdk.viewer.camera.positionCartographic.height < 10000000) {
-        this.entity.show = v
+      let sdkD = get2DSdk().sdkD
+      if (!this.isShowView || !sdkD) {
+        this.options.show = v
       }
+      if (!this.showView || this.showView == 3 || !sdkD) {
+        if (this.entity && this.sdk.viewer.camera.positionCartographic.height < 10000000) {
+          this.entity.show = this.options.show
+        }
+        if (this.options.label && this.options.label.show) {
+          this.label.show = this.options.show
+        }
+      }
+      else {
+        if (this.entity && this.sdk.viewer.camera.positionCartographic.height < 10000000) {
+          this.entity.show = false
+        }
+        if (this.options.label && this.options.label.show) {
+          this.label.show = false
+        }
+      }
+      
       if (this._DialogObject && this._DialogObject.showBtn) {
         this._DialogObject.showBtn.checked = v
       }
-      if (this.options.label && this.options.label.show) {
-        this.label.show = v
-      }
+      
       syncData(this.sdk, this.options.id)
       syncSplitData(this.sdk, this.options.id)
+      this.isShowView = false
     } else {
       console.error("参数必须为boolean")
     }

src/Obj/Base/ParticleEffects/Fountain/index.js

@@ -6,7 +6,7 @@ import { html } from "./_element";
 import EventBinding from './eventBinding'
 import Base from "../../index";
 import MouseEvent from '../../../../Event/index'
-import { syncData } from '../../../../Global/MultiViewportMode'
+import { syncData, getSdk as get2DSdk } from '../../../../Global/MultiViewportMode'
 import MouseTip from '../../../../MouseTip'
 import { setSplitDirection, syncSplitData, setActiveId } from '../../../../Global/SplitScreen'
 import { setActiveViewer, closeRotateAround, closeViewFollow} from '../../../../Global/global'
@@ -17,9 +17,10 @@ class Fountain extends Base {
    * @description 喷泉特效
    * @param sdk 
    * @param options {object} 粒子属性
+   * @param options.id {string} 标注id
    * @param options.show=true {boolean} 显示/隐藏
    * @param options.name {string} 名称
-   * @param options.url {string | HTMLImageElement | HTMLCanvasElement | HTMLVideoElement} 指定 Image、URL或Canvas 的属性
+   * @param options.url {string} 贴图地址
    * @param options.startColor="#c1f7f24d" {string} 起始颜色
    * @param options.endColor="#ffffff00" {string} 结束颜色
    * @param options.startScale=1 {number} 初始比例
@@ -30,12 +31,18 @@ class Fountain extends Base {
    * @param options.maximumParticleLife=7 {number} 最大存在时间(秒)
    * @param options.emissionRate=20 {number} 发射速率(个/每秒)
    * @param options.particleSize=0.5{number} 粒子尺大小
-   * @param options.gravity=-3.5{number} 重力值
    * @param options.lng 经度
    * @param options.lat 纬度
    * @param options.alt 高度
-   * @param _Dialog {object} 弹框事件
-   * @param _Dialog.confirmCallBack {function} 弹框确认时的回调
+   * @param options.customView {object} 默认视角
+   * @param options.customView.orientation {object} 默认视角方位
+   * @param options.customView.orientation.heading {number} 航向角
+   * @param options.customView.orientation.pitch {number} 俯仰角
+   * @param options.customView.orientation.roll {number} 翻滚角
+   * @param options.customView.relativePosition {object} 视角相对位置
+   * @param options.customView.relativePosition.lng {number} 经度
+   * @param options.customView.relativePosition.lat {number} 纬度
+   * @param options.customView.relativePosition.alt {number} 高度
    * */
   constructor(sdk, options, _Dialog = {}) {
     super(sdk, options);
@@ -50,7 +57,7 @@ class Fountain extends Base {
     this.options.maximumSpeed = options.maximumSpeed || 9.5
     this.options.emissionRate = options.emissionRate || 20
     this.options.particleSize = options.particleSize || 0.5
-    this.options.gravity = (options.gravity || options.gravity === 0) ? options.gravity : -3.5
+    // this.options.gravity = (options.gravity || options.gravity === 0) ? options.gravity : -3.5
     this.options.show = options.show === false ? false : true
     this._elms = {};
     this.positionCallBack = null
@@ -83,18 +90,32 @@ class Fountain extends Base {
 
   set show(v) {
     if (typeof v === "boolean") {
-      this.options.show = v
-      if(this.entity && this.sdk.viewer.camera.positionCartographic.height <10000000) {
-        this.entity.show = v
+      let sdkD = get2DSdk().sdkD
+      if (!this.isShowView || !sdkD) {
+        this.options.show = v
+      }
+      if (!this.showView || this.showView == 3 || !sdkD) {
+        if (this.entity && this.sdk.viewer.camera.positionCartographic.height < 10000000) {
+          this.entity.show = this.options.show
+        }
+        if (this.options.label && this.options.label.show) {
+          this.label.show = this.options.show
+        }
+      }
+      else {
+        if (this.entity && this.sdk.viewer.camera.positionCartographic.height < 10000000) {
+          this.entity.show = false
+        }
+        if (this.options.label && this.options.label.show) {
+          this.label.show = false
+        }
       }
       if(this._DialogObject && this._DialogObject.showBtn) {
         this._DialogObject.showBtn.checked = v
       }
-      if (this.options.label && this.options.label.show) {
-        this.label.show = v
-      }
       syncData(this.sdk, this.options.id)
       syncSplitData(this.sdk, this.options.id)
+      this.isShowView = false
     } else {
       console.error("参数必须为boolean")
     }

src/Obj/Base/ParticleEffects/Smoke/index.js

@@ -6,7 +6,7 @@ import { html, css } from "./_element";
 import EventBinding from './eventBinding'
 import Base from "../../index";
 import MouseEvent from '../../../../Event/index'
-import { syncData } from '../../../../Global/MultiViewportMode'
+import { syncData, getSdk as get2DSdk } from '../../../../Global/MultiViewportMode'
 import MouseTip from '../../../../MouseTip'
 import { setSplitDirection, syncSplitData, setActiveId } from '../../../../Global/SplitScreen'
 import { setActiveViewer, closeRotateAround, closeViewFollow} from '../../../../Global/global'
@@ -17,9 +17,10 @@ class Smoke extends Base {
    * @description 烟雾特效
    * @param sdk
    * @param options {object} 粒子属性
+   * @param options.id {string} 标注id
    * @param options.show=true {boolean} 显示/隐藏
    * @param options.name {string} 名称
-   * @param options.url {string | HTMLImageElement | HTMLCanvasElement | HTMLVideoElement} 指定 Image、URL或Canvas 的属性
+   * @param options.url {string} 贴图地址
    * @param options.startColor="#00000000" {string} 起始颜色
    * @param options.endColor="#0000001a" {string} 结束颜色
    * @param options.startScale=0.1 {number} 初始比例
@@ -33,8 +34,15 @@ class Smoke extends Base {
    * @param options.lng 经度
    * @param options.lat 纬度
    * @param options.alt 高度
-   * @param _Dialog {object} 弹框事件
-   * @param _Dialog.confirmCallBack {function} 弹框确认时的回调
+   * @param options.customView {object} 默认视角
+   * @param options.customView.orientation {object} 默认视角方位
+   * @param options.customView.orientation.heading {number} 航向角
+   * @param options.customView.orientation.pitch {number} 俯仰角
+   * @param options.customView.orientation.roll {number} 翻滚角
+   * @param options.customView.relativePosition {object} 视角相对位置
+   * @param options.customView.relativePosition.lng {number} 经度
+   * @param options.customView.relativePosition.lat {number} 纬度
+   * @param options.customView.relativePosition.alt {number} 高度
    * */
   constructor(sdk, options, _Dialog = {}) {
     super(sdk, options);
@@ -81,18 +89,32 @@ class Smoke extends Base {
 
   set show(v) {
     if (typeof v === "boolean") {
-      this.options.show = v
-      if(this.entity && this.sdk.viewer.camera.positionCartographic.height <10000000) {
-        this.entity.show = v
+      let sdkD = get2DSdk().sdkD
+      if (!this.isShowView || !sdkD) {
+        this.options.show = v
+      }
+      if (!this.showView || this.showView == 3 || !sdkD) {
+        if (this.entity && this.sdk.viewer.camera.positionCartographic.height < 10000000) {
+          this.entity.show = this.options.show
+        }
+        if (this.options.label && this.options.label.show) {
+          this.label.show = this.options.show
+        }
+      }
+      else {
+        if (this.entity && this.sdk.viewer.camera.positionCartographic.height < 10000000) {
+          this.entity.show = false
+        }
+        if (this.options.label && this.options.label.show) {
+          this.label.show = false
+        }
       }
       if(this._DialogObject && this._DialogObject.showBtn) {
         this._DialogObject.showBtn.checked = v
       }
-      if (this.options.label && this.options.label.show) {
-        this.label.show = v
-      }
       syncData(this.sdk, this.options.id)
       syncSplitData(this.sdk, this.options.id)
+      this.isShowView = false
     } else {
       console.error("参数必须为boolean")
     }

src/Obj/Base/ParticleEffects/Spout/index.js

@@ -5,7 +5,7 @@ import Dialog from '../../../Element/Dialog';
 import { html, css } from "./_element";
 import Base from "../../index";
 import MouseEvent from '../../../../Event/index'
-import { syncData } from '../../../../Global/MultiViewportMode'
+import { syncData, getSdk as get2DSdk } from '../../../../Global/MultiViewportMode'
 import MouseTip from '../../../../MouseTip'
 import { setSplitDirection, syncSplitData, setActiveId } from '../../../../Global/SplitScreen'
 import { setActiveViewer, closeRotateAround, closeViewFollow } from '../../../../Global/global'
@@ -16,9 +16,10 @@ class Spout extends Base {
    * @description 水柱
    * @param sdk 
    * @param options {object} 粒子属性
+   * @param options.id {string} 标注id
    * @param options.show=true {boolean} 显示/隐藏
    * @param options.name {string} 名称
-   * @param options.url {string | HTMLImageElement | HTMLCanvasElement | HTMLVideoElement} 指定 Image、URL或Canvas 的属性
+   * @param options.url {string} 贴图地址
    * @param options.startColor="#c1f7f2" {string} 起始颜色
    * @param options.endColor="#ffffff00" {string} 结束颜色
    * @param options.startScale=0.2 {number} 初始比例
@@ -28,8 +29,8 @@ class Spout extends Base {
    * @param options.maximumParticleLife=12 {number} 最大存在时间(秒)
    * @param options.emissionRate=100 {number} 发射速率(个/每秒)
    * @param options.particleSize=1 {number} 粒子尺大小
-   * @param options.heading 朝向
-   * @param options.pitch 俯仰角度
+   * @param options.heading 航向角
+   * @param options.pitch 俯仰角
    * @param options.start {object} 开始位置
    * @param options.start.lng 经度
    * @param options.start.lat 纬度
@@ -38,8 +39,15 @@ class Spout extends Base {
    * @param options.end.lng 经度
    * @param options.end.lat 纬度
    * @param options.end.alt 高度
-   * @param _Dialog {object} 弹框事件
-   * @param _Dialog.confirmCallBack {function} 弹框确认时的回调
+   * @param options.customView {object} 默认视角
+   * @param options.customView.orientation {object} 默认视角方位
+   * @param options.customView.orientation.heading {number} 航向角
+   * @param options.customView.orientation.pitch {number} 俯仰角
+   * @param options.customView.orientation.roll {number} 翻滚角
+   * @param options.customView.relativePosition {object} 视角相对位置
+   * @param options.customView.relativePosition.lng {number} 经度
+   * @param options.customView.relativePosition.lat {number} 纬度
+   * @param options.customView.relativePosition.alt {number} 高度
    * */
   constructor(sdk, options, _Dialog = {}) {
     super(sdk, options);
@@ -84,18 +92,32 @@ class Spout extends Base {
 
   set show(v) {
     if (typeof v === "boolean") {
-      this.options.show = v
-      if (this.entity && this.sdk.viewer.camera.positionCartographic.height < 10000000) {
-        this.entity.show = v
+      let sdkD = get2DSdk().sdkD
+      if (!this.isShowView || !sdkD) {
+        this.options.show = v
       }
-      if (this._DialogObject && this._DialogObject.showBtn) {
+      if (!this.showView || this.showView == 3 || !sdkD) {
+        if (this.entity && this.sdk.viewer.camera.positionCartographic.height < 10000000) {
+          this.entity.show = this.options.show
+        }
+        if (this.options.label && this.options.label.show) {
+          this.label.show = this.options.show
+        }
+      }
+      else {
+        if (this.entity && this.sdk.viewer.camera.positionCartographic.height < 10000000) {
+          this.entity.show = false
+        }
+        if (this.options.label && this.options.label.show) {
+          this.label.show = false
+        }
+      }
+      if(this._DialogObject && this._DialogObject.showBtn) {
         this._DialogObject.showBtn.checked = v
       }
-      if (this.options.label && this.options.label.show) {
-        this.label.show = v
-      }
       syncData(this.sdk, this.options.id)
       syncSplitData(this.sdk, this.options.id)
+      this.isShowView = false
     } else {
       console.error("参数必须为boolean")
     }

src/Obj/Base/PincerArrowObject/index.js

@@ -22,14 +22,56 @@ class PincerArrowObject extends Base {
    * @param sdk 
    * @description 双箭头
    * @param options {object} 属性
+   * @param options.id {string} 唯一标识
    * @param options.show=true {boolean} 显示/隐藏
    * @param options.name {string} 名称
-   * @param options.color="#ff000080" {string} 颜色
+   * @param options.color='rgba(255, 0, 0, 0.5)' {string} 颜色
    * @param options.height {number} 高度
    * @param options.heightMode=2{number} 高度模式（0：海拔高度；1：相对地表；2：依附模式）
-   * @param {Array.<object>} options.positions 坐标数组 [{lon,lat,alt},...]
-   * @param _Dialog {object} 弹框事件
-   * @param _Dialog.confirmCallBack {function} 弹框确认时的回调
+   * @param options.areaUnit='平方米' {string} 面积单位
+   * @param options.line {object} 边框
+   * @param options.line.width=2 {string} 边框宽
+   * @param options.line.color="rgba(155, 155, 124, 0.89)" {string} 边框颜色
+   * @param {Array.<object>} options.positions 必填，经纬度和高度的列表，值交替 [{lon,lat,alt},...]
+   * @param options.positions[].lng {number} 经度
+   * @param options.positions[].lat {number} 纬度
+   * @param options.positions[].alt {number} 高度
+   * @param options.spreadState=false {boolean} 动画
+   * @param options.loop=false {loop} 动画重复
+   * @param options.spreadTime=3000 {number} 动画持续时长(毫秒)
+   * @param options.label {object} 标签对象
+   * @param options.label.text {string} 标签文本
+   * @param options.label.show {string} 标签显隐
+   * @param options.label.position {string} 标签位置
+   * @param options.label.position {object} 标签位置
+   * @param options.label.position.lng {number} 经度
+   * @param options.label.position.lat {number} 纬度
+   * @param options.label.position.alt {number} 高度
+   * @param options.label.fontSize=20 {number} 字体大小
+   * @param options.label.fontFamily=0 {number} 字体项 0：黑体；1：思源黑体；2：庞门正道标题体；3：数黑体
+   * @param options.label.color=#ffffff {string} 字体颜色
+   * @param options.label.lineWidth=4 {number} 引线宽
+   * @param options.label.lineColor=#00ffff80 {string} 引线颜色
+   * @param options.label.pixelOffset=20 {number} 字体偏移(引线长度)
+   * @param options.label.backgroundColor=['#00ffff80', '#00ffff80'] {array} 背景颜色
+   * @param options.label.scaleByDistance {boolean} 距离缩放
+   * @param options.label.near=2000 {number} 视野缩放最近距离
+   * @param options.label.far=100000 {number} 视野缩放最远距离
+   * @param options.attribute {object} 属性内容
+   * @param options.attribute.link={} {object} 链接
+   * @param options.attribute.link.content=[]] {array} 链接内容
+   * @param options.attribute.link.content[].name {string} 链接名称
+   * @param options.attribute.link.content[].url {string} 链接地址
+   * @param options.richTextContent {string} 富文本内容
+   * @param options.customView {object} 默认视角
+   * @param options.customView.orientation {object} 默认视角方位
+   * @param options.customView.orientation.heading {number} 航向角
+   * @param options.customView.orientation.pitch {number} 俯仰角
+   * @param options.customView.orientation.roll {number} 翻滚角
+   * @param options.customView.relativePosition {object} 视角相对位置
+   * @param options.customView.relativePosition.lng {number} 经度
+   * @param options.customView.relativePosition.lat {number} 纬度
+   * @param options.customView.relativePosition.alt {number} 高度
    * */
   constructor(sdk, options = {}, _Dialog = {}) {
     super(sdk, options);
@@ -40,7 +82,7 @@ class PincerArrowObject extends Base {
     this.options.heightMode = (options.heightMode || options.heightMode == 0) ? options.heightMode : 2
     this.options.line = options.line || {}
     this.options.line.width = ((this.options.line.width || this.options.line.width === 0) ? this.options.line.width : 3)
-    this.options.line.color = this.options.line.color || 'rgba(255, 0, 0, 0.5)'
+    this.options.line.color = this.options.line.color || 'rgba(255, 0, 0, 1)'
     this.options['area-unit'] = options['area-unit'] || '平方米'
     this.options.height = options.height
     this.options.loop = options.loop || false
@@ -334,7 +376,7 @@ class PincerArrowObject extends Base {
   }
   set labelShow(v) {
     this.options.label.show = v
-    if (this.show) {
+    if (this.show && !this.showView || this.showView == 3) {
       this.label.show = v
     }
     else {

src/Obj/Base/PolygonObject/index.js

@@ -19,8 +19,8 @@ import { setActiveViewer, closeRotateAround, closeViewFollow } from '../../../Gl
 class PolygonObject extends Base {
   /**
    * @constructor
-   * @param sdk
    * @description 多边形
+   * @param sdk
    * @param options {object} 属性
    * @param options.id {string} 唯一标识
    * @param options.show=true {boolean} 显示/隐藏
@@ -28,11 +28,51 @@ class PolygonObject extends Base {
    * @param options.color='rgba(255, 0, 0, 0.5)' {string} 颜色
    * @param options.height {number} 高度
    * @param options.heightMode=2{number} 高度模式（0：海拔高度；1：相对地表；2：依附模式）
+   * @param options.areaUnit='平方米' {string} 面积单位
    * @param options.line {object} 边框
    * @param options.line.width=2 {string} 边框宽
    * @param options.line.color="rgba(155, 155, 124, 0.89)" {string} 边框颜色
-   * @param {Array.<object>} options.positions 经纬度和高度的列表，值交替 [{lon,lat,alt},...]
-   
+   * @param {Array.<object>} options.positions 必填，经纬度和高度的列表，值交替 [{lon,lat,alt},...]
+   * @param options.positions[].lng {number} 经度
+   * @param options.positions[].lat {number} 纬度
+   * @param options.positions[].alt {number} 高度
+   * @param options.label {object} 标签对象
+   * @param options.label.text {string} 标签文本
+   * @param options.label.show {string} 标签显隐
+   * @param options.label.position {string} 标签位置
+   * @param options.label.position {object} 标签位置
+   * @param options.label.position.lng {number} 经度
+   * @param options.label.position.lat {number} 纬度
+   * @param options.label.position.alt {number} 高度
+   * @param options.label.fontSize=20 {number} 字体大小
+   * @param options.label.fontFamily=0 {number} 字体项 0：黑体；1：思源黑体；2：庞门正道标题体；3：数黑体
+   * @param options.label.color=#ffffff {string} 字体颜色
+   * @param options.label.lineWidth=4 {number} 引线宽
+   * @param options.label.lineColor=#00ffff80 {string} 引线颜色
+   * @param options.label.pixelOffset=20 {number} 字体偏移(引线长度)
+   * @param options.label.backgroundColor=['#00ffff80', '#00ffff80'] {array} 背景颜色
+   * @param options.label.scaleByDistance {boolean} 距离缩放
+   * @param options.label.near=2000 {number} 视野缩放最近距离
+   * @param options.label.far=100000 {number} 视野缩放最远距离
+   * @param options.attribute {object} 属性内容
+   * @param {object} options.attribute.link={} 链接
+   * @param options.attribute.link.content=[]] {array} 链接内容
+   * @param options.attribute.link.content[].name {string} 链接名称
+   * @param options.attribute.link.content[].url {string} 链接地址
+   * @param options.richTextContent {string} 富文本内容
+   * @param options.customView {object} 默认视角
+   * @param options.customView.orientation {object} 默认视角方位
+   * @param options.customView.orientation.heading {number} 航向角
+   * @param options.customView.orientation.pitch {number} 俯仰角
+   * @param options.customView.orientation.roll {number} 翻滚角
+   * @param options.customView.relativePosition {object} 视角相对位置
+   * @param options.customView.relativePosition.lng {number} 经度
+   * @param options.customView.relativePosition.lat {number} 纬度
+   * @param options.customView.relativePosition.alt {number} 高度
+   * 
+
+
+   * 
    * @param _Dialog {object} 弹框事件
    * @param _Dialog.confirmCallBack {function} 弹框确认时的回调
    * */
@@ -47,7 +87,7 @@ class PolygonObject extends Base {
     this.options.line = options.line || {}
     this.options.line.width = ((this.options.line.width || this.options.line.width === 0) ? this.options.line.width : 3)
     this.options.line.color =
-      this.options.line.color || 'rgba(255, 0, 0, 0.5)'
+      this.options.line.color || 'rgba(255, 0, 0, 1)'
     this.options['area-unit'] = options['area-unit'] || '平方米'
     this.entity
     this.event = new MouseEvent(this.sdk)
@@ -355,7 +395,7 @@ class PolygonObject extends Base {
   }
   set labelShow(v) {
     this.options.label.show = v
-    if (this.show) {
+    if (this.show && !this.showView || this.showView == 3) {
       this.label.show = v
     } else {
       this.label.show = false
@@ -1216,7 +1256,6 @@ class PolygonObject extends Base {
             alt: this.label.position[2]
           }
           this.originalOptions = this.deepCopyObj(this.options)
-          console.log('000000000000',this.options.label.scaleByDistance)
           this._DialogObject.close()
           this.Dialog.confirmCallBack &&
             this.Dialog.confirmCallBack(this.originalOptions)

src/Obj/Base/PolyhedronObject/eventBinding.js

@@ -21,6 +21,7 @@ class eventBinding {
       let Event = []
       let isEvent = false
       let removeName = []
+      let blurEvent = () => { }
       if (!elements[i] || !elements[i].attributes) {
         continue 
       }
@@ -36,7 +37,8 @@ class eventBinding {
               Event.push((e) => {
                 let value = e.target.value
                 if (e.target.type == 'number') {
-                  if (e.data != '.' && (e.data != '-' || e.target.value)) {
+                  let str = e.target.value + ''
+                  if (e.data != '.' && (e.data != '-' || e.target.value) && !(str.charAt(str.length - 1) == '0' && e.target.value.toString().includes('.')) && e.target.value != '0') {
                     value = Number(value)
                     if((e.target.max) && value>Number(e.target.max)) {
                       value = Number(e.target.max)
@@ -57,6 +59,22 @@ class eventBinding {
                   that[m.value] = value
                 }
               })
+              blurEvent = (e) => {
+                let value = e.target.value
+                if ((e.target.type == 'number') && (e.target.value || (e.target.dataset.null !== 'undefined' && e.target.dataset.null !== '' && !Boolean(e.target.dataset.null)))) {
+                  value = Number(value)
+                  if ((e.target.max) && value > Number(e.target.max)) {
+                    value = Number(e.target.max)
+                  }
+                  if ((e.target.min) && value < Number(e.target.min)) {
+                    value = Number(e.target.min)
+                  }
+                  if ((e.target.dataset.min) && value < Number(e.target.dataset.min)) {
+                    value = Number(e.target.dataset.min)
+                  }
+                }
+                that[m.value] = value
+              }
               if(elements[i].nodeName=='IMG') {
                 elements[i].src = that[m.value]
               }
@@ -114,6 +132,7 @@ class eventBinding {
             Event[t](e)
           }
         });
+        elements[i].addEventListener('blur', blurEvent)
       }
     }
   }

src/Obj/Base/PolyhedronObject/index.js

@@ -26,9 +26,44 @@ class PolyhedronObject extends Base {
    * @param options.name {string} 名称
    * @param options.color="#ff0000" {string} 颜色
    * @param options.height=10 {number} 高
-   * @param {Array.<object>} options.positions 经纬度和高度的列表，值交替 [{lon,lat,alt},...]
-   * @param _Dialog {object} 弹框事件
-   * @param _Dialog.confirmCallBack {function} 弹框确认时的回调
+   * @param options.areaUnit='平方米' {string} 投影面积单位
+   * @param {Array.<object>} options.positions 必填，经纬度和高度的列表，值交替 [{lon,lat,alt},...]
+   * @param options.positions[].lng {number} 经度
+   * @param options.positions[].lat {number} 纬度
+   * @param options.positions[].alt {number} 高度
+   * @param options.label {object} 标签对象
+   * @param options.label.text {string} 标签文本
+   * @param options.label.show {string} 标签显隐
+   * @param options.label.position {string} 标签位置
+   * @param options.label.position {object} 标签位置
+   * @param options.label.position.lng {number} 经度
+   * @param options.label.position.lat {number} 纬度
+   * @param options.label.position.alt {number} 高度
+   * @param options.label.fontSize=20 {number} 字体大小
+   * @param options.label.fontFamily=0 {number} 字体项 0：黑体；1：思源黑体；2：庞门正道标题体；3：数黑体
+   * @param options.label.color=#ffffff {string} 字体颜色
+   * @param options.label.lineWidth=4 {number} 引线宽
+   * @param options.label.lineColor=#00ffff80 {string} 引线颜色
+   * @param options.label.pixelOffset=20 {number} 字体偏移(引线长度)
+   * @param options.label.backgroundColor=['#00ffff80', '#00ffff80'] {array} 背景颜色
+   * @param options.label.scaleByDistance {boolean} 距离缩放
+   * @param options.label.near=2000 {number} 视野缩放最近距离
+   * @param options.label.far=100000 {number} 视野缩放最远距离
+   * @param options.attribute {object} 属性内容
+   * @param {object} options.attribute.link={} 链接
+   * @param options.attribute.link.content=[]] {array} 链接内容
+   * @param options.attribute.link.content[].name {string} 链接名称
+   * @param options.attribute.link.content[].url {string} 链接地址
+   * @param options.richTextContent {string} 富文本内容
+   * @param options.customView {object} 默认视角
+   * @param options.customView.orientation {object} 默认视角方位
+   * @param options.customView.orientation.heading {number} 航向角
+   * @param options.customView.orientation.pitch {number} 俯仰角
+   * @param options.customView.orientation.roll {number} 翻滚角
+   * @param options.customView.relativePosition {object} 视角相对位置
+   * @param options.customView.relativePosition.lng {number} 经度
+   * @param options.customView.relativePosition.lat {number} 纬度
+   * @param options.customView.relativePosition.alt {number} 高度
    * */
   constructor(sdk, options = {}, _Dialog = {}) {
     super(sdk, options);
@@ -517,7 +552,7 @@ class PolyhedronObject extends Base {
   }
   set labelShow(v) {
     this.options.label.show = v
-    if (this.show) {
+    if (this.show && !this.showView || this.showView == 3) {
       this.label.show = v
     }
     else {

src/Obj/Base/PolylineObject/_element.js

@@ -90,27 +90,6 @@ function html(that) {
                         <div class="col" style="flex: 0 0 37%;">
                         </div>
                     </div>
-                    <div class="row" id="dashTextureDom">
-                        <div class="col">
-                            <span class="label">动画顺向</span>
-                            <input class="btn-switch" type="checkbox" @model="rotate">
-                        </div>
-                        <div class="col" style="flex: 0 0 33%;">
-                            <span class="label">流动速率</span>
-                            <div class="input-number input-number-unit-1" style="width: 80px;">
-                                <input class="input" type="number" title="" min="0" max="999999" step="1" @model="speed">
-                                <span class="arrow"></span>
-                            </div>
-                        </div>
-                        <div class="col" style="flex: 0 0 37%;">
-                              <span class="label lineSpace">间距</span>
-                              <div class="input-number input-number-unit-1 lineSpace" style="width: 80px;">
-                                  <input class="input" type="number" title="" min="0" max="4.5" step="0.1" @model="space">
-                                  <span class="unit">倍</span>
-                                  <span class="arrow"></span>
-                              </div>
-                        </div>
-                    </div>
                     <div class="row">
                         <div class="col">
                             <span class="label">线段缓冲</span>
@@ -129,6 +108,27 @@ function html(that) {
                             <div class="extendColor"></div>
                         </div>
                     </div>
+                    <div class="row" id="dashTextureDom">
+                        <div class="col">
+                            <span class="label">首尾反向</span>
+                            <input class="btn-switch" type="checkbox" @model="rotate">
+                        </div>
+                        <div class="col" style="flex: 0 0 33%;">
+                            <span class="label">流动速率</span>
+                            <div class="input-number input-number-unit-1" style="width: 80px;">
+                                <input class="input" type="number" title="" min="0" max="999999" step="1" @model="speed">
+                                <span class="arrow"></span>
+                            </div>
+                        </div>
+                        <div class="col" style="flex: 0 0 37%;">
+                              <span class="label lineSpace">线条间距</span>
+                              <div class="input-number input-number-unit-1 lineSpace" style="width: 80px;">
+                                  <input class="input" type="number" title="" min="0" max="4.5" step="0.1" @model="space">
+                                  <span class="unit">倍</span>
+                                  <span class="arrow"></span>
+                              </div>
+                        </div>
+                    </div>
                 </DIV-cy-tab-pane>
                 <DIV-cy-tab-pane label="标注风格">
                     ${labelStyleElm1()}

src/Obj/Base/PolylineObject/index.js

@@ -13,38 +13,58 @@ import MouseTip from '../../../MouseTip'
 import Controller from '../../../Controller/index'
 import { syncData, get3DView } from '../../../Global/MultiViewportMode'
 import { legp } from '../../Element/datalist'
+import { getFontList, getFontFamilyName } from '../../Element/fontSelect'
 import { setSplitDirection, syncSplitData, setActiveId } from '../../../Global/SplitScreen'
 import { setActiveViewer, closeRotateAround, closeViewFollow } from '../../../Global/global'
 
 class PolylineObject extends Base {
+  #unitDataLegpObject
   /**
    * @constructor
    * @param sdk
    * @description 折线
    * @param options {object} 线属性
    * @param options.name{string} 名称
-   * @param options.width   * @param options.width=3{number} 线宽
+   * @param options.width=3{number} 线宽
    * @param options.color=#ff0000 {string} 颜色
-   * @param options.type=0 {number} 材质类型 0-实线 1-虚线 2-泛光
+   * @param options.type=0 {number} 材质类型 0-实线 1-虚线 2-泛光...
    * @param options.heightMode=2{number} 高度模式（0：海拔高度；1：相对高度；2：依附模式）
-   * @param options['nose-to-tail']=false {boolean} 首尾相连
+   * @param options.noseToTail=false {boolean} 首尾相连
    * @param options.smooth=false {boolean} 线段圆滑
    * @param options.extend=false {boolean} 线缓冲
-   * @param options['extend-width']=1 {number} 线缓冲宽度
-   * @param options['extend-color']=#ffde00 {number} 线缓冲颜色
+   * @param options.extendWidth=10 {number} 线缓冲宽度
+   * @param options.extendColor=rgba(255,255,80,0.3) {number} 线缓冲颜色
    * @param options.show=true {boolean} 显隐
-   * @param {Array.<object>} options.positions 坐标数组 [{lng,lat},...]
-   * @param options.label {object} 标注
-   * @param options.label.show=false {boolean} 标注显隐
-   * @param options.label.fontSize=20 {number} 标注字体大小
-   * @param options.label.color=#ffffff {string} 标注字体颜色
-   * @param options.label.lineWidth=1 {number} 标注引线宽
-   * @param options.label.pixelOffset=20 {string} 标注引线长度
-   * @param options.label.backgroundColor=['#42c6ef', '#42c6ef'] {Array} 标注背景
-   * @param options.label.lineColor=#fff000 {string} 标注引线颜色
-   * @param options.label.scaleByDistance=false {boolean} 标注是否随视野缩放
-   * @param options.label.near=2000 {boolean} 标注随视野缩放最近距离
-   * @param options.label.far=100000 {boolean} 标注随视野缩放最远距离
+   * @param {Array.<object>} options.positions 必填，经纬度和高度的列表，值交替 [{lon,lat,alt},...]
+   * @param options.positions[].lng {number} 经度
+   * @param options.positions[].lat {number} 纬度
+   * @param options.positions[].alt {number} 高度
+   * @param options.label {object} 标签对象
+   * @param options.label.text {string} 标签文本
+   * @param options.label.show {string} 标签显隐
+   * @param options.label.position {string} 标签位置
+   * @param options.label.position {object} 标签位置
+   * @param options.label.position.lng {number} 经度
+   * @param options.label.position.lat {number} 纬度
+   * @param options.label.position.alt {number} 高度
+   * @param options.label.fontSize=20 {number} 字体大小
+   * @param options.label.fontFamily=0 {number} 字体项 0：黑体；1：思源黑体；2：庞门正道标题体；3：数黑体
+   * @param options.label.color=#ffffff {string} 字体颜色
+   * @param options.label.lineWidth=4 {number} 引线宽
+   * @param options.label.lineColor=#00ffff80 {string} 引线颜色
+   * @param options.label.pixelOffset=20 {number} 字体偏移(引线长度)
+   * @param options.label.backgroundColor=['#00ffff80', '#00ffff80'] {array} 背景颜色
+   * @param options.label.scaleByDistance {boolean} 距离缩放
+   * @param options.label.near=2000 {number} 视野缩放最近距离
+   * @param options.label.far=100000 {number} 视野缩放最远距离
+   * @param options.attribute {object} 属性内容
+   * @param options.attribute.link={} {string} 链接
+   * @param options.attribute.link.content=[]] {array} 链接内容
+   * @param options.attribute.link.content[].name {string} 链接名称
+   * @param options.attribute.link.content[].url {string} 链接地址
+   * @param options.richTextContent {string} 富文本内容
+   * 
+   * 
    * @param _Dialog {object} 弹框事件
    * @param _Dialog.confirmCallBack {function} 弹框确认时的回调
    * */
@@ -67,8 +87,8 @@ class PolylineObject extends Base {
     this.options['extend-width'] =
       options['extend-width'] || options['extend-width'] === 0
         ? options['extend-width']
-        : 1
-    this.options['extend-color'] = options['extend-color'] || '#ffde00'
+        : 10
+    this.options['extend-color'] = options['extend-color'] || 'rgba(255,255,80,0.3)'
     this.options.show =
       options.show || options.show === false ? options.show : true
     this.options.heightMode = (options.heightMode || options.heightMode == 0) ? options.heightMode : 2
@@ -82,6 +102,7 @@ class PolylineObject extends Base {
         options.label.fontSize || options.label.fontSize === 0
           ? options.label.fontSize
           : 20,
+      fontFamily: options.label.fontFamily ? options.label.fontFamily : 0,
       color: options.label.color || '#ffffff',
       lineWidth:
         options.label.lineWidth || options.label.lineWidth === 0
@@ -268,6 +289,7 @@ class PolylineObject extends Base {
       this._elms.lengthUnit.forEach(item => {
         item.value = v
       })
+    this.#unitDataLegpObject && this.#unitDataLegpObject.legp_searchActive(v)
     if (this.options.lengthByMeter) {
       if (this.unitNum > 2) {
         switch (v) {
@@ -697,7 +719,7 @@ class PolylineObject extends Base {
   }
   set labelShow(v) {
     this.options.label.show = v
-    if (this.show) {
+    if (this.show && !this.showView || this.showView == 3) {
       this.label.show = v
       setTimeout(() => {
         this.label.position = [
@@ -715,6 +737,21 @@ class PolylineObject extends Base {
       })
   }
 
+  get labelFontFamily() {
+    return this.options.label.fontFamily
+  }
+
+  set labelFontFamily(v) {
+    this.options.label.fontFamily = v || 0
+    this.label && (this.label.fontFamily = this.options.label.fontFamily)
+
+    let name = getFontFamilyName(this.labelFontFamily) || ''
+    this._elms.labelFontFamily &&
+      this._elms.labelFontFamily.forEach(item => {
+        item.value = name
+      })
+  }
+
   get labelColor() {
     return this.options.label.color
   }
@@ -825,7 +862,6 @@ class PolylineObject extends Base {
   set labelLineColor(v) {
     this.options.label.lineColor = v
     this.label.lineColor = v
-    let _this = this
     if (this._elms.labelLineColor) {
       this._elms.labelLineColor.forEach((item, i) => {
         let lineColorPicker = new YJColorPicker({
@@ -840,6 +876,29 @@ class PolylineObject extends Base {
           }, //点击确认按钮事件回调
           clear: () => {
             this.labelLineColor = 'rgba(0,255,255,0.5)'
+          } //点击清空按钮事件回调
+        })
+        this._elms.labelLineColor[i] = lineColorPicker
+      })
+    }
+  }
+
+  get labelBackgroundColorStart() {
+    return this.options.label.backgroundColor[0]
+  }
+  set labelBackgroundColorStart(v) {
+    this.options.label.backgroundColor[0] = v
+    this.label.backgroundColor = [v, this.label.backgroundColor[1]]
+    if (this._elms.labelBackgroundColorStart) {
+      this._elms.labelBackgroundColorStart.forEach((item, i) => {
+        let labelBackgroundColorStartPicker = new YJColorPicker({
+          el: item.el,
+          size: 'mini', //颜色box类型
+          alpha: true, //是否开启透明度
+          defaultColor: this.labelBackgroundColorStart,
+          disabled: false, //是否禁止打开颜色选择器
+          openPickerAni: 'opacity', //打开颜色选择器动画
+          sure: color => {
             this.labelBackgroundColorStart = color
           }, //点击确认按钮事件回调
           clear: () => {
@@ -848,7 +907,7 @@ class PolylineObject extends Base {
         })
         this._elms.labelBackgroundColorStart[
           i
-        ] = _this.labelBackgroundColorStartPicker
+        ] = labelBackgroundColorStartPicker
       })
     }
   }
@@ -1312,6 +1371,7 @@ class PolylineObject extends Base {
       ],
       text: that.options.name,
       fontSize: that.options.label.fontSize,
+      fontFamily: that.options.label.fontFamily,
       color: that.options.label.color,
       pixelOffset: that.options.label.pixelOffset,
       backgroundColor: that.options.label.backgroundColor,
@@ -1368,10 +1428,10 @@ class PolylineObject extends Base {
       that.options.lengthByMeter = res
       that.lengthUnit = that.options['length-unit']
       syncData(that.sdk, that.options.id)
-      if (that.options.show) {
-        setSplitDirection(0, that.options.id)
-      }
     })
+    if (that.options.show) {
+      setSplitDirection(0, that.options.id)
+    }
 
 
     // if (this.options['nose-to-tail']) {
@@ -1565,6 +1625,9 @@ class PolylineObject extends Base {
           }
           this.nodePoints = []
           this.positionEditing = false
+          YJ.Measure.SetMeasureStatus(false)
+          this.event && this.event.destroy()
+          this.tip && this.tip.destroy()
         },
         showCallBack: show => {
           this.options.show = show
@@ -1799,6 +1862,7 @@ class PolylineObject extends Base {
           '.input-select-unit',
           1
         )
+        this.#unitDataLegpObject = unitDataLegpObject
         if (unitDataLegpObject) {
           unitDataLegpObject.legp_search(unitData)
           let unitDataLegpElm = this._DialogObject._element.content
@@ -2221,6 +2285,37 @@ class PolylineObject extends Base {
           this._elms.altInput.push(altInput)
           tBodyElm.appendChild(tr)
         }
+
+
+        let fontData = getFontList()
+        let fontObject = legp(
+          this._DialogObject._element.content.getElementsByClassName(
+            'font-select-box'
+          )[0],
+          '.font-select'
+        )
+        if (fontObject) {
+          fontObject.legp_search(fontData)
+          let fontDataLegpElm = this._DialogObject._element.content
+            .getElementsByClassName('font-select')[0]
+            .getElementsByTagName('input')[0]
+          fontDataLegpElm.value = fontData[this.labelFontFamily].value
+          for (let i = 0; i < fontData.length; i++) {
+            if (fontData[i].value == fontDataLegpElm.value) {
+              fontObject.legp_searchActive(fontData[i].value)
+              break
+            }
+          }
+          fontDataLegpElm.addEventListener('input', () => {
+            for (let i = 0; i < fontData.length; i++) {
+              if (fontData[i].value === fontDataLegpElm.value) {
+                this.labelFontFamily = fontData[i].key
+                break
+              }
+            }
+          })
+          this._elms.labelFontFamily = [fontDataLegpElm]
+        }
       }, 0)
     } else {
       if (this._DialogObject && this._DialogObject.close) {
@@ -2422,6 +2517,7 @@ class PolylineObject extends Base {
     this.labelShow = this.originalOptions.label.show
     this.labelColor = this.originalOptions.label.color
     this.labelFontSize = this.originalOptions.label.fontSize
+    this.labelFontFamily = this.originalOptions.label.fontFamily
     this.labelLineWidth = this.originalOptions.label.lineWidth
     this.labelPixelOffset = this.originalOptions.label.pixelOffset
     this.labelLineColor = this.originalOptions.label.lineColor

src/Obj/Base/RadarScan/index.js

@@ -6,7 +6,7 @@ import EventBinding from '../../Element/Dialog/eventBinding';
 import richText from "../../Element/richText";
 import MouseEvent from '../../../Event/index'
 import LabelObject from '../LabelObject'
-import { syncData } from '../../../Global/MultiViewportMode'
+import { syncData, getSdk as get2DSdk } from '../../../Global/MultiViewportMode'
 import { legp } from '../../Element/datalist';
 import { getFontList, getFontFamilyName } from '../../Element/fontSelect'
 import MouseTip from '../../../MouseTip'
@@ -20,14 +20,44 @@ class RadarScan extends Base {
    * @param sdk 
    * @param options {object} 圆属性
    * @param options.id {string} 标注id
-   * @param [options.show=true] {boolean} 显示/隐藏
+   * @param options.show=true {boolean} 显示/隐藏
    * @param options.lng {number} 经度
    * @param options.lat {number} 维度
-   * @param options.color=#1FA8E3 {string} 颜色
+   * @param options.color=#FFEB3B {string} 颜色
    * @param options.radius=10 {number} 半径
    * @param options.speed=20 {number} 速度
-   * @param _Dialog {object} 弹框事件
-   * @param _Dialog.confirmCallBack {function} 弹框确认时的回调
+   * @param options.label {object} 标签对象
+   * @param options.label.show {string} 标签显隐
+   * @param options.label.position {string} 标签位置
+   * @param options.label.position {object} 标签位置
+   * @param options.label.position.lng {number} 经度
+   * @param options.label.position.lat {number} 纬度
+   * @param options.label.position.alt {number} 高度
+   * @param options.label.fontSize=20 {number} 字体大小
+   * @param options.label.fontFamily=0 {number} 字体项 0：黑体；1：思源黑体；2：庞门正道标题体；3：数黑体
+   * @param options.label.color=#ffffff {string} 字体颜色
+   * @param options.label.lineWidth=4 {number} 引线宽
+   * @param options.label.lineColor=#00ffff80 {string} 引线颜色
+   * @param options.label.pixelOffset=20 {number} 字体偏移(引线长度)
+   * @param options.label.backgroundColor=['#00ffff80', '#00ffff80'] {array} 背景颜色
+   * @param options.label.scaleByDistance {boolean} 距离缩放
+   * @param options.label.near=2000 {number} 视野缩放最近距离
+   * @param options.label.far=100000 {number} 视野缩放最远距离
+   * @param options.attribute {object} 属性内容
+   * @param {object} options.attribute.link={} 链接
+   * @param options.attribute.link.content=[]] {array} 链接内容
+   * @param options.attribute.link.content[].name {string} 链接名称
+   * @param options.attribute.link.content[].url {string} 链接地址
+   * @param options.richTextContent {string} 富文本内容
+   * @param options.customView {object} 默认视角
+   * @param options.customView.orientation {object} 默认视角方位
+   * @param options.customView.orientation.heading {number} 航向角
+   * @param options.customView.orientation.pitch {number} 俯仰角
+   * @param options.customView.orientation.roll {number} 翻滚角
+   * @param options.customView.relativePosition {object} 视角相对位置
+   * @param options.customView.relativePosition.lng {number} 经度
+   * @param options.customView.relativePosition.lat {number} 纬度
+   * @param options.customView.relativePosition.alt {number} 高度
    */
   constructor(sdk, options = {}, _Dialog = {}) {
     super(sdk, options);
@@ -138,7 +168,7 @@ class RadarScan extends Base {
     })
     that.sdk._entityZIndex++
     if (that.sdk.viewer._element.className === 'cesium-viewer 2d') {
-      that.entity.ellipse.height = 1000000
+      that.entity.ellipse.height = 1
     }
     RadarScan.createLabel(that)
     syncData(that.sdk, that.options.id)
@@ -246,16 +276,29 @@ class RadarScan extends Base {
 
   set show(v) {
     if (typeof v === "boolean") {
-      this.options.show = v
-      this.entity.show = v
+      let sdkD = get2DSdk().sdkD
+      if (!this.isShowView || !sdkD) {
+        this.options.show = v
+      }
+      if (!this.showView || this.showView == 3 || !sdkD) {
+        this.entity.show = this.options.show
+        if (this.options.label.show && this.label) {
+          this.label.show = this.options.show
+        }
+      }
+      else {
+        this.entity.show = false
+        if (this.options.label.show && this.label) {
+          this.label.show = false
+        }
+      }
       if (this._DialogObject && this._DialogObject.showBtn) {
         this._DialogObject.showBtn.checked = v
       }
-      if (this.options.label.show && this.label) {
-        this.label.show = v
-      }
+      
       syncData(this.sdk, this.options.id)
       syncSplitData(this.sdk, this.options.id)
+      this.isShowView = false
     } else {
       console.error("参数必须为boolean")
     }
@@ -448,8 +491,9 @@ class RadarScan extends Base {
     return this.options.label.show
   }
   set labelShow(v) {
+    let sdkD = get2DSdk().sdkD
     this.options.label.show = v
-    if (this.show) {
+    if (this.show && (!this.showView || this.showView == 3 || !sdkD)) {
       this.label.show = v
     }
     else {
@@ -1374,7 +1418,7 @@ class RadarScan extends Base {
   }
 
   async remove() {
-    this.label.remove()
+    this.label && this.label.remove()
     this.entity && this.sdk.viewer.entities.remove(this.entity)
     this.entity2 && this.sdk.viewer.entities.remove(this.entity2)
     this.entity = null

src/Obj/Base/RadarScanStereoscopic/index.js

@@ -23,16 +23,46 @@ class RadarScanStereoscopic extends Base {
    * @param sdk 
    * @param options {object} 属性
    * @param options.id {string} 标注id
-   * @param [options.show=true] {boolean} 显示/隐藏
+   * @param options.show=true {boolean} 显示/隐藏
    * @param options.lng {number} 经度
    * @param options.lat {number} 纬度
    * @param options.alt {number} 高度
-   * @param options.colorOut=#ff0000 {string} 范围颜色
-   * @param options.colorIn=#ff0000 {string} 扫描颜色
+   * @param options.colorOut=rgba(255,255,0,0.3){string} 范围颜色
+   * @param options.colorIn=rgba(255,0,0,0.3){string} 扫描颜色
    * @param options.radius=10 {number} 半径
    * @param options.duration=2000 {number} 持续时间
-   * @param _Dialog {object} 弹框事件
-   * @param _Dialog.confirmCallBack {function} 弹框确认时的回调
+   * @param options.label {object} 标签对象
+   * @param options.label.show {string} 标签显隐
+   * @param options.label.position {string} 标签位置
+   * @param options.label.position {object} 标签位置
+   * @param options.label.position.lng {number} 经度
+   * @param options.label.position.lat {number} 纬度
+   * @param options.label.position.alt {number} 高度
+   * @param options.label.fontSize=20 {number} 字体大小
+   * @param options.label.fontFamily=0 {number} 字体项 0：黑体；1：思源黑体；2：庞门正道标题体；3：数黑体
+   * @param options.label.color=#ffffff {string} 字体颜色
+   * @param options.label.lineWidth=4 {number} 引线宽
+   * @param options.label.lineColor=#00ffff80 {string} 引线颜色
+   * @param options.label.pixelOffset=20 {number} 字体偏移(引线长度)
+   * @param options.label.backgroundColor=['#00ffff80', '#00ffff80'] {array} 背景颜色
+   * @param options.label.scaleByDistance {boolean} 距离缩放
+   * @param options.label.near=2000 {number} 视野缩放最近距离
+   * @param options.label.far=100000 {number} 视野缩放最远距离
+   * @param options.attribute {object} 属性内容
+   * @param {object} options.attribute.link={} 链接
+   * @param options.attribute.link.content=[]] {array} 链接内容
+   * @param options.attribute.link.content[].name {string} 链接名称
+   * @param options.attribute.link.content[].url {string} 链接地址
+   * @param options.richTextContent {string} 富文本内容
+   * @param options.customView {object} 默认视角
+   * @param options.customView.orientation {object} 默认视角方位
+   * @param options.customView.orientation.heading {number} 航向角
+   * @param options.customView.orientation.pitch {number} 俯仰角
+   * @param options.customView.orientation.roll {number} 翻滚角
+   * @param options.customView.relativePosition {object} 视角相对位置
+   * @param options.customView.relativePosition.lng {number} 经度
+   * @param options.customView.relativePosition.lat {number} 纬度
+   * @param options.customView.relativePosition.alt {number} 高度
    */
   constructor(sdk, options, _Dialog = {}) {
     super(sdk, options);
@@ -424,7 +454,7 @@ class RadarScanStereoscopic extends Base {
   }
   set labelShow(v) {
     this.options.label.show = v
-    if (this.show) {
+    if (this.show && !this.showView || this.showView == 3) {
       this.label.show = v
     }
     else {

src/Obj/Base/Road/index.js

@@ -5,7 +5,7 @@ class Corridor extends Base {
   // /**
   //  * @constructor
   //  * @description 道路
-  //  * @param sdk 
+  //  * @param sdk
   //  * @param options {object} 属性
   //  * @param options.name{string} 名称
   //  * @param options.image{string | HTMLImageElement | HTMLCanvasElement | HTMLVideoElement} 指定 Image、URL、Canvas 或 Video 的属性
@@ -67,7 +67,7 @@ class Corridor extends Base {
     //     material: new Cesium.ImageMaterialProperty({
     //       image: this.options.image,
     //       repeat: new Cesium.Cartesian2(100, 1.0),
-    //       color: Cesium.Color.TOMATO 
+    //       color: Cesium.Color.TOMATO
     //     })
     //   }
     // });
@@ -217,10 +217,10 @@ class Corridor extends Base {
       let aa = 0
 
       const shader = `
-        uniform sampler2D image; 
+        uniform sampler2D image;
         uniform vec4 color;
         uniform vec2 repeat;
-      
+
         czm_material czm_getMaterial(czm_materialInput materialInput){
         czm_material material=czm_getDefaultMaterial(materialInput);
         mat2 rotationMatrix = mat2(cos(radians(-rotate)), sin(radians(-rotate)), -sin(radians(-rotate)), cos(radians(-rotate)));

src/Obj/Base/RoadObject/_element.js

@@ -0,0 +1,39 @@
+function html() {
+  return `
+    <span class="custom-divider"></span>
+    <div class="div-item">
+        <div class="row">
+            <div class="col">
+                <span class="label">名称</span>
+                <input class="input" maxlength="40" type="text" @model="name">
+            </div>
+            <div class="col road-box">
+                <span class="label" style="flex: 0 0 56px;">道路类型</span>
+                <div class="road-type"></div>
+            </div>
+        </div>
+    </div>
+    <span class="custom-divider"></span>
+    <div class="div-item">
+        <div class="row">
+            <div class="col">
+                <span class="label">车道宽度</span>
+                <div class="input-number input-number-unit-1">
+                    <input class="input" type="number" title="" max="99999" min="1" step="1" @model="carRoadWidth">
+                    <span class="arrow"></span>
+                </div>
+            </div>
+            <div class="col">
+                <span class="label">人行道宽度</span>
+                <div class="input-number input-number-unit-1">
+                    <input class="input" type="number" title="" max="99999" min="1" step="1" @model="sideWidth">
+                    <span class="arrow"></span>
+                </div>
+            </div>
+        </div>
+    </div>
+    <span class="custom-divider"></span>
+    `
+}
+
+export { html }

src/Obj/Base/RoadObject/eventBinding.js

@@ -0,0 +1,92 @@
+class eventBinding {
+  constructor() {
+    this.element = {}
+  }
+  static event = {}
+
+  getEvent(name) {
+    return eventBinding.event[name]
+  }
+
+  getEventAll() {
+    return eventBinding.event
+  }
+
+  setEvent(name, event) {
+    eventBinding.event[name] = event
+  }
+
+  on(that, elements) {
+    for (let i = 0; i < elements.length; i++) {
+      let Event = []
+      let isEvent = false
+      let removeName = []
+      if (!elements[i] || !elements[i].attributes) {
+        continue;
+      }
+      for (let m of elements[i].attributes) {
+        switch (m.name) {
+          case '@model': {
+            isEvent = true
+            if (elements[i].type == 'checkbox') {
+              Event.push((e) => { that[m.value] = e.target.checked })
+              elements[i].checked = that[m.value]
+            }
+            else {
+              Event.push((e) => {
+                let value = e.target.value
+                if (e.target.type == 'number') {
+                  value = Number(value)
+                }
+                that[m.value] = value
+              })
+              if (elements[i].nodeName == 'IMG') {
+                elements[i].src = that[m.value]
+              }
+              else {
+                elements[i].value = that[m.value]
+              }
+            }
+            if (this.element[m.value]) {
+              this.element[m.value].push(elements[i])
+            }
+            else {
+              this.element[m.value] = [elements[i]]
+            }
+            removeName.push(m.name)
+            break;
+          }
+          case '@click': {
+            elements[i].addEventListener('click', (e) => {
+              if (typeof (that.Dialog[m.value]) === 'function') {
+                that.Dialog[m.value](e)
+              }
+            });
+            removeName.push(m.name)
+            // elements[i].attributes.removeNamedItem(m.name)
+            break;
+          }
+        }
+        // elements[i].attributes[m] = undefined
+      }
+      for (let n = 0; n < removeName.length; n++) {
+        elements[i].attributes.removeNamedItem(removeName[n])
+      }
+
+      if (isEvent) {
+        let ventType = 'input'
+        if (elements[i].tagName != 'INPUT' || elements[i].type == 'checkbox') {
+          ventType = 'change'
+        }
+        elements[i].addEventListener(ventType, (e) => {
+          for (let t = 0; t < Event.length; t++) {
+            Event[t](e)
+          }
+        });
+      }
+    }
+  }
+}
+
+const EventBinding = new eventBinding();
+export default EventBinding;

src/Obj/Base/RoadObject/index-拐角连接.js

@@ -0,0 +1,889 @@
+/**
+ * @description 道路
+ */
+import Dialog from '../../Element/Dialog';
+import { html } from "./_element";
+import EventBinding from '../../Element/Dialog/eventBinding';
+import Base from "../index";
+import { syncData } from '../../../Global/MultiViewportMode'
+import { setSplitDirection, syncSplitData, setActiveId } from '../../../Global/SplitScreen'
+import { setActiveViewer, closeRotateAround, closeViewFollow } from '../../../Global/global'
+
+class Road extends Base {
+  /**
+   * @constructor
+   * @param sdk
+   * @description 道路
+   * @param options {object} 道路属性
+   * @param options.name=未命名对象 {string} 名称
+   * @param options.carRoadWidth=2 {number} 车道宽度
+   * @param options.sideWidth=2 {number} 人行道宽度
+   * @param options.positions=[] {array} 道路positions
+   * @param options.roadImage='' {string} 车道贴图
+   * @param options.sideImage='' {string} 人行道贴图
+   * @param Dialog {object} 弹框对象
+   * @param Dialog.confirmCallBack {function} 弹框确认时的回调
+   * */
+  constructor(sdk, options = {}, _Dialog = {}) {
+    super(sdk, options);
+    this.viewer = this.sdk.viewer
+    this.options.name = options.name || '道路'
+    this.options.carRoadWidth = options.carRoadWidth || 10
+    this.options.sideWidth = options.sideWidth || 5
+    this.options.positions = options.positions || []
+    this.options.roadImage = options.roadImage || (this.getSourceRootPath() + '/img/roadPhoto.png')
+    this.options.sideImage = options.sideImage || (this.getSourceRootPath() + '/img/sidePhoto.png')
+    this.options.show = (options.show || options.show === false) ? options.show : true
+    this.Dialog = _Dialog
+    this._EventBinding = new EventBinding()
+    this._elms = {};
+    this.positionArea = []
+    this.positions = []
+    this.lineEntity = ''
+
+    this.sdk.addIncetance(this.options.id, this)
+    Road.create(this)
+  }
+
+  // 创建道路
+  static create(that) {
+    let positions = []
+    that.options.positions.forEach(v => {
+      positions.push(new Cesium.Cartesian3.fromDegrees(v.lng, v.lat, v.alt))
+    })
+
+    let area = [[], [], []]
+    area[1] = that.createLineBufferPolygon2(positions, that.options.carRoadWidth / 2)
+    area[0] = that.createLineBufferPolygonSide(area[1][2], -that.options.sideWidth)
+    area[2] = that.createLineBufferPolygonSide(area[1][1], that.options.sideWidth)
+
+    //判断道路边是否相交
+    for (let i = 0; i < area[0].length - 1; i++) {
+
+      let leftItem = area[0][i]
+      let leftItem2 = area[0][i + 1]
+      let rightItem = area[2][i]
+      let rightItem2 = area[2][i + 1]
+      let carItem = area[1][0][i]
+      let carItem2 = area[1][0][i + 1]
+      let leftLine = that.getIntersects(leftItem[1], leftItem[2], leftItem2[1], leftItem2[2])
+      let rightLine = that.getIntersects(rightItem[1], rightItem[2], rightItem2[1], rightItem2[2])
+
+      console.log(leftLine, 'leftLine')
+      if (leftLine) {//左侧相交
+        //获取右侧延长交点
+        let point1 = that.getExtendPoint(rightItem[1], rightItem[2], 1000)
+        let point2 = that.getExtendPoint(rightItem2[2], rightItem2[1], 1000)
+        let rightIntersection = that.getIntersects(rightItem[2], point1, rightItem2[1], point2)
+        //将其他几条边都延长
+        let leftLineNeiPoint = that.getExtendPoint(leftItem[0], leftItem[3], 1000)
+        let carLeftPoint = that.getExtendPoint(carItem[3], carItem[2], 1000)
+        let carRightPoint = that.getExtendPoint(carItem[0], carItem[1], 1000)
+        let rightLineNeiPoint = that.getExtendPoint(rightItem[0], rightItem[3], 1000)
+
+
+
+
+        //跟左侧里相交点
+        let leftLineNei = that.getIntersects(leftLine, rightIntersection, leftItem[0], leftLineNeiPoint)
+        //跟车道左侧相交点
+        let carLeft = that.getIntersects(leftLine, rightIntersection, carItem[3], carLeftPoint)
+        //跟车道右侧相交点
+        let carRight = that.getIntersects(leftLine, rightIntersection, carItem[0], carRightPoint)
+        let rightLineNei = that.getIntersects(leftLine, rightIntersection, rightItem[0], rightLineNeiPoint)
+
+        // let leftLineNei = that.getIntersects(leftLine, rightItem[2], leftItem[0], leftItem[3])
+        // let carLeft = that.getIntersects(leftLine, rightItem[2], carItem[3], carItem[2])
+        // let carRight = that.getIntersects(leftLine, rightItem[2], carItem[0], carItem[1])
+        // let rightLineNei = that.getIntersects(leftLine, rightItem[2], rightItem[0], rightItem[3])
+
+        // let leftLineNei = that.getIntersects(leftLine, intersection, leftItem[0], leftItem[3])
+        // //跟车道左侧相交点
+        // let carLeft = that.getIntersects(leftLine, intersection, carItem[3], carItem[2])
+        // //跟车道右侧相交点
+        // let carRight = that.getIntersects(leftLine, intersection, carItem[0], carItem[1])
+        // let rightLineNei = that.getIntersects(leftLine, intersection, rightItem[0], rightItem[3])
+
+        leftItem[2] = leftLine
+        leftItem[3] = leftLineNei
+        carItem[2] = carLeft
+        carItem[1] = carRight
+        rightItem[3] = rightLineNei
+        rightItem[2] = rightIntersection
+        console.log(leftItem, carItem, rightItem, 'leftItemleft')
+
+
+        //将其他几条边都延长
+        let leftLineNeiPoint2 = that.getExtendPoint(leftItem2[3], leftItem2[0], 1000)
+        let carLeftPoint2 = that.getExtendPoint(carItem2[2], carItem2[3], 1000)
+        let carRightPoint2 = that.getExtendPoint(carItem2[1], carItem2[0], 1000)
+        let rightLineNeiPoint2 = that.getExtendPoint(rightItem2[3], rightItem2[0], 1000)
+
+        // let leftLineNei2 = that.getIntersects(leftLine, rightItem2[1], leftItem2[0], leftItem2[3])
+        // let carLeft2 = that.getIntersects(leftLine, rightItem2[1], carItem2[3], carItem2[2])
+        // let carRight2 = that.getIntersects(leftLine, rightItem2[1], carItem2[0], carItem2[1])
+        // let rightLineNei2 = that.getIntersects(leftLine, rightItem2[1], rightItem2[0], rightItem2[3])
+
+
+
+        let leftLineNei2 = that.getIntersects(leftLine, rightIntersection, leftItem2[3], leftLineNeiPoint2)
+        let carLeft2 = that.getIntersects(leftLine, rightIntersection, carItem2[2], carLeftPoint2)
+        let carRight2 = that.getIntersects(leftLine, rightIntersection, carItem2[1], carRightPoint2)
+        let rightLineNei2 = that.getIntersects(leftLine, rightIntersection, rightItem2[3], rightLineNeiPoint2)
+
+        // let arr = [leftLine, rightIntersection, leftItem2[3], leftLineNeiPoint2]
+        // arr.forEach((item, index) => {
+        //   that.sdk.viewer.entities.add({
+        //     name: 'node-secondary-edit-point',
+        //     index: i,
+        //     position: item,
+        //     billboard: {
+        //       image: that.getSourceRootPath() + '/img/point.png',
+        //       width: 15,
+        //       height: 15,
+        //       disableDepthTestDistance: Number.POSITIVE_INFINITY,
+        //       color: Cesium.Color.WHITE.withAlpha(0.99)
+        //     },
+        //     label: {
+        //       text: '' + index,
+        //       pixelOffset: { x: 0, y: -20 },
+        //     },
+        //   })
+        // })
+
+        // let leftLineNei2 = that.getIntersects(leftLine, intersection, leftItem2[0], leftItem2[3])
+        // //跟车道左侧相交点
+        // let carLeft2 = that.getIntersects(leftLine, intersection, carItem2[3], carItem2[2])
+        // //跟车道右侧相交点
+        // let carRight2 = that.getIntersects(leftLine, intersection, carItem2[0], carItem2[1])
+        // let rightLineNei2 = that.getIntersects(leftLine, intersection, rightItem2[0], rightItem2[3])
+
+        leftItem2[1] = leftLine
+        leftItem2[0] = leftLineNei2
+        carItem2[3] = carLeft2
+        carItem2[0] = carRight2
+        rightItem2[0] = rightLineNei2
+        rightItem2[1] = rightIntersection
+        console.log(leftItem2, carItem2, rightItem2, 'leftItem2left')
+
+      } else if (rightLine) {//右侧相交
+
+        //获取左侧延长交点
+        let point1 = that.getExtendPoint(leftItem[1], leftItem[2], 1000)
+        let point2 = that.getExtendPoint(leftItem2[2], leftItem2[1], 1000)
+        let rightIntersection = that.getIntersects(leftItem[2], point1, leftItem2[1], point2)
+        //将其他几条边都延长
+        let leftLineNeiPoint = that.getExtendPoint(leftItem[0], leftItem[3], 1000)
+        let carLeftPoint = that.getExtendPoint(carItem[3], carItem[2], 1000)
+        let carRightPoint = that.getExtendPoint(carItem[0], carItem[1], 1000)
+        let rightLineNeiPoint = that.getExtendPoint(rightItem[0], rightItem[3], 1000)
+
+        // //跟左侧里相交点
+        let leftLineNei = that.getIntersects(rightLine, rightIntersection, leftItem[0], leftLineNeiPoint)
+        //跟车道左侧相交点
+        let carLeft = that.getIntersects(rightLine, rightIntersection, carItem[3], carLeftPoint)
+        //跟车道右侧相交点
+        let carRight = that.getIntersects(rightLine, rightIntersection, carItem[0], carRightPoint)
+        let rightLineNei = that.getIntersects(rightLine, rightIntersection, rightItem[0], rightLineNeiPoint)
+        // //跟左侧里相交点
+        // let leftLineNei = that.getIntersects(rightLine, leftItem[2], leftItem[0], leftItem[3])
+        // //跟车道左侧相交点
+        // let carLeft = that.getIntersects(rightLine, leftItem[2], carItem[3], carItem[2])
+        // //跟车道右侧相交点
+        // let carRight = that.getIntersects(rightLine, leftItem[2], carItem[0], carItem[1])
+        // let rightLineNei = that.getIntersects(rightLine, leftItem[2], rightItem[0], rightItem[3])
+
+
+        leftItem[2] = rightIntersection
+        leftItem[3] = leftLineNei
+        carItem[2] = carLeft
+        carItem[1] = carRight
+        rightItem[3] = rightLineNei
+        rightItem[2] = rightLine
+        console.log(leftItem, carItem, rightItem, 'leftItemright')
+
+        //将其他几条边都延长
+        let leftLineNeiPoint2 = that.getExtendPoint(leftItem2[3], leftItem2[0], 1000)
+        let carLeftPoint2 = that.getExtendPoint(carItem2[2], carItem2[3], 1000)
+        let carRightPoint2 = that.getExtendPoint(carItem2[1], carItem2[0], 1000)
+        let rightLineNeiPoint2 = that.getExtendPoint(rightItem2[3], rightItem2[0], 1000)
+
+        let leftLineNei2 = that.getIntersects(rightLine, rightIntersection, leftItem2[3], leftLineNeiPoint2)
+        //跟车道左侧相交点
+        let carLeft2 = that.getIntersects(rightLine, rightIntersection, carItem2[2], carLeftPoint2)
+        //跟车道右侧相交点
+        let carRight2 = that.getIntersects(rightLine, rightIntersection, carItem2[1], carRightPoint2)
+        let rightLineNei2 = that.getIntersects(rightLine, rightIntersection, rightItem2[3], rightLineNeiPoint2)
+        // let leftLineNei2 = that.getIntersects(rightLine, leftItem2[1], leftItem2[0], leftItem2[3])
+        // //跟车道左侧相交点
+        // let carLeft2 = that.getIntersects(rightLine, leftItem2[1], carItem2[3], carItem2[2])
+        // //跟车道右侧相交点
+        // let carRight2 = that.getIntersects(rightLine, leftItem2[1], carItem2[0], carItem2[1])
+        // let rightLineNei2 = that.getIntersects(rightLine, leftItem2[1], rightItem2[0], rightItem2[3])
+
+        leftItem2[1] = rightIntersection
+        leftItem2[0] = leftLineNei2
+        carItem2[3] = carLeft2
+        carItem2[0] = carRight2
+        rightItem2[0] = rightLineNei2
+        rightItem2[1] = rightLine
+        console.log(leftItem2, carItem2, rightItem2, 'leftItem2right')
+
+      }
+    }
+
+
+    console.log(area[0], 'area')
+
+    if (that.viewer.entities.getById(that.options.id)) {
+      that.viewer.entities.getById(that.options.id)._children.forEach((item) => {
+        that.viewer.entities.remove(item);
+      });
+      that.viewer.entities.remove(that.viewer.entities.getById(that.options.id))
+    }
+    that.lineEntity = that.viewer.entities.add(new Cesium.Entity({ id: that.options.id, show: that.options.show }))
+
+    const myImg = new Image()
+    myImg.src = that.options.roadImage
+    myImg.onload = function () {
+      console.log(area[1][0], 'arr')
+      area[1][0].forEach((item, index) => {
+        that.viewer.entities.add({
+          // id: that.options.id,
+          parent: that.lineEntity,
+          polygon: {
+            hierarchy: new Cesium.PolygonHierarchy(item),
+            material: new Cesium.ImageMaterialProperty({
+              image: that.options.roadImage,
+              transparent: true,// 如果图片有透明部分，需要设置为 true
+              repeat: that.calculateTextureRepeat(item, myImg)
+            }),
+            stRotation: that.calculateRoadAngle(positions[index], positions[index + 1])
+          }
+        });
+      })
+    }
+
+    const myImg2 = new Image()
+    myImg2.src = that.options.sideImage
+    myImg2.onload = function () {
+      area[0].forEach((item, index) => {
+        that.viewer.entities.add({
+          parent: that.lineEntity,
+          polygon: {
+            hierarchy: new Cesium.PolygonHierarchy(item),
+            material: new Cesium.ImageMaterialProperty({
+              image: that.options.sideImage,
+              transparent: true,// 如果图片有透明部分，需要设置为 true
+              repeat: that.calculateTextureRepeat(item, myImg2)
+            }),
+            stRotation: that.calculateRoadAngle(positions[index], positions[index + 1])
+          }
+        });
+      })
+
+      area[2].forEach((item, index) => {
+        that.viewer.entities.add({
+          polygon: {
+            hierarchy: new Cesium.PolygonHierarchy(item),
+            material: new Cesium.ImageMaterialProperty({
+              image: that.options.sideImage,
+              transparent: true,// 如果图片有透明部分，需要设置为 true
+              repeat: that.calculateTextureRepeat(item, myImg2)
+            }),
+            stRotation: that.calculateRoadAngle(positions[index], positions[index + 1])
+          }
+        });
+      })
+
+    }
+
+  }
+  getExtendPoint(position1, position2, distance) {
+    // let position1 = Cesium.Cartesian3.fromDegrees(p1[0], p1[1], 0);
+    // let position2 = Cesium.Cartesian3.fromDegrees(p2[0], p2[1], 0);
+    let pot = Cesium.Cartesian3.subtract(position2, position1, new Cesium.Cartesian3());//方向
+    var dir = Cesium.Cartesian3.normalize(pot, new Cesium.Cartesian3());//向量归一化
+
+    var ray = new Cesium.Ray(position1, dir);
+    let np = Cesium.Ray.getPoint(ray, distance * 10);//计算延长点
+    return np
+  }
+  getArr(arr1, arr2) {
+    arr2 = arr2.reverse()
+    let polygon = []
+    for (let index = 0; index < arr1.length - 1; index++) {
+      polygon.push([arr1[index], arr1[index + 1], arr2[index + 1], arr2[index]])
+    }
+    return polygon
+  }
+
+  calculateRoadAngle(startPoint, endPoint) {
+    // 1. 获取地表法向量
+    const normal = Cesium.Ellipsoid.WGS84.geodeticSurfaceNormal(startPoint);
+
+    // 2. 构建精确ENU坐标系
+    const enuMatrix = Cesium.Transforms.eastNorthUpToFixedFrame(startPoint, undefined, normal);
+    const inverseMatrix = Cesium.Matrix4.inverse(enuMatrix, new Cesium.Matrix4());
+
+    // 3. 转换终点并计算水平向量
+    const localEnd = Cesium.Matrix4.multiplyByPoint(inverseMatrix, endPoint, new Cesium.Cartesian3());
+    const horizontalVec = new Cesium.Cartesian2(localEnd.x, localEnd.y);
+    Cesium.Cartesian2.normalize(horizontalVec, horizontalVec);
+
+    const north = new Cesium.Cartesian2(1, 0);
+
+    const angle = Cesium.Cartesian2.angleBetween(north, horizontalVec);
+    const cross = Cesium.Cartesian2.cross(north, horizontalVec, new Cesium.Cartesian2());
+    return cross < 0 ? angle : -angle;
+  }
+
+  calculatePolygonOrientation(positions) {
+
+    // 假设 position 是 Cesium.Cartesian3 对象，表示地球上的某个点
+    var position = positions[0]
+    // 获取东、北、上坐标系
+    var eastNorthUp = Cesium.Transforms.eastNorthUpToFixedFrame(position);
+    // northAxis 是北方向向量
+    var northAxis = eastNorthUp.getColumn(1, new Cesium.Cartesian3());
+    Cesium.Cartesian3.normalize(northAxis, northAxis);
+
+    const direction = Cesium.Cartesian3.subtract(positions[0], positions[1], new Cesium.Cartesian3());
+    Cesium.Cartesian3.normalize(direction, direction);
+
+
+    const dot = Cesium.Cartesian3.dot(northAxis, direction);
+    const magA = Cesium.Cartesian3.magnitude(northAxis);
+    const magB = Cesium.Cartesian3.magnitude(direction);
+    return Math.acos(dot / (magA * magB));
+  }
+  calculateTextureRepeat(polygonPositions, textureSize, meterPerPixel = 0.01) {
+    // 验证纹理尺寸
+    if (!textureSize.width || !textureSize.height) {
+      throw new Error('Texture size must contain width and height in pixels');
+    }
+
+    // 创建多边形几何体
+    const geometry = Cesium.PolygonGeometry.createGeometry(
+      new Cesium.PolygonGeometry({
+        polygonHierarchy: new Cesium.PolygonHierarchy(polygonPositions),
+        vertexFormat: Cesium.VertexFormat.POSITION_ONLY
+      })
+    );
+
+    // 计算多边形面积(平方米)
+    let area = 0;
+    const indices = geometry.indices;
+    const positions = geometry.attributes.position.values;
+    for (let i = 0; i < indices.length; i += 3) {
+      const i0 = indices[i] * 3;
+      const i1 = indices[i + 1] * 3;
+      const i2 = indices[i + 2] * 3;
+
+      const p0 = new Cesium.Cartesian3(positions[i0], positions[i0 + 1], positions[i0 + 2]);
+      const p1 = new Cesium.Cartesian3(positions[i1], positions[i1 + 1], positions[i1 + 2]);
+      const p2 = new Cesium.Cartesian3(positions[i2], positions[i2 + 1], positions[i2 + 2]);
+
+      const cross = Cesium.Cartesian3.cross(
+        Cesium.Cartesian3.subtract(p1, p0, new Cesium.Cartesian3()),
+        Cesium.Cartesian3.subtract(p2, p0, new Cesium.Cartesian3()),
+        new Cesium.Cartesian3()
+      );
+      area += Cesium.Cartesian3.magnitude(cross) * 0.5;
+    }
+
+    // 将像素尺寸转换为实际尺寸（平方米）
+    const textureWidthMeters = textureSize.width * meterPerPixel;
+    const textureHeightMeters = textureSize.height * meterPerPixel;
+    const textureArea = textureWidthMeters * textureHeightMeters;
+
+    // 计算各轴向重复次数
+    const repeatX = Math.sqrt(area) / textureWidthMeters;
+    const repeatY = Math.sqrt(area) / textureHeightMeters;
+
+    return new Cesium.Cartesian2(Math.max(1, Math.ceil(repeatX)), 1.0);
+  }
+  swapLastElements(arr1, arr2) {
+    const last = arr1[arr1.length - 1]
+    const first = arr2[0]
+    arr1[arr1.length - 1] = first
+    arr2[0] = last
+
+    return [arr1, arr2];
+  }
+  createLineBufferPolygonSide(positions, width) {
+    let area = []
+    for (let i = 0; i < positions.length; i++) {
+      const posi = positions[i];
+
+      const dir = Cesium.Cartesian3.subtract(posi[1], posi[0], new Cesium.Cartesian3());
+      Cesium.Cartesian3.normalize(dir, dir);
+
+      // 获取垂直向量（基于Z轴）
+      const perp = Cesium.Cartesian3.cross(dir, Cesium.Cartesian3.UNIT_Z, new Cesium.Cartesian3());
+      Cesium.Cartesian3.normalize(perp, perp);
+
+      // 生成偏移向量
+      const offset = Cesium.Cartesian3.multiplyByScalar(perp, width, new Cesium.Cartesian3());
+      let point1 = Cesium.Cartesian3.add(posi[0], offset, new Cesium.Cartesian3())
+      let point3 = Cesium.Cartesian3.add(posi[1], offset, new Cesium.Cartesian3())
+
+      // i == positions.length - 2 ? area.push(start, point1, end, point3) : area.push(start, point1)
+      area.push([posi[0], point1, point3, posi[1]])
+    }
+    // let arr = []
+    // for (let i = 0; i < area.length - 2; i += 2) {
+    //   arr.push([area[i], area[i + 1], area[i + 3], area[i + 2]])
+    // }
+    return area
+  }
+  createLineBufferPolygon2(positions, width) {
+    let area = []
+    let leftPositions = [];
+    let rightPositions = [];
+
+    for (let i = 0; i < positions.length - 1; i++) {
+      const start = positions[i];
+      // const end = positions[i + 1] || positions[i - 1];
+      const end = positions[i + 1];
+
+      const dir = Cesium.Cartesian3.subtract(end, start, new Cesium.Cartesian3());
+      Cesium.Cartesian3.normalize(dir, dir);
+
+      // 获取垂直向量（基于Z轴）
+      const perp = Cesium.Cartesian3.cross(dir, Cesium.Cartesian3.UNIT_Z, new Cesium.Cartesian3());
+      Cesium.Cartesian3.normalize(perp, perp);
+
+      const dir2 = Cesium.Cartesian3.subtract(start, end, new Cesium.Cartesian3());
+      Cesium.Cartesian3.normalize(dir2, dir2);
+
+      // 获取垂直向量（基于Z轴）
+      const perp2 = Cesium.Cartesian3.cross(dir2, Cesium.Cartesian3.UNIT_Z, new Cesium.Cartesian3());
+      Cesium.Cartesian3.normalize(perp2, perp2);
+
+
+
+
+      // 生成偏移向量
+      const offset = Cesium.Cartesian3.multiplyByScalar(perp, width, new Cesium.Cartesian3());
+      const offset2 = Cesium.Cartesian3.multiplyByScalar(perp, -width, new Cesium.Cartesian3());
+
+      const offsetEnd = Cesium.Cartesian3.multiplyByScalar(perp2, -width, new Cesium.Cartesian3());
+      const offsetEnd2 = Cesium.Cartesian3.multiplyByScalar(perp2, width, new Cesium.Cartesian3());
+
+      let point1 = Cesium.Cartesian3.add(start, offset, new Cesium.Cartesian3())
+      let point2 = Cesium.Cartesian3.add(start, offset2, new Cesium.Cartesian3())
+      let point3 = Cesium.Cartesian3.add(end, offsetEnd, new Cesium.Cartesian3())
+      let point4 = Cesium.Cartesian3.add(end, offsetEnd2, new Cesium.Cartesian3())
+
+      area.push([point1, point3, point4, point2])
+
+      rightPositions.push([point1, point3])
+      leftPositions.push([point2, point4])
+
+      // if (i == positions.length - 2) {
+      //   area.push(point1, point2, point3, point4)
+      //   rightPositions.push(point1)
+      //   leftPositions.push(point2)
+      //   leftPositions.push(point4)
+      //   rightPositions.push(point3)
+      // } else {
+      //   area.push(point1, point2)
+      //   rightPositions.push(point1)
+      //   leftPositions.push(point2)
+      // }
+    }
+    // let arr = []
+    // for (let i = 0; i < area.length - 2; i += 2) {
+    //   arr.push([area[i], area[i + 1], area[i + 3], area[i + 2]])
+    // }
+    console.log(area, rightPositions, 'rightPositions')
+    let that = this
+    // return [arr, rightPositions, leftPositions]
+    return [area, rightPositions, leftPositions]
+  }
+  getIntersects(point1, point2, point3, point4) {
+    let carPoint1 = this.getLonLat(point1)
+    let carPoint2 = this.getLonLat(point2)
+    let carPoint3 = this.getLonLat(point3)
+    let carPoint4 = this.getLonLat(point4)
+    var line1 = turf.lineString([
+      [carPoint1.lon, carPoint1.lat],
+      [carPoint2.lon, carPoint2.lat]
+    ]);
+    var line2 = turf.lineString([
+      [carPoint3.lon, carPoint3.lat],
+      [carPoint4.lon, carPoint4.lat]
+    ]);
+    var intersects = turf.lineIntersect(line1, line2);
+    if (intersects.features.length > 0) {
+      console.log(intersects.features, 'ooooo')
+      return Cesium.Cartesian3.fromDegrees(intersects.features[0].geometry.coordinates[0], intersects.features[0].geometry.coordinates[1])
+    }
+  }
+  getLonLat(point) {
+    let pointDe = Cesium.Cartographic.fromCartesian(point)
+    const longitude = Cesium.Math.toDegrees(pointDe.longitude);
+    const latitude = Cesium.Math.toDegrees(pointDe.latitude);
+    return { lon: longitude, lat: latitude }
+
+  }
+  createLineBufferPolygon(viewer, positions, width) {
+    // 计算每个线段的左右偏移点
+    const leftPositions = [];
+    const rightPositions = [];
+
+    for (let i = 0; i < positions.length; i++) {
+      const start = positions[i];
+      const end = positions[i + 1] || positions[i - 1];
+
+      // 计算线段方向向量
+      const direction = Cesium.Cartesian3.subtract(end, start, new Cesium.Cartesian3());
+      // const direction = Cesium.Cartesian3.subtract(start, end, new Cesium.Cartesian3());
+      Cesium.Cartesian3.normalize(direction, direction);
+
+      // 计算垂直向量（使用上向量叉积）
+      const up = Cesium.Cartesian3.UNIT_Z;
+      const perpendicular = Cesium.Cartesian3.cross(direction, up, new Cesium.Cartesian3());
+      Cesium.Cartesian3.normalize(perpendicular, perpendicular);
+
+      // 计算左右偏移点
+      const leftOffset = Cesium.Cartesian3.multiplyByScalar(
+        perpendicular,
+        width,
+        new Cesium.Cartesian3()
+      );
+
+      if (width > 0) {
+        rightPositions.unshift(Cesium.Cartesian3.add(start, leftOffset, new Cesium.Cartesian3()));
+      } else if (width < 0) {
+        rightPositions.push(Cesium.Cartesian3.add(start, leftOffset, new Cesium.Cartesian3()));
+      }
+
+    }
+    return rightPositions
+  }
+  //计算角度
+  calculateAangle(arr) {
+    // let fromDegreesArray = that.calSector(that.options.center, that.options.radius, that.options.startAngle, that.options.endAngle, 360, true)
+
+    function getAangle(start, end) {
+      let rad = Math.PI / 180,
+        lat1 = start.y * rad,
+        lat2 = end.y * rad,
+        lon1 = start.x * rad,
+        lon2 = end.x * rad;
+      const a = Math.sin(lon2 - lon1) * Math.cos(lat2);
+      const b =
+        Math.cos(lat1) * Math.sin(lat2) -
+        Math.sin(lat1) * Math.cos(lat2) * Math.cos(lon2 - lon1);
+      const radians = Math.atan2(a, b)
+      const degrees = radians % (2 * Math.PI);
+      let bearing = 450 - ((degrees * 180) / Math.PI < 0
+        ? 360 + (degrees * 180) / Math.PI
+        : (degrees * 180) / Math.PI) - 90;
+      return 360 - (bearing % 360)
+    }
+
+    let center = arr[0]
+    let pos84_1 = arr[1]
+    let pos84_2 = arr[2]
+
+    let start = { x: center.lng, y: center.lat }
+    let end1 = { x: pos84_1.lng, y: pos84_1.lat }
+    let end2 = { x: pos84_2.lng, y: pos84_2.lat }
+
+    let angle1 = getAangle(start, end1)
+    let angle2 = getAangle(start, end2)
+
+    return {
+      angle1,
+      angle2
+    }
+  }
+
+  get carRoadWidth() {
+    return this.options.carRoadWidth
+  }
+
+  set carRoadWidth(v) {
+    this.options.carRoadWidth = v
+    Road.create(this)
+
+  }
+  get sideWidth() {
+    return this.options.sideWidth
+  }
+  set sideWidth(v) {
+    this.options.sideWidth = v
+    Road.create(this)
+  }
+  /**
+   * @description 编辑框
+   * @param state=false {boolean} 状态: true打开, false关闭
+   */
+  async edit(state = false) {
+    let _this = this
+    this.originalOptions = this.deepCopyObj(this.options)
+
+    if (this._DialogObject && this._DialogObject.close) {
+      this._DialogObject.close()
+      this._DialogObject = null
+    }
+
+    if (state) {
+      this._DialogObject = await new Dialog(this.sdk, this.originalOptions, {
+        title: '道路属性', left: '180px', top: '100px',
+        confirmCallBack: (options) => {
+          this.name = this.name.trim()
+          if (!this.name) {
+            this.name = '道路'
+          }
+          this.originalOptions = this.deepCopyObj(this.options)
+          this._DialogObject.close()
+          this.Dialog.confirmCallBack && this.Dialog.confirmCallBack(this.originalOptions)
+          syncData(this.sdk, this.options.id)
+          syncSplitData(this.sdk, this.options.id)
+        },
+        resetCallBack: () => {
+          this.reset()
+          this.Dialog.resetCallBack && this.Dialog.resetCallBack()
+        },
+        closeCallBack: () => {
+          this.reset()
+          this.Dialog.closeCallBack && this.Dialog.closeCallBack()
+        },
+        showCallBack: (show) => {
+          this.show = show
+          this.Dialog.showCallBack && this.Dialog.showCallBack()
+        }
+      }, true)
+      this._DialogObject._element.body.className = this._DialogObject._element.body.className + ' road-surface'
+      let contentElm = document.createElement('div');
+      contentElm.innerHTML = html()
+      this._DialogObject.contentAppChild(contentElm)
+
+
+      // 下拉选项
+      // let heightModeData = [
+      //   {
+      //     name: '海拔高度',
+      //     value: '海拔高度',
+      //     key: '0',
+      //   },
+      //   {
+      //     name: '相对地表',
+      //     value: '相对地表',
+      //     key: '1',
+      //   },
+      //   {
+      //     name: '依附模型',
+      //     value: '依附模型',
+      //     key: '2',
+      //   }
+      // ]
+      // let heightModeObject = legp(
+      //   this._DialogObject._element.content.getElementsByClassName(
+      //     'road-box'
+      //   )[0],
+      //   '.road-type'
+      // )
+      // if (heightModeObject) {
+      //   heightModeObject.legp_search(heightModeData)
+      //   let heightModeDataLegpElm = this._DialogObject._element.content
+      //     .getElementsByClassName('road-type')[0]
+      //     .getElementsByTagName('input')[0]
+      //   for (let i = 0; i < heightModeData.length; i++) {
+      //     if (heightModeData[i].key == this.heightMode) {
+      //       heightModeDataLegpElm.value = heightModeData[i].value
+      //       heightModeObject.legp_searchActive(
+      //         heightModeData[i].value
+      //       )
+      //       break
+      //     }
+      //   }
+      //   heightModeDataLegpElm.addEventListener('input', () => {
+      //     for (let i = 0; i < heightModeData.length; i++) {
+      //       if (heightModeData[i].value === heightModeDataLegpElm.value) {
+      //         this.heightMode = heightModeData[i].key
+      //         break
+      //       }
+      //     }
+      //   })
+
+
+      //   this._elms.height = heightElm
+      //   this._elms.heightBox = heightBoxElm
+      //   this._elms.heightMode = heightModeDataLegpElm
+      //   this._elms.heightConfirm = heightConfirmElm
+      //   this._elms.heightModeObject = heightModeObject
+
+      //   heightConfirmElm.addEventListener('click', () => {
+      //     this.positionEditing = false
+      //     for (let i = 0; i < this.options.positions.length; i++) {
+      //       this.options.positions[i].alt = Number((this.options.positions[i].alt + Number(heightElm.value)).toFixed(2))
+      //       this._elms.alt[i].innerHTML = this.options.positions[i].alt
+      //     }
+      //     let fromDegreesArray = this.renewPositions(this.options.positions)
+      //     this.entity.polyline.positions = Cesium.Cartesian3.fromDegreesArrayHeights(
+      //       fromDegreesArray
+      //     )
+
+      //     this.positionEditing = false
+      //     PolylineObject.closeNodeEdit(this)
+      //   })
+      // }
+
+
+
+
+
+      let all_elm = contentElm.getElementsByTagName("*")
+      this._EventBinding.on(this, all_elm)
+      this._elms = this._EventBinding.element
+    } else {
+      // if (this._element_style) {
+      //   document.getElementsByTagName('head')[0].removeChild(this._element_style)
+      //   this._element_style = null
+      // }
+      // if (this._DialogObject && this._DialogObject.remove) {
+      //   this._DialogObject.remove()
+      //   this._DialogObject = null
+      // }
+    }
+  }
+
+  reset() {
+    if (!this.viewer.entities.getById(this.options.id)) {
+      return
+    }
+    this.name = this.originalOptions.name
+    this.carRoadWidth = this.originalOptions.carRoadWidth
+    this.sideWidth = this.originalOptions.sideWidth
+    this.positions = this.originalOptions.positions
+    this.roadImage = this.originalOptions.roadImage
+    this.sideImage = this.originalOptions.sideImage
+  }
+
+  /**
+   * 飞到对应实体
+   */
+  async flyTo(options = {}) {
+    setActiveViewer(0)
+    closeRotateAround(this.sdk)
+    closeViewFollow(this.sdk)
+
+    if (this.options.customView && this.options.customView.relativePosition && this.options.customView.orientation) {
+      let orientation = {
+        heading: Cesium.Math.toRadians(this.options.customView.orientation.heading || 0.0),
+        pitch: Cesium.Math.toRadians(this.options.customView.orientation.pitch || -60.0),
+        roll: Cesium.Math.toRadians(this.options.customView.orientation.roll || 0.0)
+      }
+
+      let lng = this.options.customView.relativePosition.lng
+      let lat = this.options.customView.relativePosition.lat
+      let alt = this.options.customView.relativePosition.alt
+      let destination = Cesium.Cartesian3.fromDegrees(lng, lat, alt)
+
+      let position = { lng: 0, lat: 0 }
+      if (this.options.position) {
+        position = { ...this.options.position }
+      }
+      else if (this.options.positions) {
+        position = { ...this.options.positions[0] }
+      }
+      else if (this.options.center) {
+        position = { ...this.options.center }
+      }
+      else if (this.options.start) {
+        position = { ...this.options.start }
+      }
+      else {
+        if (this.options.hasOwnProperty('lng')) {
+          position.lng = this.options.lng
+        }
+        if (this.options.hasOwnProperty('lat')) {
+          position.lat = this.options.lat
+        }
+        if (this.options.hasOwnProperty('alt')) {
+          position.alt = this.options.alt
+        }
+      }
+      // 如果没有高度值，则获取紧贴高度计算
+      // if (!position.hasOwnProperty('alt')) {
+      //   position.alt = await this.getClampToHeight(position)
+      // }
+      lng = this.options.customView.relativePosition.lng + position.lng
+      lat = this.options.customView.relativePosition.lat + position.lat
+      alt = this.options.customView.relativePosition.alt + position.alt
+      destination = Cesium.Cartesian3.fromDegrees(lng, lat, alt)
+      this.sdk.viewer.camera.flyTo({
+        destination: destination,
+        orientation: orientation
+      })
+    }
+    else {
+      let positionArray = []
+      for (let i = 0; i < this.positions.length; i++) {
+        let a = Cesium.Cartesian3.fromDegrees(
+          this.positions[i][0],
+          this.positions[i][1],
+          this.options.height + this.options.heightDifference / 2
+        )
+        positionArray.push(a.x, a.y, a.z)
+      }
+      let BoundingSphere = Cesium.BoundingSphere.fromVertices(positionArray)
+      this.viewer.camera.flyToBoundingSphere(BoundingSphere, {
+        offset: {
+          heading: Cesium.Math.toRadians(0.0),
+          pitch: Cesium.Math.toRadians(-20.0),
+          roll: Cesium.Math.toRadians(0.0)
+        }
+      })
+
+    }
+  }
+
+  getSphere() {
+    return new Promise((resolve) => {
+      // entity没有加载完成时 state 不会等于0 所以设置定时器直到获取到为止
+      const interval = setInterval(() => {
+        const sphere = new Cesium.BoundingSphere()
+        const state = this.sdk.viewer._dataSourceDisplay.getBoundingSphere(
+          this.viewer.entities.getById(this.options.id),
+          false,
+          sphere
+        )
+        if (state === Cesium.BoundingSphereState.DONE) {
+          clearInterval(interval)
+        }
+      }, 1000)
+    })
+  }
+
+  /**
+   * 删除
+   */
+  async remove() {
+    this.positions = []
+    this.lineEntity = null
+
+    if (this.viewer.entities.getById(this.options.id)) {
+      this.viewer.entities.getById(this.options.id)._children.forEach((item) => {
+        this.viewer.entities.remove(item);
+      });
+      this.viewer.entities.remove(this.viewer.entities.getById(this.options.id))
+    }
+
+    if (this._DialogObject && !this._DialogObject.isDestroy) {
+      this._DialogObject.close()
+      this._DialogObject = null
+    }
+    await this.sdk.removeIncetance(this.options.id)
+    await syncData(this.sdk, this.options.id)
+  }
+
+  flicker() { }
+}
+
+export default Road

src/Obj/Base/RoadObject/index-直接连接.js

@@ -0,0 +1,615 @@
+/**
+ * @description 道路
+ */
+import Dialog from '../../Element/Dialog';
+import { html } from "./_element";
+import EventBinding from '../../Element/Dialog/eventBinding';
+import Base from "../index";
+import { syncData } from '../../../Global/MultiViewportMode'
+import { setSplitDirection, syncSplitData, setActiveId } from '../../../Global/SplitScreen'
+import { setActiveViewer, closeRotateAround, closeViewFollow } from '../../../Global/global'
+
+class Road extends Base {
+  /**
+   * @constructor
+   * @param sdk
+   * @description 道路
+   * @param options {object} 道路属性
+   * @param options.name=未命名对象 {string} 名称
+   * @param options.carRoadWidth=2 {number} 车道宽度
+   * @param options.sideWidth=2 {number} 人行道宽度
+   * @param options.positions=[] {array} 道路positions
+   * @param options.roadImage='' {string} 车道贴图
+   * @param options.sideImage='' {string} 人行道贴图
+   * @param Dialog {object} 弹框对象
+   * @param Dialog.confirmCallBack {function} 弹框确认时的回调
+   * */
+  constructor(sdk, options = {}, _Dialog = {}) {
+    super(sdk, options);
+    this.viewer = this.sdk.viewer
+    this.options.name = options.name || '道路'
+    this.options.carRoadWidth = options.carRoadWidth || 10
+    this.options.sideWidth = options.sideWidth || 5
+    this.options.positions = options.positions || []
+    this.options.roadImage = options.roadImage || (this.getSourceRootPath() + '/img/roadPhoto.png')
+    this.options.sideImage = options.sideImage || (this.getSourceRootPath() + '/img/sidePhoto.png')
+    this.options.show = (options.show || options.show === false) ? options.show : true
+    this.Dialog = _Dialog
+    this._EventBinding = new EventBinding()
+    this._elms = {};
+    this.positionArea = []
+    this.positions = []
+    this.lineEntity = ''
+
+    this.sdk.addIncetance(this.options.id, this)
+    Road.create(this)
+  }
+
+  // 创建道路
+  static create(that) {
+    let positions = []
+    that.options.positions.forEach(v => {
+      positions.push(new Cesium.Cartesian3.fromDegrees(v.lng, v.lat, v.alt))
+    })
+
+    let area = [[], [], []]
+    area[1] = that.createLineBufferPolygon2(positions, that.options.carRoadWidth / 2)
+    area[0] = that.createLineBufferPolygonSide(area[1][2], -that.options.sideWidth)
+    area[2] = that.createLineBufferPolygonSide(area[1][1], that.options.sideWidth)
+
+    if (that.viewer.entities.getById(that.options.id)) {
+      that.viewer.entities.getById(that.options.id)._children.forEach((item) => {
+        that.viewer.entities.remove(item);
+      });
+      that.viewer.entities.remove(that.viewer.entities.getById(that.options.id))
+    }
+    that.lineEntity = that.viewer.entities.add(new Cesium.Entity({ id: that.options.id, show: that.options.show }))
+
+    const myImg = new Image()
+    myImg.src = that.options.roadImage
+    myImg.onload = function () {
+      area[1][0].forEach((item, index) => {
+        that.viewer.entities.add({
+          // id: that.options.id,
+          parent: that.lineEntity,
+          polygon: {
+            hierarchy: new Cesium.PolygonHierarchy(item),
+            material: new Cesium.ImageMaterialProperty({
+              image: that.options.roadImage,
+              transparent: true,// 如果图片有透明部分，需要设置为 true
+              repeat: that.calculateTextureRepeat(item, myImg)
+            }),
+            stRotation: that.calculateRoadAngle(positions[index], positions[index + 1])
+          }
+        });
+      })
+    }
+
+    const myImg2 = new Image()
+    myImg2.src = that.options.sideImage
+    myImg2.onload = function () {
+      area[0].forEach((item, index) => {
+        that.viewer.entities.add({
+          parent: that.lineEntity,
+          polygon: {
+            hierarchy: new Cesium.PolygonHierarchy(item),
+            material: new Cesium.ImageMaterialProperty({
+              image: that.options.sideImage,
+              transparent: true,// 如果图片有透明部分，需要设置为 true
+              repeat: that.calculateTextureRepeat(item, myImg2)
+            }),
+            stRotation: that.calculateRoadAngle(positions[index], positions[index + 1])
+          }
+        });
+      })
+
+      area[2].forEach((item, index) => {
+        that.viewer.entities.add({
+          polygon: {
+            hierarchy: new Cesium.PolygonHierarchy(item),
+            material: new Cesium.ImageMaterialProperty({
+              image: that.options.sideImage,
+              transparent: true,// 如果图片有透明部分，需要设置为 true
+              repeat: that.calculateTextureRepeat(item, myImg2)
+            }),
+            stRotation: that.calculateRoadAngle(positions[index], positions[index + 1])
+          }
+        });
+      })
+
+    }
+
+  }
+  getArr(arr1, arr2) {
+    arr2 = arr2.reverse()
+    let polygon = []
+    for (let index = 0; index < arr1.length - 1; index++) {
+      polygon.push([arr1[index], arr1[index + 1], arr2[index + 1], arr2[index]])
+    }
+    return polygon
+  }
+
+  calculateRoadAngle(startPoint, endPoint) {
+    // 1. 获取地表法向量
+    const normal = Cesium.Ellipsoid.WGS84.geodeticSurfaceNormal(startPoint);
+
+    // 2. 构建精确ENU坐标系
+    const enuMatrix = Cesium.Transforms.eastNorthUpToFixedFrame(startPoint, undefined, normal);
+    const inverseMatrix = Cesium.Matrix4.inverse(enuMatrix, new Cesium.Matrix4());
+
+    // 3. 转换终点并计算水平向量
+    const localEnd = Cesium.Matrix4.multiplyByPoint(inverseMatrix, endPoint, new Cesium.Cartesian3());
+    const horizontalVec = new Cesium.Cartesian2(localEnd.x, localEnd.y);
+    Cesium.Cartesian2.normalize(horizontalVec, horizontalVec);
+
+    const north = new Cesium.Cartesian2(1, 0);
+
+    const angle = Cesium.Cartesian2.angleBetween(north, horizontalVec);
+    const cross = Cesium.Cartesian2.cross(north, horizontalVec, new Cesium.Cartesian2());
+    return cross < 0 ? angle : -angle;
+  }
+
+  calculatePolygonOrientation(positions) {
+
+    // 假设 position 是 Cesium.Cartesian3 对象，表示地球上的某个点
+    var position = positions[0]
+    // 获取东、北、上坐标系
+    var eastNorthUp = Cesium.Transforms.eastNorthUpToFixedFrame(position);
+    // northAxis 是北方向向量
+    var northAxis = eastNorthUp.getColumn(1, new Cesium.Cartesian3());
+    Cesium.Cartesian3.normalize(northAxis, northAxis);
+
+    const direction = Cesium.Cartesian3.subtract(positions[0], positions[1], new Cesium.Cartesian3());
+    Cesium.Cartesian3.normalize(direction, direction);
+
+
+    const dot = Cesium.Cartesian3.dot(northAxis, direction);
+    const magA = Cesium.Cartesian3.magnitude(northAxis);
+    const magB = Cesium.Cartesian3.magnitude(direction);
+    return Math.acos(dot / (magA * magB));
+  }
+  calculateTextureRepeat(polygonPositions, textureSize, meterPerPixel = 0.01) {
+    // 验证纹理尺寸
+    if (!textureSize.width || !textureSize.height) {
+      throw new Error('Texture size must contain width and height in pixels');
+    }
+
+    // 创建多边形几何体
+    const geometry = Cesium.PolygonGeometry.createGeometry(
+      new Cesium.PolygonGeometry({
+        polygonHierarchy: new Cesium.PolygonHierarchy(polygonPositions),
+        vertexFormat: Cesium.VertexFormat.POSITION_ONLY
+      })
+    );
+
+    // 计算多边形面积(平方米)
+    let area = 0;
+    const indices = geometry.indices;
+    const positions = geometry.attributes.position.values;
+    for (let i = 0; i < indices.length; i += 3) {
+      const i0 = indices[i] * 3;
+      const i1 = indices[i + 1] * 3;
+      const i2 = indices[i + 2] * 3;
+
+      const p0 = new Cesium.Cartesian3(positions[i0], positions[i0 + 1], positions[i0 + 2]);
+      const p1 = new Cesium.Cartesian3(positions[i1], positions[i1 + 1], positions[i1 + 2]);
+      const p2 = new Cesium.Cartesian3(positions[i2], positions[i2 + 1], positions[i2 + 2]);
+
+      const cross = Cesium.Cartesian3.cross(
+        Cesium.Cartesian3.subtract(p1, p0, new Cesium.Cartesian3()),
+        Cesium.Cartesian3.subtract(p2, p0, new Cesium.Cartesian3()),
+        new Cesium.Cartesian3()
+      );
+      area += Cesium.Cartesian3.magnitude(cross) * 0.5;
+    }
+
+    // 将像素尺寸转换为实际尺寸（平方米）
+    const textureWidthMeters = textureSize.width * meterPerPixel;
+    const textureHeightMeters = textureSize.height * meterPerPixel;
+    const textureArea = textureWidthMeters * textureHeightMeters;
+
+    // 计算各轴向重复次数
+    const repeatX = Math.sqrt(area) / textureWidthMeters;
+    const repeatY = Math.sqrt(area) / textureHeightMeters;
+
+    return new Cesium.Cartesian2(Math.max(1, Math.ceil(repeatX)), 1.0);
+  }
+  swapLastElements(arr1, arr2) {
+    const last = arr1[arr1.length - 1]
+    const first = arr2[0]
+    arr1[arr1.length - 1] = first
+    arr2[0] = last
+
+    return [arr1, arr2];
+  }
+  createLineBufferPolygonSide(positions, width) {
+    let area = []
+    for (let i = 0; i < positions.length - 1; i++) {
+      const start = positions[i];
+      const end = positions[i + 1];
+
+      const dir = Cesium.Cartesian3.subtract(end, start, new Cesium.Cartesian3());
+      Cesium.Cartesian3.normalize(dir, dir);
+
+      // 获取垂直向量（基于Z轴）
+      const perp = Cesium.Cartesian3.cross(dir, Cesium.Cartesian3.UNIT_Z, new Cesium.Cartesian3());
+      Cesium.Cartesian3.normalize(perp, perp);
+
+      // 生成偏移向量
+      const offset = Cesium.Cartesian3.multiplyByScalar(perp, width, new Cesium.Cartesian3());
+      let point1 = Cesium.Cartesian3.add(start, offset, new Cesium.Cartesian3())
+      let point3 = Cesium.Cartesian3.add(end, offset, new Cesium.Cartesian3())
+
+      i == positions.length - 2 ? area.push(start, point1, end, point3) : area.push(start, point1)
+    }
+    let arr = []
+    for (let i = 0; i < area.length - 2; i += 2) {
+      arr.push([area[i], area[i + 1], area[i + 3], area[i + 2]])
+    }
+    return arr
+  }
+  createLineBufferPolygon2(positions, width) {
+    let area = []
+    let leftPositions = [];
+    let rightPositions = [];
+
+    for (let i = 0; i < positions.length - 1; i++) {
+      const start = positions[i];
+      // const end = positions[i + 1] || positions[i - 1];
+      const end = positions[i + 1];
+
+      const dir = Cesium.Cartesian3.subtract(end, start, new Cesium.Cartesian3());
+      Cesium.Cartesian3.normalize(dir, dir);
+
+      // 获取垂直向量（基于Z轴）
+      const perp = Cesium.Cartesian3.cross(dir, Cesium.Cartesian3.UNIT_Z, new Cesium.Cartesian3());
+      Cesium.Cartesian3.normalize(perp, perp);
+
+
+      // 生成偏移向量
+      const offset = Cesium.Cartesian3.multiplyByScalar(perp, width, new Cesium.Cartesian3());
+      const offset2 = Cesium.Cartesian3.multiplyByScalar(perp, -width, new Cesium.Cartesian3());
+      let point1 = Cesium.Cartesian3.add(start, offset, new Cesium.Cartesian3())
+      let point2 = Cesium.Cartesian3.add(start, offset2, new Cesium.Cartesian3())
+      let point3 = Cesium.Cartesian3.add(end, offset, new Cesium.Cartesian3())
+      let point4 = Cesium.Cartesian3.add(end, offset2, new Cesium.Cartesian3())
+
+      if (i == positions.length - 2) {
+        area.push(point1, point2, point3, point4)
+        rightPositions.push(point1)
+        leftPositions.push(point2)
+        leftPositions.push(point4)
+        rightPositions.push(point3)
+      } else {
+        area.push(point1, point2)
+        rightPositions.push(point1)
+        leftPositions.push(point2)
+      }
+    }
+    let arr = []
+    for (let i = 0; i < area.length - 2; i += 2) {
+      arr.push([area[i], area[i + 1], area[i + 3], area[i + 2]])
+    }
+    return [arr, rightPositions, leftPositions]
+  }
+  createLineBufferPolygon(viewer, positions, width) {
+    // 计算每个线段的左右偏移点
+    const leftPositions = [];
+    const rightPositions = [];
+
+    for (let i = 0; i < positions.length; i++) {
+      const start = positions[i];
+      const end = positions[i + 1] || positions[i - 1];
+
+      // 计算线段方向向量
+      const direction = Cesium.Cartesian3.subtract(end, start, new Cesium.Cartesian3());
+      // const direction = Cesium.Cartesian3.subtract(start, end, new Cesium.Cartesian3());
+      Cesium.Cartesian3.normalize(direction, direction);
+
+      // 计算垂直向量（使用上向量叉积）
+      const up = Cesium.Cartesian3.UNIT_Z;
+      const perpendicular = Cesium.Cartesian3.cross(direction, up, new Cesium.Cartesian3());
+      Cesium.Cartesian3.normalize(perpendicular, perpendicular);
+
+      // 计算左右偏移点
+      const leftOffset = Cesium.Cartesian3.multiplyByScalar(
+        perpendicular,
+        width,
+        new Cesium.Cartesian3()
+      );
+
+      if (width > 0) {
+        rightPositions.unshift(Cesium.Cartesian3.add(start, leftOffset, new Cesium.Cartesian3()));
+      } else if (width < 0) {
+        rightPositions.push(Cesium.Cartesian3.add(start, leftOffset, new Cesium.Cartesian3()));
+      }
+
+    }
+    return rightPositions
+  }
+
+  get carRoadWidth() {
+    return this.options.carRoadWidth
+  }
+
+  set carRoadWidth(v) {
+    this.options.carRoadWidth = v
+    Road.create(this)
+
+  }
+  get sideWidth() {
+    return this.options.sideWidth
+  }
+  set sideWidth(v) {
+    this.options.sideWidth = v
+    Road.create(this)
+  }
+  /**
+   * @description 编辑框
+   * @param state=false {boolean} 状态: true打开, false关闭
+   */
+  async edit(state = false) {
+    let _this = this
+    this.originalOptions = this.deepCopyObj(this.options)
+
+    if (this._DialogObject && this._DialogObject.close) {
+      this._DialogObject.close()
+      this._DialogObject = null
+    }
+
+    if (state) {
+      this._DialogObject = await new Dialog(this.sdk, this.originalOptions, {
+        title: '道路属性', left: '180px', top: '100px',
+        confirmCallBack: (options) => {
+          this.name = this.name.trim()
+          if (!this.name) {
+            this.name = '道路'
+          }
+          this.originalOptions = this.deepCopyObj(this.options)
+          this._DialogObject.close()
+          this.Dialog.confirmCallBack && this.Dialog.confirmCallBack(this.originalOptions)
+          syncData(this.sdk, this.options.id)
+          syncSplitData(this.sdk, this.options.id)
+        },
+        resetCallBack: () => {
+          this.reset()
+          this.Dialog.resetCallBack && this.Dialog.resetCallBack()
+        },
+        closeCallBack: () => {
+          this.reset()
+          this.Dialog.closeCallBack && this.Dialog.closeCallBack()
+        },
+        showCallBack: (show) => {
+          this.show = show
+          this.Dialog.showCallBack && this.Dialog.showCallBack()
+        }
+      }, true)
+      this._DialogObject._element.body.className = this._DialogObject._element.body.className + ' road-surface'
+      let contentElm = document.createElement('div');
+      contentElm.innerHTML = html()
+      this._DialogObject.contentAppChild(contentElm)
+
+
+      // 下拉选项
+      // let heightModeData = [
+      //   {
+      //     name: '海拔高度',
+      //     value: '海拔高度',
+      //     key: '0',
+      //   },
+      //   {
+      //     name: '相对地表',
+      //     value: '相对地表',
+      //     key: '1',
+      //   },
+      //   {
+      //     name: '依附模型',
+      //     value: '依附模型',
+      //     key: '2',
+      //   }
+      // ]
+      // let heightModeObject = legp(
+      //   this._DialogObject._element.content.getElementsByClassName(
+      //     'road-box'
+      //   )[0],
+      //   '.road-type'
+      // )
+      // if (heightModeObject) {
+      //   heightModeObject.legp_search(heightModeData)
+      //   let heightModeDataLegpElm = this._DialogObject._element.content
+      //     .getElementsByClassName('road-type')[0]
+      //     .getElementsByTagName('input')[0]
+      //   for (let i = 0; i < heightModeData.length; i++) {
+      //     if (heightModeData[i].key == this.heightMode) {
+      //       heightModeDataLegpElm.value = heightModeData[i].value
+      //       heightModeObject.legp_searchActive(
+      //         heightModeData[i].value
+      //       )
+      //       break
+      //     }
+      //   }
+      //   heightModeDataLegpElm.addEventListener('input', () => {
+      //     for (let i = 0; i < heightModeData.length; i++) {
+      //       if (heightModeData[i].value === heightModeDataLegpElm.value) {
+      //         this.heightMode = heightModeData[i].key
+      //         break
+      //       }
+      //     }
+      //   })
+
+
+      //   this._elms.height = heightElm
+      //   this._elms.heightBox = heightBoxElm
+      //   this._elms.heightMode = heightModeDataLegpElm
+      //   this._elms.heightConfirm = heightConfirmElm
+      //   this._elms.heightModeObject = heightModeObject
+
+      //   heightConfirmElm.addEventListener('click', () => {
+      //     this.positionEditing = false
+      //     for (let i = 0; i < this.options.positions.length; i++) {
+      //       this.options.positions[i].alt = Number((this.options.positions[i].alt + Number(heightElm.value)).toFixed(2))
+      //       this._elms.alt[i].innerHTML = this.options.positions[i].alt
+      //     }
+      //     let fromDegreesArray = this.renewPositions(this.options.positions)
+      //     this.entity.polyline.positions = Cesium.Cartesian3.fromDegreesArrayHeights(
+      //       fromDegreesArray
+      //     )
+
+      //     this.positionEditing = false
+      //     PolylineObject.closeNodeEdit(this)
+      //   })
+      // }
+
+
+
+
+
+      let all_elm = contentElm.getElementsByTagName("*")
+      this._EventBinding.on(this, all_elm)
+      this._elms = this._EventBinding.element
+    } else {
+      // if (this._element_style) {
+      //   document.getElementsByTagName('head')[0].removeChild(this._element_style)
+      //   this._element_style = null
+      // }
+      // if (this._DialogObject && this._DialogObject.remove) {
+      //   this._DialogObject.remove()
+      //   this._DialogObject = null
+      // }
+    }
+  }
+
+  reset() {
+    if (!this.viewer.entities.getById(this.options.id)) {
+      return
+    }
+    this.name = this.originalOptions.name
+    this.carRoadWidth = this.originalOptions.carRoadWidth
+    this.sideWidth = this.originalOptions.sideWidth
+    this.positions = this.originalOptions.positions
+    this.roadImage = this.originalOptions.roadImage
+    this.sideImage = this.originalOptions.sideImage
+  }
+
+  /**
+   * 飞到对应实体
+   */
+  async flyTo(options = {}) {
+    setActiveViewer(0)
+    closeRotateAround(this.sdk)
+    closeViewFollow(this.sdk)
+
+    if (this.options.customView && this.options.customView.relativePosition && this.options.customView.orientation) {
+      let orientation = {
+        heading: Cesium.Math.toRadians(this.options.customView.orientation.heading || 0.0),
+        pitch: Cesium.Math.toRadians(this.options.customView.orientation.pitch || -60.0),
+        roll: Cesium.Math.toRadians(this.options.customView.orientation.roll || 0.0)
+      }
+
+      let lng = this.options.customView.relativePosition.lng
+      let lat = this.options.customView.relativePosition.lat
+      let alt = this.options.customView.relativePosition.alt
+      let destination = Cesium.Cartesian3.fromDegrees(lng, lat, alt)
+
+      let position = { lng: 0, lat: 0 }
+      if (this.options.position) {
+        position = { ...this.options.position }
+      }
+      else if (this.options.positions) {
+        position = { ...this.options.positions[0] }
+      }
+      else if (this.options.center) {
+        position = { ...this.options.center }
+      }
+      else if (this.options.start) {
+        position = { ...this.options.start }
+      }
+      else {
+        if (this.options.hasOwnProperty('lng')) {
+          position.lng = this.options.lng
+        }
+        if (this.options.hasOwnProperty('lat')) {
+          position.lat = this.options.lat
+        }
+        if (this.options.hasOwnProperty('alt')) {
+          position.alt = this.options.alt
+        }
+      }
+      // 如果没有高度值，则获取紧贴高度计算
+      // if (!position.hasOwnProperty('alt')) {
+      //   position.alt = await this.getClampToHeight(position)
+      // }
+      lng = this.options.customView.relativePosition.lng + position.lng
+      lat = this.options.customView.relativePosition.lat + position.lat
+      alt = this.options.customView.relativePosition.alt + position.alt
+      destination = Cesium.Cartesian3.fromDegrees(lng, lat, alt)
+      this.sdk.viewer.camera.flyTo({
+        destination: destination,
+        orientation: orientation
+      })
+    }
+    else {
+      let positionArray = []
+      for (let i = 0; i < this.positions.length; i++) {
+        let a = Cesium.Cartesian3.fromDegrees(
+          this.positions[i][0],
+          this.positions[i][1],
+          this.options.height + this.options.heightDifference / 2
+        )
+        positionArray.push(a.x, a.y, a.z)
+      }
+      let BoundingSphere = Cesium.BoundingSphere.fromVertices(positionArray)
+      this.viewer.camera.flyToBoundingSphere(BoundingSphere, {
+        offset: {
+          heading: Cesium.Math.toRadians(0.0),
+          pitch: Cesium.Math.toRadians(-20.0),
+          roll: Cesium.Math.toRadians(0.0)
+        }
+      })
+
+    }
+  }
+
+  getSphere() {
+    return new Promise((resolve) => {
+      // entity没有加载完成时 state 不会等于0 所以设置定时器直到获取到为止
+      const interval = setInterval(() => {
+        const sphere = new Cesium.BoundingSphere()
+        const state = this.sdk.viewer._dataSourceDisplay.getBoundingSphere(
+          this.viewer.entities.getById(this.options.id),
+          false,
+          sphere
+        )
+        if (state === Cesium.BoundingSphereState.DONE) {
+          clearInterval(interval)
+        }
+      }, 1000)
+    })
+  }
+
+  /**
+   * 删除
+   */
+  async remove() {
+    this.positions = []
+    this.lineEntity = null
+
+    if (this.viewer.entities.getById(this.options.id)) {
+      this.viewer.entities.getById(this.options.id)._children.forEach((item) => {
+        this.viewer.entities.remove(item);
+      });
+      this.viewer.entities.remove(this.viewer.entities.getById(this.options.id))
+    }
+
+    if (this._DialogObject && !this._DialogObject.isDestroy) {
+      this._DialogObject.close()
+      this._DialogObject = null
+    }
+    await this.sdk.removeIncetance(this.options.id)
+    await syncData(this.sdk, this.options.id)
+  }
+
+  flicker() { }
+}
+
+export default Road

src/Obj/Base/SectorObject/index.js

@@ -19,27 +19,61 @@ class SectorObject extends Base {
   /**
    * @constructor
    * @description 创建扇形
+   * @param sdk
    * @param options {object} 扇形属性
    * @param options.id {string} 标注id
    * @param options.name {string} 名称
    * @param options.show=true {boolean} 显示/隐藏
-   * @param options.color="#ff000080" {string} 颜色
+   * @param options.color="rgba(255, 0, 0, 0.5)" {string} 颜色
    * @param options.center {object} 位置
-   * @param options.center.lng {object} 经度
-   * @param options.center.lat {object} 维度
+   * @param options.center.lng {number} 经度
+   * @param options.center.lat {number} 纬度
+   * @param options.center.alt {number} 高度
    * @param options.radius=10 {number} 半径
    * @param options.startAngle=10 {number} 起始方向
    * @param options.endAngle=0 {number} 结束方向
    * @param options.line {object} 边框
-   * @param options.line.width=3 {string} 边框宽
+   * @param options.line.width=3 {number} 边框宽
    * @param options.line.color="rgba(155, 155, 124, 0.89)" {string} 边框颜色
-   * @param options.label {object} 标注
    * @param options.heightMode=2{number} 高度模式（0：海拔高度；1：相对地表；2：依附模式）
+   * @param options.areaUnit='平方米' {string} 面积单位
+   * @param options.label {object} 标签对象
+   * @param options.label.text {string} 标签文本
+   * @param options.label.show {string} 标签显隐
+   * @param options.label.position {string} 标签位置
+   * @param options.label.position.lng {number} 经度
+   * @param options.label.position.lat {number} 纬度
+   * @param options.label.position.alt {number} 高度
+   * @param options.label.fontSize=20 {number} 字体大小
+   * @param options.label.fontFamily=0 {number} 字体项 0：黑体；1：思源黑体；2：庞门正道标题体；3：数黑体
+   * @param options.label.color=#ffffff {string} 字体颜色
+   * @param options.label.lineWidth=4 {number} 引线宽
+   * @param options.label.lineColor=#00ffff80 {string} 引线颜色
+   * @param options.label.pixelOffset=20 {number} 字体偏移(引线长度)
+   * @param options.label.backgroundColor=['#00ffff80', '#00ffff80'] {array} 背景颜色
+   * @param options.label.scaleByDistance {boolean} 距离缩放
+   * @param options.label.near=2000 {number} 视野缩放最近距离
+   * @param options.label.far=100000 {number} 视野缩放最远距离
+   * @param options.attribute {object} 属性内容
+   * @param options.attribute.link {object} 链接
+   * @param options.attribute.link.content=[]] {array} 链接内容
+   * @param options.attribute.link.content[].name {string} 链接名称
+   * @param options.attribute.link.content[].url {string} 链接地址
+   * @param options.richTextContent {string} 富文本内容
+   * @param options.customView {object} 默认视角
+   * @param options.customView.orientation {object} 默认视角方位
+   * @param options.customView.orientation.heading {number} 航向角
+   * @param options.customView.orientation.pitch {number} 俯仰角
+   * @param options.customView.orientation.roll {number} 翻滚角
+   * @param options.customView.relativePosition {object} 视角相对位置
+   * @param options.customView.relativePosition.lng {number} 经度
+   * @param options.customView.relativePosition.lat {number} 纬度
+   * @param options.customView.relativePosition.alt {number} 高度
    */
   constructor(sdk, options = {}) {
     super(sdk, options);
     this.options.name = options.name || '未命名对象'
-    this.options.color = options.color || "#ff000080"
+    this.options.color = options.color || "rgba(255, 0, 0, 0.5)"
     this.options.heightMode = (options.heightMode || options.heightMode == 0) ? options.heightMode : 2
     this.options.semiMinorAxis = (options.semiMinorAxis || options.semiMinorAxis === 0) ? options.semiMinorAxis : 10
     this.options.semiMajorAxis = (options.semiMajorAxis || options.semiMajorAxis === 0) ? options.semiMajorAxis : 20
@@ -47,7 +81,7 @@ class SectorObject extends Base {
     this.options.center = options.center || {}
     this.options.line = options.line || {}
     this.options.line.width = ((this.options.line.width || this.options.line.width === 0) ? this.options.line.width : 3)
-    this.options.line.color = this.options.line.color || 'rgba(255, 0, 0, 0.5)'
+    this.options.line.color = this.options.line.color || 'rgba(255, 0, 0, 1)'
     this.options['area-unit'] = options['area-unit'] || '平方米'
     options.label = options.label || {}
     this._elms = {};
@@ -293,7 +327,7 @@ class SectorObject extends Base {
     return this.options.line.width
   }
   set lineWidth(v) {
-    this.options.line.width =  ((v || v === 0) ? v : 3)
+    this.options.line.width = ((v || v === 0) ? v : 3)
     this.entity.polyline.width = this.options.line.width
     this._elms.lineWidth && this._elms.lineWidth.forEach((item) => {
       item.value = this.options.line.width
@@ -344,7 +378,7 @@ class SectorObject extends Base {
   }
   set labelShow(v) {
     this.options.label.show = v
-    if (this.show) {
+    if (this.show && !this.showView || this.showView == 3) {
       this.label.show = v
     }
     else {
@@ -1560,7 +1594,7 @@ class SectorObject extends Base {
   _addRr() {
     if (this._DialogObject._element.content.getElementsByClassName('vr_add')[0].value) {
       this.options.attribute.vr.content.push({
-        name: '全景图' ,
+        name: '全景图',
         url: this._DialogObject._element.content.getElementsByClassName('vr_add')[0].value
       })
       this._DialogObject._element.content.getElementsByClassName('vr_add')[0].value = ''
@@ -1573,7 +1607,7 @@ class SectorObject extends Base {
 
   addAttributeRr(vr) {
     this.options.attribute.vr.content.push({
-      name: '全景图' ,
+      name: '全景图',
       url: vr
     })
     this.attributeVr = this.options.attribute.vr.content
@@ -1922,6 +1956,19 @@ class SectorObject extends Base {
         that.cartesian3Towgs84(positions[1], that.sdk.viewer),
         that.cartesian3Towgs84(positions[positions.length - 4], that.sdk.viewer)
       ]
+      let objectsToExclude = [...that.sdk.viewer.entities.values]
+      that
+        .getClampToHeight({
+          lng: that.options.center.lng,
+          lat: that.options.center.lat
+        }, objectsToExclude)
+        .then(height => {
+          that.label.position = [
+            that.options.center.lng,
+            that.options.center.lat,
+            height
+          ]
+        })
       setTimeout(() => {
         createNodePoints(positions[1], 'sector-start')
         createNodePoints(positions[positions.length - 4], 'sector-end')

src/Obj/Base/StraightArrowObject/index.js

@@ -22,14 +22,56 @@ class StraightArrowObject extends Base {
    * @param sdk
    * @description 直线箭头
    * @param options {object} 属性
+   * @param options.id {string} 唯一标识
    * @param options.show=true {boolean} 显示/隐藏
    * @param options.name {string} 名称
-   * @param options.color="#ff000080" {string} 颜色
+   * @param options.color='rgba(255, 0, 0, 0.5)' {string} 颜色
    * @param options.height {number} 高度
    * @param options.heightMode=2{number} 高度模式（0：海拔高度；1：相对地表；2：依附模式）
-   * @param {Array.<object>} options.positions 坐标数组 [{lon,lat,alt},...]
-   * @param _Dialog {object} 弹框事件
-   * @param _Dialog.confirmCallBack {function} 弹框确认时的回调
+   * @param options.areaUnit='平方米' {string} 面积单位
+   * @param options.line {object} 边框
+   * @param options.line.width=2 {string} 边框宽
+   * @param options.line.color="rgba(155, 155, 124, 0.89)" {string} 边框颜色
+   * @param {Array.<object>} options.positions 必填，经纬度和高度的列表，值交替 [{lon,lat,alt},...]
+   * @param options.positions[].lng {number} 经度
+   * @param options.positions[].lat {number} 纬度
+   * @param options.positions[].alt {number} 高度
+   * @param options.spreadState=false {boolean} 动画
+   * @param options.loop=false {loop} 动画重复
+   * @param options.spreadTime=3000 {number} 动画持续时长(毫秒)
+   * @param options.label {object} 标签对象
+   * @param options.label.text {string} 标签文本
+   * @param options.label.show {string} 标签显隐
+   * @param options.label.position {string} 标签位置
+   * @param options.label.position {object} 标签位置
+   * @param options.label.position.lng {number} 经度
+   * @param options.label.position.lat {number} 纬度
+   * @param options.label.position.alt {number} 高度
+   * @param options.label.fontSize=20 {number} 字体大小
+   * @param options.label.fontFamily=0 {number} 字体项 0：黑体；1：思源黑体；2：庞门正道标题体；3：数黑体
+   * @param options.label.color=#ffffff {string} 字体颜色
+   * @param options.label.lineWidth=4 {number} 引线宽
+   * @param options.label.lineColor=#00ffff80 {string} 引线颜色
+   * @param options.label.pixelOffset=20 {number} 字体偏移(引线长度)
+   * @param options.label.backgroundColor=['#00ffff80', '#00ffff80'] {array} 背景颜色
+   * @param options.label.scaleByDistance {boolean} 距离缩放
+   * @param options.label.near=2000 {number} 视野缩放最近距离
+   * @param options.label.far=100000 {number} 视野缩放最远距离
+   * @param options.attribute {object} 属性内容
+   * @param options.attribute.link={} {object} 链接
+   * @param options.attribute.link.content=[]] {array} 链接内容
+   * @param options.attribute.link.content[].name {string} 链接名称
+   * @param options.attribute.link.content[].url {string} 链接地址
+   * @param options.richTextContent {string} 富文本内容
+   * @param options.customView {object} 默认视角
+   * @param options.customView.orientation {object} 默认视角方位
+   * @param options.customView.orientation.heading {number} 航向角
+   * @param options.customView.orientation.pitch {number} 俯仰角
+   * @param options.customView.orientation.roll {number} 翻滚角
+   * @param options.customView.relativePosition {object} 视角相对位置
+   * @param options.customView.relativePosition.lng {number} 经度
+   * @param options.customView.relativePosition.lat {number} 纬度
+   * @param options.customView.relativePosition.alt {number} 高度
    * */
   constructor(sdk, options = {}, _Dialog = {}) {
     super(sdk, options);
@@ -40,7 +82,7 @@ class StraightArrowObject extends Base {
     this.options.positions = options.positions || []
     this.options.line = options.line || {}
     this.options.line.width = ((this.options.line.width || this.options.line.width === 0) ? this.options.line.width : 3)
-    this.options.line.color = this.options.line.color || 'rgba(255, 0, 0, 0.5)'
+    this.options.line.color = this.options.line.color || 'rgba(255, 0, 0, 1)'
     this.options['area-unit'] = options['area-unit'] || '平方米'
     this.entity
     this.event = new MouseEvent(this.sdk)
@@ -321,7 +363,7 @@ class StraightArrowObject extends Base {
   }
   set labelShow(v) {
     this.options.label.show = v
-    if (this.show) {
+    if (this.show && !this.showView || this.showView == 3) {
       this.label.show = v
     }
     else {

src/Obj/Base/TextBox/index.js

@@ -2,6 +2,7 @@
  * 文本框
  */
 import Base from "../index";
+import { syncData, getSdk } from '../../../Global/MultiViewportMode'
 import { setActiveViewer, closeRotateAround, closeViewFollow } from '../../../Global/global'
 class TextBox extends Base {
   /**
@@ -29,7 +30,15 @@ class TextBox extends Base {
     this.textDom = undefined
     this.create(this)
     this.sdk.addIncetance(this.options.id, this)
+
     this.callback = callback
+
+    // syncData(this.sdk, this.options.id)
+
+  }
+
+  get type() {
+    return 'TextBox'
   }
 
   async create(that) {
@@ -38,6 +47,7 @@ class TextBox extends Base {
     let dom = document.createElement('span');
     dom.id = that.options.id
     dom.className = 'popup-textarea'
+    dom.style.zIndex = 1
     // 创建textarea元素
     var textarea = document.createElement('textarea');
     textarea.className = 'textarea'
@@ -53,8 +63,7 @@ class TextBox extends Base {
 
     // 配置CSS样式和内容结构
     viewer.cesiumWidget.container.appendChild(dom);
-    let posi = Cesium.Cartesian3.fromDegrees(that.options.position.lng.toFixed(4), that.options.position.lat.toFixed(4), that.options.position.alt.toFixed(4))
-
+    let posi = Cesium.Cartesian3.fromDegrees(that.options.position.lng, that.options.position.lat, that.options.position.alt)
     that.handler = function () {
       const position = Cesium.SceneTransforms.wgs84ToWindowCoordinates(
         viewer.scene, posi
@@ -70,22 +79,44 @@ class TextBox extends Base {
     that.textDom = dom;
 
   }
+  async isClick(posi, id) {
+    let params = [
+      {
+        position: posi
+      },
+      id,
+      null
+    ]
+
+    this.clickCallBack({ position: posi }, id, null)
+  }
   async setHandeler(data) {
     let that = this
-    const ray = this.sdk.viewer.camera.getPickRay(new Cesium.Cartesian2(data.x, data.y));
-    var cartesian = this.sdk.viewer.scene.globe.pick(ray, this.sdk.viewer.scene);
+
+    let cartesian = this.sdk.viewer.scene.pickPosition(new Cesium.Cartesian2(data.x, data.y)); //屏幕坐标转为笛卡尔空间坐标
+    // if (!cartesian) return;
+
+    // let c = Cesium.Cartographic.fromCartesian(position);
+    if (!cartesian) {
+      const ray = this.sdk.viewer.camera.getPickRay(new Cesium.Cartesian2(data.x, data.y));
+      cartesian = this.sdk.viewer.scene.globe.pick(ray, this.sdk.viewer.scene);
+    }
+
     if (Cesium.defined(cartesian)) {
       that.sdk.viewer.scene.postRender.removeEventListener(that.handler);
 
       var cartographic = Cesium.Cartographic.fromCartesian(cartesian);
       var longitude = Cesium.Math.toDegrees(cartographic.longitude);
       var latitude = Cesium.Math.toDegrees(cartographic.latitude);
+
+      let height = await that.getClampToHeight({ lng: longitude, lat: latitude })
       that.position = {
         lng: longitude,
         lat: latitude,
         alt: cartographic.height
+        // alt: height
       }
-      let posi = Cesium.Cartesian3.fromDegrees(longitude.toFixed(4), latitude.toFixed(4), cartographic.height.toFixed(4))
+      let posi = Cesium.Cartesian3.fromDegrees(longitude, latitude, cartographic.height)
 
       that.handler = function () {
         const position = Cesium.SceneTransforms.wgs84ToWindowCoordinates(
@@ -104,16 +135,63 @@ class TextBox extends Base {
   async getwords(words) {
     this.options.text = words
     this.callback(this.options)
+    let { sdkP } = getSdk()
+    if (this.sdk === sdkP && sdkP) {//三维
+      syncData(this.sdk, this.options.id)
+    }
+    else if (sdkP) {//二维
+      sdkP.entityMap.get(this.options.id).text = words
+      sdkP.entityMap.get(this.options.id).twoToThree(this.options.position)
+    } else if (!sdkP) {
+      syncData(this.sdk, this.options.id)
+    }
+  }
+  async twoToThree(position) {
+    let that = this
+    that.sdk.viewer.scene.postRender.removeEventListener(that.handler);
+    let posi = Cesium.Cartesian3.fromDegrees(position.lng, position.lat, position.alt)
+
+    that.handler = function () {
+      const position = Cesium.SceneTransforms.wgs84ToWindowCoordinates(
+        that.sdk.viewer.scene, posi
+      );
+      if (position) {
+        let width = that.textDom.clientWidth * 1
+        let height = that.textDom.clientHeight * 1
+        that.textDom.style.left = `${position.x - width / 2}px`;
+        that.textDom.style.top = `${position.y - height}px`;
+      }
+    }
+    that.sdk.viewer.scene.postRender.addEventListener(that.handler);
   }
   async returnFun() {
     return this.handler
   }
+  get text() {
+    return this.options.text
+  }
+  set text(val) {
+    this.options.text = val
+    this.textDom.querySelector('textarea').value = val
+    this.callback(this.options)
+  }
+  get onClick() {
+    return this.clickCallBack
+  }
+  set onClick(val) {
+    if (val && typeof val !== 'function') {
+      console.error('val:', val, '不是一个function')
+    } else {
+      this.clickCallBack = val
+    }
+  }
   get show() {
     return this.options.show
   }
   set show(v) {
     this.options.show = v
     this.textDom && (this.textDom.style.display = v ? 'block' : 'none');
+    syncData(this.sdk, this.options.id)
   }
   get position() {
     return this.options.position
@@ -204,6 +282,7 @@ class TextBox extends Base {
     if (this.textDom && this.textDom.parentNode) {
       this.sdk.viewer.cesiumWidget.container.removeChild(this.textDom);
     }
+    await this.sdk.removeIncetance(this.options.id)
   }
 
   flicker() { }

src/Obj/Base/TextObject/GroundText/index.js

@@ -14,14 +14,27 @@ class GroundText extends Base {
    * @param sdk
    * @description 贴地文字
    * @param options {object} 属性
+   * @param options.id {string} 唯一标识
    * @param options.show=true {boolean} 显示/隐藏
    * @param options.text {string} 文字
    * @param options.angle=0 {number} 旋转角度
-   * @param options.scale=1 {number} 比例
-   * @param {object} options.position 经纬度{lon,lat}
-   * @param {object} options.positions 经纬度集[{lon,lat}]仅在未定义 position 时有效
-   * @param _Dialog {object} 弹框事件
-   * @param _Dialog.confirmCallBack {function} 弹框确认时的回调
+   * @param options.scale=1 {number} 缩放比例
+   * @param options.speed=1 {number} 文字滚动速度
+   * @param {object} options.position 位置
+   * @param {number} options.position.lng 经度
+   * @param {number} options.position.lat 纬度
+   * @param {object} options.positions 坐标集[{lon,lat}]仅在未定义 position 时有效
+   * @param options.positions[].lng {number} 经度
+   * @param options.positions[].lat {number} 纬度
+   * @param options.customView {object} 默认视角
+   * @param options.customView.orientation {object} 默认视角方位
+   * @param options.customView.orientation.heading {number} 航向角
+   * @param options.customView.orientation.pitch {number} 俯仰角
+   * @param options.customView.orientation.roll {number} 翻滚角
+   * @param options.customView.relativePosition {object} 视角相对位置
+   * @param options.customView.relativePosition.lng {number} 经度
+   * @param options.customView.relativePosition.lat {number} 纬度
+   * @param options.customView.relativePosition.alt {number} 高度
    * */
   constructor(sdk, options = {}, _Dialog = {}) {
     super(sdk, options)
@@ -649,7 +662,7 @@ class GroundText extends Base {
       ctx.font = 200 + 'px serif'
       ctx.fillStyle = 'rgba(255, 255, 255, 0)'
       ctx.fillRect(0, 0, maxWidth + 30, 210)
-      ctx.fillStyle = this.options.color
+      ctx.fillStyle = 'rgba(255, 255, 255, 1)'
       ctx.font = '200px serif'
       ctx.fillText(textArray[i], 0, 210 * (i + 1))
     }

src/Obj/Base/TextObject/StandText/index.js

@@ -16,12 +16,23 @@ class StandText extends Base {
    * @param sdk
    * @description 立体文字
    * @param options {object}
+   * @param options.id {string} 唯一标识
    * @param options.text {string} 文字
    * @param options.color="#FFC107" {string} 颜色
    * @param options.speed=1 {number} 文字移动速度
    * @param {Array.<object>} positions 经纬度和高度的列表，值交替 [{lon,lat,alt},...]
-   * @param _Dialog {object} 弹框事件
-   * @param _Dialog.confirmCallBack {function} 弹框确认时的回调
+   * @param options.positions[].lng {number} 经度
+   * @param options.positions[].lat {number} 纬度
+   * @param options.positions[].alt {number} 高度
+   * @param options.customView {object} 默认视角
+   * @param options.customView.orientation {object} 默认视角方位
+   * @param options.customView.orientation.heading {number} 航向角
+   * @param options.customView.orientation.pitch {number} 俯仰角
+   * @param options.customView.orientation.roll {number} 翻滚角
+   * @param options.customView.relativePosition {object} 视角相对位置
+   * @param options.customView.relativePosition.lng {number} 经度
+   * @param options.customView.relativePosition.lat {number} 纬度
+   * @param options.customView.relativePosition.alt {number} 高度
    * */
   constructor(sdk, options, _Dialog = {}) {
     super(sdk, options);
@@ -417,71 +428,11 @@ class StandText extends Base {
           this.color = 'rgba(255,255,255,1)'
         },//点击清空按钮事件回调
       })
-      let labelColorPicker = new YJColorPicker({
-        el: contentElm.getElementsByClassName("labelColor")[0],
-        size: 'mini',//颜色box类型
-        alpha: true,//是否开启透明度
-        defaultColor: this.labelColor,
-        disabled: false,//是否禁止打开颜色选择器
-        openPickerAni: 'opacity',//打开颜色选择器动画
-        sure: (color) => {
-          this.labelColor = color
-        },//点击确认按钮事件回调
-        clear: () => {
-          this.labelColor = 'rgba(255,255,255,1)'
-        },//点击清空按钮事件回调
-      })
-      let lineColorPicker = new YJColorPicker({
-        el: contentElm.getElementsByClassName("labelLineColor")[0],
-        size: 'mini',//颜色box类型
-        alpha: true,//是否开启透明度
-        defaultColor: this.labelLineColor,
-        disabled: false,//是否禁止打开颜色选择器
-        openPickerAni: 'opacity',//打开颜色选择器动画
-        sure: (color) => {
-          this.labelLineColor = color
-        },//点击确认按钮事件回调
-        clear: () => {
-          this.labelLineColor = 'rgba(255,255,255,1)'
-        },//点击清空按钮事件回调
-      })
-      let labelBackgroundColorStartPicker = new YJColorPicker({
-        el: contentElm.getElementsByClassName("labelBackgroundColorStart")[0],
-        size: 'mini',
-        alpha: true,
-        defaultColor: this.labelBackgroundColorStart,
-        disabled: false,
-        openPickerAni: 'opacity',
-        sure: (color) => {
-          this.labelBackgroundColorStart = color
-        },
-        clear: () => {
-          this.labelBackgroundColorStart = 'rgba(255,255,255,1)'
-        },
-      })
-      let labelBackgroundColorEndPicker = new YJColorPicker({
-        el: contentElm.getElementsByClassName("labelBackgroundColorEnd")[0],
-        size: 'mini',
-        alpha: true,
-        defaultColor: this.labelBackgroundColorEnd,
-        disabled: false,
-        openPickerAni: 'opacity',
-        sure: (color) => {
-          this.labelBackgroundColorEnd = color
-        },
-        clear: () => {
-          this.labelBackgroundColorEnd = 'rgba(255,255,255,1)'
-        },
-      })
 
       let all_elm = contentElm.getElementsByTagName("*")
       this._EventBinding.on(this, all_elm)
       this._elms = this._EventBinding.element
       this._elms.color = [colorPicker]
-      this._elms.labelColor = [labelColorPicker]
-      this._elms.labelLineColor = [lineColorPicker]
-      this._elms.labelBackgroundColorStart = [labelBackgroundColorStartPicker]
-      this._elms.labelBackgroundColorEnd = [labelBackgroundColorEndPicker]
     } else {
       if (this._DialogObject && this._DialogObject.remove) {
         this._DialogObject.remove()
@@ -568,7 +519,7 @@ class StandText extends Base {
       ctx.font = 200 + "px serif";
       ctx.fillStyle = 'rgba(255, 255, 255, 0)'
       ctx.fillRect(0, 0, maxWidth + 30, 210)
-      ctx.fillStyle = this.options.color;
+      ctx.fillStyle = 'rgba(255, 255, 255, 1)';
       ctx.font = "200px serif";
       ctx.fillText(textArray[i], 0, 210 * (i+1));
     }

src/Obj/Base/TrajectoryMotion/_element.js

@@ -182,6 +182,23 @@ function html() {
       </div>
     </div>
     <span class="custom-divider"></span>
+    <div class="div-item">
+      <div class="row">
+        <div class="col">
+          <span class="label">油耗</span>
+          <div class="input-number input-number-unit-6" style="width: 170px;">
+            <input class="input" type="number" title="" min="1" max="99999999" @model="unitFuelConsumption">
+            <span class="unit">L/100km</span>
+            <span class="arrow"></span>
+          </div>
+        </div>
+        <div class="col" style="flex: 0 0 0;">
+          <span class="label">总油耗</span>
+          <input class="btn-switch" type="checkbox" @model="fuelShow">
+        </div>
+      </div>
+    </div>
+    <span class="custom-divider"></span>
     `
 }
 

src/Obj/Base/TrajectoryMotion/index.js

@@ -23,7 +23,9 @@ class TrajectoryMotion extends Base {
   /**
  * @constructor
  * @description 轨迹运动
+ * @param sdk
  * @param options {object}
+ * @param options.id {string} 唯一标识
  * @param options.name {string} 名称
  * @param options.speed=1 {number} 运行速度
  * @param options.delay=0 {number} 运动延迟时间(毫秒)
@@ -33,22 +35,41 @@ class TrajectoryMotion extends Base {
  * @param options.state=true {boolean} 模型运动
  * @param options.routeDirection=true {boolean} 路径方向
  * @param options.viewFollow=false {boolean} 视角跟随
+ * @param options.realTimeRoute=false {boolean} 实时路径
  * @param options.model {object} 模型参数
  * @param options.model.show=true {boolean} 模型显隐
- * @param options.model.url {url} 模型地址
+ * @param options.model.url {string} 模型地址
  * @param options.model.pixelSize=70 {number} 模型像素大小
- * @param options.model.heading=0 {number} 
- * @param options.model.pitch=0 {number} 
- * @param options.model.roll=0 {number} 
+ * @param options.model.heading=0 {number} 模型航向角
+ * @param options.model.pitch=0 {number} 模型俯仰角
+ * @param options.model.roll=0 {number} 模型翻滚角
  * @param options.model.scale=1 {number} 模型比例
  * @param options.model.animate {string} 模型动画
  * @param options.line {object} 路径参数
  * @param options.line.show=true {boolean} 路径显隐
  * @param options.line.smooth=false {boolean} 路径圆滑
- * @param options.line.noseToTail=false {boolean} 路径收尾相联
+ * @param options.line.noseToTail=false {boolean} 路径首尾相联
  * @param {Array.<object>} options.line.positions 经纬度和高度的列表，值交替 [{lon,lat,alt},...]
- * @param _Dialog {object} 弹框事件
- * @param _Dialog.confirmCallBack {function} 弹框确认时的回调
+ * @param options.positions[].lng {number} 经度
+ * @param options.positions[].lat {number} 纬度
+ * @param options.positions[].alt {number} 高度
+ * @param options.label {object} 标签对象
+ * @param options.label.show {string} 标签显隐
+ * @param options.label.position {string} 标签位置
+ * @param options.label.position {object} 标签位置
+ * @param options.label.position.lng {number} 经度
+ * @param options.label.position.lat {number} 纬度
+ * @param options.label.position.alt {number} 高度
+ * @param options.label.fontSize=20 {number} 字体大小
+ * @param options.label.fontFamily=0 {number} 字体项 0：黑体；1：思源黑体；2：庞门正道标题体；3：数黑体
+ * @param options.label.color=#ffffff {string} 字体颜色
+ * @param options.label.lineWidth=4 {number} 引线宽
+ * @param options.label.lineColor=#00ffff80 {string} 引线颜色
+ * @param options.label.pixelOffset=20 {number} 字体偏移(引线长度)
+ * @param options.label.backgroundColor=['#00ffff80', '#00ffff80'] {array} 背景颜色
+ * @param options.label.scaleByDistance {boolean} 距离缩放
+ * @param options.label.near=2000 {number} 视野缩放最近距离
+ * @param options.label.far=100000 {number} 视野缩放最远距离
  * */
   constructor(sdk, options = {}, _Dialog = {}) {
     super(sdk, options);
@@ -78,6 +99,7 @@ class TrajectoryMotion extends Base {
     this.options.line.smooth = options.line.smooth ? options.line.smooth : false
     this.options.line.noseToTail = options.line.noseToTail ? options.line.noseToTail : false
     this.positions_smooth = []
+    this.options.unitFuelConsumption = options.unitFuelConsumption || 0
     this.options.ground = options.ground || false
     this.options.state = (options.state || options.state === false) ? options.state : true
     this.options.routeDirection = (options.routeDirection || options.routeDirection === false) ? options.routeDirection : true
@@ -99,7 +121,7 @@ class TrajectoryMotion extends Base {
       color: options.label.color || '#ffffff',
       lineWidth: (options.label.lineWidth || options.label.lineWidth === 0) ? options.label.lineWidth : 4,
       pixelOffset: (options.label.pixelOffset || options.label.pixelOffset === 0) ? options.label.pixelOffset : 20,
-      backgroundColor: options.label.backgroundColor || ['#42c6ef', '#42c6ef'],
+      backgroundColor: options.label.backgroundColor || ['#00ffff80', '#00ffff80'],
       lineColor: options.label.lineColor || '#00ffff80',
       scaleByDistance: options.label.scaleByDistance || false,
       near: (options.label.near || options.label.near === 0) ? options.label.near : 2000,
@@ -144,37 +166,56 @@ class TrajectoryMotion extends Base {
 
   set show(v) {
     if (typeof v === "boolean") {
-      this.options.show = v
-      if (this.originalOptions) {
-        this.originalOptions.show = v
+      let sdkD = get2DView()
+      if (!this.isShowView || !sdkD) {
+        this.options.show = v
+        if (this.originalOptions) {
+          this.originalOptions.show = v
+        }
       }
-      if (v) {
+      if (this.options.show) {
         if (this.firstPersonView) {
           this.model.show = false
         }
         else {
-          this.model.show = this.modelShow
+          this.model.show = (!this.showView || this.showView == 3 || !sdkD) ? this.modelShow : false
         }
 
-        this.line.polyline.material = this.lineShow ? new Cesium.PolylineDashMaterialProperty({
-          color: new Cesium.Color.fromCssColorString('#00ffff'),
-          dashLength: 20,
-        }) : new Cesium.PolylineDashMaterialProperty({
-          color: new Cesium.Color.fromCssColorString('#00ffff00'),
-          dashLength: 20,
-        })
+        if ((!this.showView || this.showView == 3 || !sdkD)) {
+          this.line.polyline.material = this.lineShow ? new Cesium.PolylineDashMaterialProperty({
+            color: new Cesium.Color.fromCssColorString('#00ffff'),
+            dashLength: 20,
+          }) : new Cesium.PolylineDashMaterialProperty({
+            color: new Cesium.Color.fromCssColorString('#00ffff00'),
+            dashLength: 20,
+          })
+        }
+        else {
+          this.line.polyline.material = new Cesium.PolylineDashMaterialProperty({
+            color: new Cesium.Color.fromCssColorString('#00ffff00'),
+            dashLength: 20,
+          })
+        }
         for (let i = 0; i < this.keyPoints.length; i++) {
-          this.keyPoints[i].show = this.keyPointShow
+          this.keyPoints[i].show = (!this.showView || this.showView == 3 || !sdkD) ? this.keyPointShow : false
         }
         if (this.realTimeRoute) {
-          this.realTimeLine && (this.realTimeLine.show = true)
+          this.realTimeLine && (this.realTimeLine.show = (!this.showView || this.showView == 3 || !sdkD) ? true : false)
         }
-        this.label && (this.label.show = this.options.label.show)
+        this.label && (this.label.show = (!this.showView || this.showView == 3) ? this.options.label.show : false)
+        this.fuelLabel && (this.fuelLabel.show = (!this.showView || this.showView == 3) ? this.options.fuelShow : false)
       }
       else {
-        this.model.show = v
+        this.model.show = (!this.showView || this.showView == 3 || !sdkD) ? this.options.show : false
+        let show = this.options.show
+        if ((!this.showView || this.showView == 3 || !sdkD)) {
+          show = this.options.show
+        }
+        else {
+          show = false
+        }
         this.realTimeLine && (this.realTimeLine.show = false)
-        this.line.polyline.material = v ? new Cesium.PolylineDashMaterialProperty({
+        this.line.polyline.material = show ? new Cesium.PolylineDashMaterialProperty({
           color: new Cesium.Color.fromCssColorString('#00ffff'),
           dashLength: 20,
         }) : new Cesium.PolylineDashMaterialProperty({
@@ -182,9 +223,10 @@ class TrajectoryMotion extends Base {
           dashLength: 20,
         })
         for (let i = 0; i < this.keyPoints.length; i++) {
-          this.keyPoints[i].show = v
+          this.keyPoints[i].show = (!this.showView || this.showView == 3) ? show : false
         }
         this.label && (this.label.show = false)
+        this.fuelLabel && (this.fuelLabel.show = false)
         this.viewFollow = false
       }
 
@@ -193,6 +235,7 @@ class TrajectoryMotion extends Base {
       }
       syncData(this.sdk, this.options.id)
       syncSplitData(this.sdk, this.options.id)
+      this.isShowView = false
     } else {
       console.error("参数必须为boolean")
     }
@@ -238,14 +281,17 @@ class TrajectoryMotion extends Base {
       // Cesium.Matrix4.multiplyByTranslation(this.model.modelMatrix, new Cesium.Cartesian3(0, 0, -difference), this.model.modelMatrix)
       // Cesium.Matrix4.getTranslation(this.model.modelMatrix, this.model.position)
       this.label && (this.label.show = this.label.show)
+      this.fuelLabel && (this.fuelLabel.show = this.fuelLabel.show)
       if (this.options.label.position) {
         setTimeout(() => {
           if (this.options.label.position.alt) {
             this.label && (this.label.position = [this.options.label.position.lng, this.options.label.position.lat, this.options.label.position.alt])
+            this.fuelLabel && (this.fuelLabel.position = [this.options.label.position.lng, this.options.label.position.lat, this.options.label.position.alt])
           }
           else {
             this.getClampToHeight({ lng: this.options.label.position.lng, lat: this.options.label.position.lat }).then((height) => {
               this.label && (this.label.position = [this.options.label.position.lng, this.options.label.position.lat, height])
+              this.fuelLabel && (this.fuelLabel.position = [this.options.label.position.lng, this.options.label.position.lat, height])
             })
           }
         }, 0)
@@ -636,7 +682,7 @@ class TrajectoryMotion extends Base {
         })
         this.TweenAnimate.pause()
         setTimeout(() => {
-          _this.model.isMove = false
+          _this.model && (_this.model.isMove = false)
         }, 200);
       }
     }
@@ -655,9 +701,17 @@ class TrajectoryMotion extends Base {
     return this.options.model.show
   }
   set modelShow(v) {
+    let sdkD = get2DView()
     this.options.model.show = v
+    let show = v
+    if (this.show && (!this.showView || this.showView == 3 || !sdkD)) {
+      show = v
+    }
+    else {
+      show = false
+    }
     if (this.model && this.show) {
-      this.model.show = v
+      this.model.show = show
     }
     this._elms.modelShow && this._elms.modelShow.forEach((item) => {
       item.checked = v
@@ -723,8 +777,16 @@ class TrajectoryMotion extends Base {
       this.realTimeRoute = false
     }
     this.options.line.show = v
+    let show = v
+    let sdkD = get2DView()
+    if ((!this.showView || this.showView == 3 || !sdkD)) {
+      show = v
+    }
+    else {
+      show = false
+    }
     if (this.line && this.show) {
-      this.line.polyline.material = v ? new Cesium.PolylineDashMaterialProperty({
+      this.line.polyline.material = show ? new Cesium.PolylineDashMaterialProperty({
         color: new Cesium.Color.fromCssColorString('#00ffff'),
         dashLength: 20, //短划线长度
       }) : new Cesium.PolylineDashMaterialProperty({
@@ -941,6 +1003,7 @@ class TrajectoryMotion extends Base {
 
   set firstPersonView(v) {
     // this.state = true
+    let sdkD = get2DView()
     let splitSdk = getSdk()
     if (get2DView() || splitSdk.sdkD || !this.show) {
       v = false
@@ -994,7 +1057,14 @@ class TrajectoryMotion extends Base {
     else {
       CameraController(this.sdk, true)
       if (this.model && this.modelShow && this.show) {
-        this.model.show = true
+        let show = true
+        if (this.show && (!this.showView || this.showView == 3 || !sdkD)) {
+          show = true
+        }
+        else {
+          show = false
+        }
+        this.model.show = show
       }
       if (this._DialogObject && this._DialogObject._element.content) {
         let e_firstPerson = this._DialogObject._element.content.querySelectorAll("button[name='firstPerson']")
@@ -1116,19 +1186,30 @@ class TrajectoryMotion extends Base {
   }
   set labelShow(v) {
     this.options.label.show = v
+    let sdkD = get2DView()
+    let show = v
+    if (this.show && (!this.showView || this.showView == 3 || !sdkD)) {
+      show = v
+    }
+    else {
+      show = false
+    }
     if (this.show) {
-      this.label && (this.label.show = v)
-      if (this.options.label.position) {
-        setTimeout(() => {
-          if (this.options.label.position.alt) {
-            this.label && (this.label.position = [this.options.label.position.lng, this.options.label.position.lat, this.options.label.position.alt])
-          }
-          else {
-            this.getClampToHeight({ lng: this.options.label.position.lng, lat: this.options.label.position.lat }).then((height) => {
-              this.label && (this.label.position = [this.options.label.position.lng, this.options.label.position.lat, height])
-            })
-          }
-        }, 0);
+      if (this.label) {
+        this.label.show = show
+        this.label.pixelOffset = this.options.label.pixelOffset + (this.fuelShow ? this.labelFontSize + 20 : 0)
+        if (this.options.label.position) {
+          setTimeout(() => {
+            if (this.options.label.position.alt) {
+              this.label && (this.label.position = [this.options.label.position.lng, this.options.label.position.lat, this.options.label.position.alt])
+            }
+            else {
+              this.getClampToHeight({ lng: this.options.label.position.lng, lat: this.options.label.position.lat }).then((height) => {
+                this.label && (this.label.position = [this.options.label.position.lng, this.options.label.position.lat, height])
+              })
+            }
+          }, 0);
+        }
       }
     }
     else {
@@ -1146,6 +1227,7 @@ class TrajectoryMotion extends Base {
   set labelFontFamily(v) {
     this.options.label.fontFamily = v || 0
     this.label && (this.label.fontFamily = this.options.label.fontFamily)
+    this.fuelLabel && (this.fuelLabel.fontFamily = this.options.label.fontFamily)
 
     let name = getFontFamilyName(this.labelFontFamily) || ''
     this._elms.labelFontFamily &&
@@ -1160,6 +1242,7 @@ class TrajectoryMotion extends Base {
   set labelColor(v) {
     this.options.label.color = v
     this.label && (this.label.color = v)
+    this.fuelLabel && (this.fuelLabel.color = v)
     if (this._elms.labelColor) {
       this._elms.labelColor.forEach((item, i) => {
         let labelColorPicker = new YJColorPicker({
@@ -1187,6 +1270,13 @@ class TrajectoryMotion extends Base {
   set labelFontSize(v) {
     this.options.label.fontSize = v
     this.label && (this.label.fontSize = v)
+    if (this.fuelLabel) {
+      this.fuelLabel.fontSize = v
+      this.label.pixelOffset = this.options.label.pixelOffset + v + 20
+    }
+    else {
+      this.label.pixelOffset = this.options.label.pixelOffset
+    }
     this._elms.labelFontSize && this._elms.labelFontSize.forEach((item) => {
       item.value = v
     })
@@ -1198,6 +1288,7 @@ class TrajectoryMotion extends Base {
   set labelScaleByDistance(v) {
     this.options.label.scaleByDistance = v
     this.label && (this.label.scaleByDistance = v)
+    this.fuelLabel && (this.fuelLabel.scaleByDistance = v)
     this._elms.labelScaleByDistance && this._elms.labelScaleByDistance.forEach((item) => {
       item.checked = v
     })
@@ -1213,6 +1304,7 @@ class TrajectoryMotion extends Base {
     }
     this.options.label.near = near
     this.label && (this.label.near = near)
+    this.fuelLabel && (this.fuelLabel.near = near)
     this._elms.labelNear && this._elms.labelNear.forEach((item) => {
       item.value = near
     })
@@ -1228,11 +1320,66 @@ class TrajectoryMotion extends Base {
     }
     this.options.label.far = far
     this.label && (this.label.far = far)
+    this.fuelLabel && (this.fuelLabel.far = far)
     this._elms.labelFar && this._elms.labelFar.forEach((item) => {
       item.value = far
     })
   }
 
+  get unitFuelConsumption() {
+    return this.options.unitFuelConsumption
+  }
+
+  set unitFuelConsumption(v) {
+    this.options.unitFuelConsumption = v
+    this._elms.unitFuelConsumption && this._elms.unitFuelConsumption.forEach((item) => {
+      item.value = v
+    })
+  }
+
+  get fuelShow() {
+    return this.options.fuelShow
+  }
+
+  set fuelShow(v) {
+    this.options.fuelShow = v
+    let show = v
+    if (this.show && (!this.showView || this.showView == 3)) {
+      show = v
+    }
+    else {
+      show = false
+    }
+    if (this.show) {
+      if (this.fuelLabel) {
+        this.fuelLabel.show = show
+        this.label.pixelOffset = this.options.label.pixelOffset + (show ? this.labelFontSize + 20 : 0)
+      }
+      else {
+        this.label.pixelOffset = this.options.label.pixelOffset
+      }
+      if (this.options.label.position) {
+        setTimeout(() => {
+          if (this.options.label.position.alt) {
+            this.fuelLabel && (this.fuelLabel.position = [this.options.label.position.lng, this.options.label.position.lat, this.options.label.position.alt])
+          }
+          else {
+            this.getClampToHeight({ lng: this.options.label.position.lng, lat: this.options.label.position.lat }).then((height) => {
+              this.fuelLabel && (this.fuelLabel.position = [this.options.label.position.lng, this.options.label.position.lat, height])
+            })
+          }
+        }, 0);
+      }
+    }
+    else {
+      this.fuelLabel && (this.fuelLabel.show = false)
+      this.label.pixelOffset = this.options.label.pixelOffset
+    }
+    this._elms.fuelShow && this._elms.fuelShow.forEach((item) => {
+      item.checked = v
+    })
+  }
+
   // 创建路径
   static addLine(that) {
     let positions_smooth = that.renewLinePositions(that.options.line.positions)
@@ -1351,6 +1498,7 @@ class TrajectoryMotion extends Base {
     }
     let pos = that.smooth ? that.positions_smooth : Cesium.Cartesian3.fromDegreesArrayHeights(fromDegreesArrayHeights)
     TrajectoryMotion.createLabel(that)
+    TrajectoryMotion.createFuelLabel(that)
     that.modelMove(pos)
 
 
@@ -1360,13 +1508,13 @@ class TrajectoryMotion extends Base {
   static async createLabel(that) {
     let labelPosition = that.cartesian3Towgs84(that.model.position, that.sdk.viewer)
     that.label = new LabelObject(that.sdk, {
-      show: that.options.show ? (that.options.model.show ? that.options.label.show : false) : false,
+      show: that.options.show ? (that.options.label.show ? true : false) : false,
       position: [labelPosition.lng, labelPosition.lat, labelPosition.alt],
       text: that.options.name,
       fontSize: that.options.label.fontSize,
       fontFamily: that.options.label.fontFamily,
       color: that.options.label.color,
-      pixelOffset: that.options.label.pixelOffset,
+      pixelOffset: that.options.label.pixelOffset + (that.options.fuelShow ? that.options.label.fontSize + 20 : 0),
       backgroundColor: that.options.label.backgroundColor,
       lineColor: that.options.label.lineColor,
       lineWidth: that.options.label.lineWidth,
@@ -1376,6 +1524,26 @@ class TrajectoryMotion extends Base {
     }, that.model)
   }
 
+  static async createFuelLabel(that) {
+    let labelPosition = that.cartesian3Towgs84(that.model.position, that.sdk.viewer)
+    that.fuelLabel = new LabelObject(that.sdk, {
+      show: that.options.show ? (that.options.fuelShow ? true : false) : false,
+      // show: true,
+      position: [labelPosition.lng, labelPosition.lat, labelPosition.alt],
+      text: '总油耗:',
+      fontSize: that.options.label.fontSize,
+      fontFamily: that.options.label.fontFamily,
+      color: that.options.label.color,
+      pixelOffset: 0,
+      backgroundColor: ['#6e6e6e', '#6e6e6e'],
+      lineColor: '#00ffff00',
+      lineWidth: 0,
+      scaleByDistance: that.options.label.scaleByDistance,
+      near: that.options.label.near,
+      far: that.options.label.far
+    }, that.model)
+  }
+
   // 创建关键点
   static async addKeyPoint(that) {
     for (let i = 0; i < that.options.line.positions.length; i++) {
@@ -1481,7 +1649,7 @@ class TrajectoryMotion extends Base {
       setPosition(startDistance)
       setTimeout(() => {
         _this.model.isMove = false
-      }, 500);
+      }, 1000);
 
 
       animateUpdate()
@@ -1504,6 +1672,8 @@ class TrajectoryMotion extends Base {
     }
 
     async function setPosition(distance) {
+      _this.totalFuelConsumption = Number((distance / 100 * _this.unitFuelConsumption).toFixed(2))
+      _this.fuelLabel.text = '总油耗:' + _this.totalFuelConsumption + ' L'
       _this.model.isMove = true
       let sdk2D = get2DView()
       let splitSdk = getSdk()
@@ -1615,9 +1785,10 @@ class TrajectoryMotion extends Base {
         if (!cartesian3) {
           return
         }
-        coordinates = _this.cartesian3Towgs84(cartesian3, viewer);
+        let pos84 = _this.cartesian3Towgs84(cartesian3, viewer);
+        coordinates = [pos84.lng, pos84.lat, pos84.alt + 1.8]
         position = cartesian3
-        positionCamera = Cesium.Cartesian3.fromDegrees(coordinates.lng, coordinates.lat, coordinates.alt + 1.8)
+        positionCamera = Cesium.Cartesian3.fromDegrees(coordinates[0], coordinates[1], coordinates[2])
         let positions_smooth = []
         for (let i = 0; i <= 1000; i++) {
           if ((i / 1000) > (distance / _this.distance)) {
@@ -1715,6 +1886,7 @@ class TrajectoryMotion extends Base {
       }
       let labelPosition = _this.cartesian3Towgs84(position, _this.sdk.viewer)
       _this.label.position = [labelPosition.lng, labelPosition.lat, labelPosition.alt]
+      _this.fuelLabel.position = [labelPosition.lng, labelPosition.lat, labelPosition.alt]
       lastDistance = distance
       // console.log(position)
       _this.realTimeRouteArray.push(position)
@@ -1740,7 +1912,7 @@ class TrajectoryMotion extends Base {
           else {
             if (_this.sdk.viewer.trackedEntity) {
               _this.sdk.viewer.camera.setView({
-                destination: Cesium.Cartesian3.fromDegrees(coordinates.lng, coordinates.lat, _this.sdk.viewer.camera.positionCartographic.height),
+                destination: Cesium.Cartesian3.fromDegrees(coordinates[0], coordinates[1], _this.sdk.viewer.camera.positionCartographic.height),
                 orientation: {
                   heading: Cesium.Math.toRadians(-90),
                   pitch: 0,
@@ -1888,10 +2060,10 @@ class TrajectoryMotion extends Base {
           this.tip && this.tip.destroy()
           this.tip = null
           this.ControllerObject.destroy()
-          if(this.firstPersonView !== this.originalOptions.firstPersonView) {
+          if (this.firstPersonView !== this.originalOptions.firstPersonView) {
             this.firstPersonView = this.originalOptions.firstPersonView;
           }
-          if(this.firstPersonView && this.modelShow) {
+          if (this.firstPersonView && this.modelShow) {
             this.model && (this.model.show = false)
           }
         },
@@ -2036,7 +2208,7 @@ class TrajectoryMotion extends Base {
       rubricElm.style.color = '#ff5733';
       rubricElm.style.display = 'none'
 
-      rubricElm.innerHTML = `场景正北方向为轨迹前进正方向<div x-arrow="" class="custom__popper__arrow" style="left: 59px;"></div>`
+      rubricElm.innerHTML = `场景正东方向为轨迹前进正方向<div x-arrow="" class="custom__popper__arrow" style="left: 59px;"></div>`
       let iconRubric = contentElm.getElementsByClassName('icon-rubric')[0]
       iconRubric.addEventListener('mouseenter', (e) => {
         rubricElm.style.display = 'block'
@@ -2111,6 +2283,7 @@ class TrajectoryMotion extends Base {
     this.sdk.viewer.entities.remove(this.line)
     this.sdk.viewer.entities.remove(this.realTimeLine)
     this.label && this.label.remove()
+    this.fuelLabel && this.fuelLabel.remove()
     for (let i = 0; i < this.keyPointShow.length; i++) {
       this.sdk.viewer.entities.remove(this.keyPointShow[i])
     }
@@ -2118,6 +2291,7 @@ class TrajectoryMotion extends Base {
     this.realTimeLine = null
     this.model = null
     this.label = null
+    this.fuelLabel = null
     if (this._DialogObject && !this._DialogObject.isDestroy) {
       this._DialogObject.close()
       this._DialogObject = null
@@ -2164,13 +2338,14 @@ class TrajectoryMotion extends Base {
     this.modelAnimate = this.originalOptions.model.animate;
     this.delay = this.originalOptions.delay;
     (this.ground !== this.originalOptions.ground) && (this.ground = this.originalOptions.ground);
-    if(this.firstPersonView !== this.originalOptions.firstPersonView) {
+    if (this.firstPersonView !== this.originalOptions.firstPersonView) {
       this.firstPersonView = this.originalOptions.firstPersonView;
     }
-    if(this.firstPersonView && this.modelShow) {
+    if (this.firstPersonView && this.modelShow) {
       this.model && (this.model.show = false)
     }
     this.labelShow = this.originalOptions.label.show
+    this.fuelLabelShow = this.originalOptions.fuelShow
     this.labelColor = this.originalOptions.label.color
     this.labelFontSize = this.originalOptions.label.fontSize
     this.labelFontFamily = this.originalOptions.label.fontFamily
@@ -2229,7 +2404,6 @@ class TrajectoryMotion extends Base {
           this._DialogObject._element.content.getElementsByClassName('model-rotate-btn')[0].innerHTML = '结束调整'
           this._DialogObject._element.content.getElementsByClassName('model-rotate-btn')[0].className = 'btn model-rotate-btn is-active'
         }
-        console.log(this._DialogObject._element.content, this._DialogObject._element.content.getElementsByClassName('model-rotate-btn')[0])
         this.state = false
         this.editObj = new EditGltf(this.sdk, this.model)
         this.editObj.editRtation()

src/Obj/Base/WallRealStereoscopic/eventBinding.js

@@ -21,6 +21,7 @@ class eventBinding {
       let Event = []
       let isEvent = false
       let removeName = []
+      let blurEvent = ()=>{}
       if (!elements[i] ||!elements[i].attributes) {
         continue; 
       }
@@ -37,14 +38,14 @@ class eventBinding {
                 let value = e.target.value
                 if (e.target.type == 'number') {
                   if (e.data != '.' && (e.data != '-' || e.target.value)) {
-                    value = Number(value)
-                    if((e.target.max) && value>Number(e.target.max)) {
+                    let v = Number(value)
+                    if((e.target.max) && v>Number(e.target.max)) {
                       value = Number(e.target.max)
                     }
-                    if((e.target.min) && value<Number(e.target.min)) {
+                    if((e.target.min) && v<Number(e.target.min)) {
                       value = Number(e.target.min)
                     }
-                    if((e.target.dataset.min) && value<Number(e.target.dataset.min)) {
+                    if((e.target.dataset.min) && v<Number(e.target.dataset.min)) {
                       value = Number(e.target.dataset.min)
                     }
                     that[m.value] = value
@@ -54,6 +55,22 @@ class eventBinding {
                   that[m.value] = value
                 }
               })
+              blurEvent = (e) => {
+                let value = e.target.value
+                if ((e.target.type == 'number') && (e.target.value || (e.target.dataset.null !== 'undefined' && e.target.dataset.null !== '' && !Boolean(e.target.dataset.null)))) {
+                  value = Number(value)
+                  if ((e.target.max) && value > Number(e.target.max)) {
+                    value = Number(e.target.max)
+                  }
+                  if ((e.target.min) && value < Number(e.target.min)) {
+                    value = Number(e.target.min)
+                  }
+                  if ((e.target.dataset.min) && value < Number(e.target.dataset.min)) {
+                    value = Number(e.target.dataset.min)
+                  }
+                }
+                that[m.value] = value
+              }
               if(elements[i].nodeName=='IMG') {
                 elements[i].src = that[m.value]
               }
@@ -111,6 +128,9 @@ class eventBinding {
             Event[t](e)
           }
         });
+        elements[i].addEventListener('blur', (e) => {
+          blurEvent(e)
+        });
       }
     }
   }

src/Obj/Base/WallRealStereoscopic/index.js

@@ -29,13 +29,47 @@ class WallRealStereoscopic extends Base {
    * @param options.color="#ffffff" {string} 颜色
    * @param options.width=0.24 {number} 宽
    * @param options.show=true {boolean} 显隐
-   * @param options['nose-to-tail']=false {boolean} 首尾相连
+   * @param options.noseToTail=false {boolean} 首尾相连
    * @param options.extrudedHeight=2.4 {number} 拉伸高度
    * @param options.cornerType=0 {string} 拐角类型;0：直角；1：斜角；2：圆角
    * @param options.material=0 {number} 材质，0：纯色墙；1：红砖；2：黄砖；3：灰瓷
-   * @param {Array.<object>} positions 经纬度和高度的列表，值交替 [{lon,lat,alt},...]
-   * @param _Dialog {object} 弹框事件
-   * @param _Dialog.confirmCallBack {function} 弹框确认时的回调
+   * @param {Array.<object>} options.positions 必填，经纬度和高度的列表，值交替 [{lon,lat,alt},...]
+   * @param options.positions[].lng {number} 经度
+   * @param options.positions[].lat {number} 纬度
+   * @param options.positions[].alt {number} 高度
+   * @param options.label {object} 标签对象
+   * @param options.label.text {string} 标签文本
+   * @param options.label.show {string} 标签显隐
+   * @param options.label.position {string} 标签位置
+   * @param options.label.position {object} 标签位置
+   * @param options.label.position.lng {number} 经度
+   * @param options.label.position.lat {number} 纬度
+   * @param options.label.position.alt {number} 高度
+   * @param options.label.fontSize=20 {number} 字体大小
+   * @param options.label.fontFamily=0 {number} 字体项 0：黑体；1：思源黑体；2：庞门正道标题体；3：数黑体
+   * @param options.label.color=#ffffff {string} 字体颜色
+   * @param options.label.lineWidth=4 {number} 引线宽
+   * @param options.label.lineColor=#00ffff80 {string} 引线颜色
+   * @param options.label.pixelOffset=20 {number} 字体偏移(引线长度)
+   * @param options.label.backgroundColor=['#00ffff80', '#00ffff80'] {array} 背景颜色
+   * @param options.label.scaleByDistance {boolean} 距离缩放
+   * @param options.label.near=2000 {number} 视野缩放最近距离
+   * @param options.label.far=100000 {number} 视野缩放最远距离
+   * @param options.attribute {object} 属性内容
+   * @param {object} options.attribute.link={} 链接
+   * @param options.attribute.link.content=[]] {array} 链接内容
+   * @param options.attribute.link.content[].name {string} 链接名称
+   * @param options.attribute.link.content[].url {string} 链接地址
+   * @param options.richTextContent {string} 富文本内容
+   * @param options.customView {object} 默认视角
+   * @param options.customView.orientation {object} 默认视角方位
+   * @param options.customView.orientation.heading {number} 航向角
+   * @param options.customView.orientation.pitch {number} 俯仰角
+   * @param options.customView.orientation.roll {number} 翻滚角
+   * @param options.customView.relativePosition {object} 视角相对位置
+   * @param options.customView.relativePosition.lng {number} 经度
+   * @param options.customView.relativePosition.lat {number} 纬度
+   * @param options.customView.relativePosition.alt {number} 高度
    * */
   constructor(sdk, options, _Dialog = {}) {
     super(sdk, options);
@@ -253,7 +287,7 @@ class WallRealStereoscopic extends Base {
   }
   set labelShow(v) {
     this.options.label.show = v
-    if (this.show) {
+    if (this.show && !this.showView || this.showView == 3) {
       this.label.show = v
     }
     else {

src/Obj/Base/WallRealStereoscopic/index2.js

@@ -157,7 +157,7 @@ class WallStereoscopic extends Base {
   }
   set labelShow(v) {
     this.options.label.show = v
-    if (this.show) {
+    if (this.show && !this.showView || this.showView == 3) {
       this.label.show = v
     }
     else {

src/Obj/Base/WallRealStereoscopic2/index.js

@@ -243,7 +243,7 @@ class WallRealStereoscopic extends Base {
   }
   set labelShow(v) {
     this.options.label.show = v
-    if (this.show) {
+    if (this.show && !this.showView || this.showView == 3) {
       this.label.show = v
     }
     else {

src/Obj/Base/WallStereoscopic/eventBinding.js

@@ -21,8 +21,9 @@ class eventBinding {
       let Event = []
       let isEvent = false
       let removeName = []
-      if (!elements[i] ||!elements[i].attributes) {
-        continue; 
+      let blurEvent = () => { }
+      if (!elements[i] || !elements[i].attributes) {
+        continue;
       }
       for (let m of elements[i].attributes) {
         switch (m.name) {
@@ -37,11 +38,11 @@ class eventBinding {
                 let value = e.target.value
                 if (e.target.type == 'number') {
                   if (e.data != '.' && (e.data != '-' || e.target.value)) {
-                    value = Number(value)
-                    if((e.target.max) && value>Number(e.target.max)) {
+                    let v = Number(value)
+                    if ((e.target.max) && v > Number(e.target.max)) {
                       value = Number(e.target.max)
                     }
-                    if((e.target.min) && value<Number(e.target.min)) {
+                    if ((e.target.min) && v < Number(e.target.min)) {
                       value = Number(e.target.min)
                     }
                     that[m.value] = value
@@ -51,14 +52,32 @@ class eventBinding {
                   that[m.value] = value
                 }
               })
-              if(elements[i].nodeName=='IMG') {
+              blurEvent = (e) => {
+                let value = e.target.value
+                if ((e.target.type == 'number') && (e.target.value || (e.target.dataset.null !== 'undefined' && e.target.dataset.null !== '' && !Boolean(e.target.dataset.null)))) {
+                  value = Number(value)
+                  if ((e.target.max) && value > Number(e.target.max)) {
+                    value = Number(e.target.max)
+                  }
+                  if ((e.target.min) && value < Number(e.target.min)) {
+                    value = Number(e.target.min)
+                  }
+                  if ((e.target.dataset.min) && value < Number(e.target.dataset.min)) {
+                    value = Number(e.target.dataset.min)
+                  }
+                }
+                that[m.value] = value
+              }
+
+
+              if (elements[i].nodeName == 'IMG') {
                 elements[i].src = that[m.value]
               }
               else {
                 elements[i].value = that[m.value]
               }
             }
-            if(this.element[m.value]) {
+            if (this.element[m.value]) {
               this.element[m.value].push(elements[i])
             }
             else {
@@ -81,7 +100,7 @@ class eventBinding {
             isEvent = true
             Event.push((e) => {
               let value = e.target.value
-              if(e.target.type == 'number' && value!='') {
+              if (e.target.type == 'number' && value != '') {
                 value = Number(value)
                 e.target.value = value
               }
@@ -94,7 +113,7 @@ class eventBinding {
         }
         // elements[i].attributes[m] = undefined
       }
-      for(let n=0;n<removeName.length;n++) {
+      for (let n = 0; n < removeName.length; n++) {
         elements[i].attributes.removeNamedItem(removeName[n])
       }
 
@@ -108,6 +127,9 @@ class eventBinding {
             Event[t](e)
           }
         });
+        elements[i].addEventListener('blur', (e) => {
+          blurEvent(e)
+        });
       }
     }
   }

src/Obj/Base/WallStereoscopic/index.js

@@ -23,12 +23,46 @@ class WallStereoscopic extends Base {
    * @param options.color="#00d9ff" {string} 颜色
    * @param options.show=true {boolean} 显隐
    * @param options.extrudedHeight=2.4 {number} 拉伸高度
-   * @param options['nose-to-tail']=false {boolean} 首尾相连
+   * @param options.noseToTail=false {boolean} 首尾相连
    * @param options.material=0 {number} 材质，0：纯色墙；1：上升墙；2：箭头墙；3：警戒墙
    * @param options.duration=1000 {number} 持续时间
-   * @param {Array.<object>} positions 经纬度和高度的列表，值交替 [{lon,lat,alt},...]
-   * @param _Dialog {object} 弹框事件
-   * @param _Dialog.confirmCallBack {function} 弹框确认时的回调
+   * @param {Array.<object>} options.positions 必填，经纬度和高度的列表，值交替 [{lon,lat,alt},...]
+   * @param options.positions[].lng {number} 经度
+   * @param options.positions[].lat {number} 纬度
+   * @param options.positions[].alt {number} 高度
+   * @param options.label {object} 标签对象
+   * @param options.label.text {string} 标签文本
+   * @param options.label.show {string} 标签显隐
+   * @param options.label.position {string} 标签位置
+   * @param options.label.position {object} 标签位置
+   * @param options.label.position.lng {number} 经度
+   * @param options.label.position.lat {number} 纬度
+   * @param options.label.position.alt {number} 高度
+   * @param options.label.fontSize=20 {number} 字体大小
+   * @param options.label.fontFamily=0 {number} 字体项 0：黑体；1：思源黑体；2：庞门正道标题体；3：数黑体
+   * @param options.label.color=#ffffff {string} 字体颜色
+   * @param options.label.lineWidth=4 {number} 引线宽
+   * @param options.label.lineColor=#00ffff80 {string} 引线颜色
+   * @param options.label.pixelOffset=20 {number} 字体偏移(引线长度)
+   * @param options.label.backgroundColor=['#00ffff80', '#00ffff80'] {array} 背景颜色
+   * @param options.label.scaleByDistance {boolean} 距离缩放
+   * @param options.label.near=2000 {number} 视野缩放最近距离
+   * @param options.label.far=100000 {number} 视野缩放最远距离
+   * @param options.attribute {object} 属性内容
+   * @param {object} options.attribute.link={} 链接
+   * @param options.attribute.link.content=[]] {array} 链接内容
+   * @param options.attribute.link.content[].name {string} 链接名称
+   * @param options.attribute.link.content[].url {string} 链接地址
+   * @param options.richTextContent {string} 富文本内容
+   * @param options.customView {object} 默认视角
+   * @param options.customView.orientation {object} 默认视角方位
+   * @param options.customView.orientation.heading {number} 航向角
+   * @param options.customView.orientation.pitch {number} 俯仰角
+   * @param options.customView.orientation.roll {number} 翻滚角
+   * @param options.customView.relativePosition {object} 视角相对位置
+   * @param options.customView.relativePosition.lng {number} 经度
+   * @param options.customView.relativePosition.lat {number} 纬度
+   * @param options.customView.relativePosition.alt {number} 高度
    * */
   constructor(sdk, options, _Dialog = {}) {
     super(sdk, options);
@@ -88,6 +122,10 @@ class WallStereoscopic extends Base {
     }
   }
 
+  get type() {
+    return 'wallStereoscopic'
+  }
+
   static createLabel(that) {
     // 标签
     that.label = new LabelObject(that.sdk, {
@@ -191,7 +229,7 @@ class WallStereoscopic extends Base {
   }
   set labelShow(v) {
     this.options.label.show = v
-    if (this.show) {
+    if (this.show && !this.showView || this.showView == 3) {
       this.label.show = v
     }
     else {

src/Obj/Base/WaterSurface/eventBinding.js

@@ -35,7 +35,8 @@ class eventBinding {
             else {
               Event.push((e) => {
                 let value = e.target.value
-                if (e.target.type == 'number') {
+                let str = e.target.value + ''
+                if (e.target.type == 'number' && !(str.charAt(str.length - 1) == '0' && e.target.value.toString().includes('.'))) {
                   value = Number(value)
                 }
                 that[m.value] = value

src/Obj/Base/WaterSurface/index.js

@@ -15,14 +15,17 @@ class WaterSurface extends Base {
    * @param sdk 
    * @description 水面
    * @param options {object} 面属性
+   * @param options.id {string} 唯一标识
+   * @param options.show=true {boolean} 显隐
    * @param options.name=未命名对象 {string} 名称
-   * @param options.positions {Array.<{lng:number, lat:number, alt:number}>} 坐标数组
+   * @param {Array.<object>} options.positions 坐标列表
+   * @param options.positions[].lng {number} 经度
+   * @param options.positions[].lat {number} 纬度
+   * @param options.positions[].alt {number} 高度
    * @param options.color=rgba(32,67,135,0.5) {string} 颜色
-   * @param options.frequency=100 {number} 频率
-   * @param options.animationSpeed=0.02 {number} 动画速度
+   * @param options.frequency=10 {number} 频率
+   * @param options.animationSpeed=1 {number} 动画速度
    * @param options.amplitude=10 {number} 振幅
-   * @param Dialog {object} 弹框对象
-   * @param Dialog.confirmCallBack {function} 弹框确认时的回调
    * */
   constructor(sdk, options = {}, _Dialog = {}) {
     super(sdk, options);

src/Obj/Base/index.js

@@ -9,11 +9,14 @@ import Tools from "../../Tools";
 import { getHost, getToken } from "../../on";
 import { regLeftClickCallback, regRightClickCallback, regMoveCallback } from "../../Global/ClickCallback";
 import { regLeftClickCallback as regLeftClickCallback2, regRightClickCallback as regRightClickCallback2, regMoveCallback as regMoveCallback2 } from "../../Global/SplitScreen/ClickCallback";
+import { regLeftClickCallback as regLeftClickCallback3, regRightClickCallback as regRightClickCallback3, regMoveCallback as regMoveCallback3 } from "../../Global/MultiViewportMode/ClickCallback";
 import { setSplitDirection, syncSplitData, getSdk } from "../../Global/SplitScreen";
-import { syncData } from '../../Global/MultiViewportMode'
+import { syncData, getSdk as get2DSdk } from '../../Global/MultiViewportMode'
 import { setActiveViewer, closeRotateAround, closeViewFollow } from '../../Global/global'
 
 class Base extends Tools {
+  #_showView
+  #_isShowView
   constructor(sdk, options = {}) {
     super(sdk, options);
     if (!sdk || !sdk.viewer) {
@@ -29,6 +32,7 @@ class Base extends Tools {
     this.rightClickCallBack = null
     this.picking = true
     this.options.host = this.options.host || getHost()
+    // this.#_showView = this.options.showView || 0
     this.setDefaultValue()
 
     // this.sdk.addIncetance(this.options.id, this)
@@ -55,6 +59,60 @@ class Base extends Tools {
   //   setSplitDirection(this._splitDirection, this.options.id)
   // }
 
+  get showView() {
+    return this.#_showView
+  }
+
+  set showView(v) {
+
+
+    let sdk2D = get2DSdk().sdkD
+    if (!sdk2D) {
+      this.#_showView = v
+      if (this.entity) {
+        this.entity._showView = v
+      }
+      return
+    }
+    if (this.sdk === sdk2D) {
+      this.#_showView = 0
+      return
+    }
+    if (!this.#_showView && !this.show) {
+      return
+    }
+    if (this.sdk === sdk2D) {
+      this.#_showView = 0
+      return
+    }
+    if (v != 2 && v != 3) {
+      this.#_showView = 0
+    }
+    else {
+      this.#_showView = v
+    }
+
+    this.isShowView = true
+
+    // if(!this.show) {
+    //   return
+    // }
+
+    if (!this.#_showView) {
+      this.show = true
+    }
+    else {
+      if (v == 2) {
+        this.show = false
+      }
+      else {
+        this.show = true
+      }
+    }
+  }
+
+
+
   get name() {
     return this.options.name
   }
@@ -72,19 +130,60 @@ class Base extends Tools {
 
   set show(v) {
     if (typeof v === "boolean") {
-      this.options.show = v
-      if (this.originalOptions) {
-        this.originalOptions.show = v
+      let sdkD = get2DSdk().sdkD
+      if (!this.isShowView || !sdkD) {
+        this.options.show = v
+        if (this.originalOptions) {
+          this.originalOptions.show = v
+        }
       }
-      this.entity && (this.entity.show = v)
+      this.entity && (this.entity._showView = this.showView)
+      if (this.type == 'layer') {
+        if (this.entity) {
+          this.entity._objectState = this.options.show
+        }
+      }
+      if (!this.showView || this.showView == 3 || !sdkD) {
+        this.entity && (this.entity.show = this.options.show)
+        if (this.options.label && this.options.label.show && this.label) {
+          this.label.show = this.options.show
+        }
+      }
+      else {
+        this.entity && (this.entity.show = false)
+        if (this.options.label && this.options.label.show && this.label) {
+          this.label.show = false
+        }
+      }
+
       if (this._DialogObject && this._DialogObject.showBtn) {
-        this._DialogObject.showBtn.checked = v
-      }
-      if (this.options.label && this.options.label.show && this.label) {
-        this.label.show = v
+        this._DialogObject.showBtn.checked = this.options.show
       }
+
+
       syncData(this.sdk, this.options.id)
       syncSplitData(this.sdk, this.options.id)
+      this.isShowView = false
+
+      if (this.type == 'layer' && sdkD) {
+        let layer2d = sdkD.viewer.imageryLayers._layers[this.layerIndex]
+        let layer3d = this.entity
+
+        if (!layer2d) {
+          return
+        }
+        if (layer3d._objectState) {
+          if (!layer3d._showView || layer3d._showView == 2) {
+            layer2d.show = true
+          }
+          if (layer3d._showView == 3) {
+            layer2d.show = false
+          }
+        }
+        else {
+          layer2d.show = this.options.show
+        }
+      }
     } else {
       console.error("参数必须为boolean")
     }
@@ -192,7 +291,7 @@ class Base extends Tools {
       let destination = Cesium.Cartesian3.fromDegrees(lng, lat, alt)
 
       let position = { lng: 0, lat: 0 }
-      if (this.options.position) {
+      if (this.options.position && Object.prototype.toString.call(this.options.position) === '[object Object]') {
         position = { ...this.options.position }
       }
       else if (this.options.positions) {
@@ -263,12 +362,17 @@ class Base extends Tools {
       console.error('val:', val, '不是一个function')
     } else {
       let sdkD = getSdk().sdkD
-      if(sdkD && this.sdk === sdkD) {
+      let sdk2D = get2DSdk().sdkD
+      if (sdkD && this.sdk === sdkD) {
         if (this.clickCallBack == null && this.options && this.options.id) {
           regLeftClickCallback2(this.options.id, this.leftClickCB, this)
         }
       }
-      else {
+      else if (sdk2D && this.sdk === sdk2D) {
+        if (this.clickCallBack == null && this.options && this.options.id) {
+          regLeftClickCallback3(this.options.id, this.leftClickCB, this)
+        }
+      } else {
         if (this.clickCallBack == null && this.options && this.options.id) {
           regLeftClickCallback(this.options.id, this.leftClickCB, this)
         }
@@ -286,12 +390,17 @@ class Base extends Tools {
       console.error('val:', val, '不是一个function')
     } else {
       let sdkD = getSdk().sdkD
-      if(sdkD && this.sdk === sdkD) {
+      let sdk2D = get2DSdk().sdkD
+      if (sdkD && this.sdk === sdkD) {
         if (this.rightClickCallBack == null && this.entity && this.entity.id) {
           regRightClickCallback2(this.entity.id, this.rightClickCB, this)
         }
       }
-      else {
+      else if (sdk2D && this.sdk === sdk2D) {
+        if (this.clickCallBack == null && this.options && this.options.id) {
+          regRightClickCallback3(this.options.id, this.leftClickCB, this)
+        }
+      } else {
         if (this.rightClickCallBack == null && this.entity && this.entity.id) {
           regRightClickCallback(this.entity.id, this.rightClickCB, this)
         }
@@ -309,12 +418,17 @@ class Base extends Tools {
       console.error('val:', val, '不是一个function')
     } else {
       let sdkD = getSdk().sdkD
-      if(sdkD && this.sdk === sdkD) {
+      let sdk2D = get2DSdk().sdkD
+      if (sdkD && this.sdk === sdkD) {
         if (this.mouseMoveCallBack == null && this.entity && this.entity.id) {
           regMoveCallback2(this.entity.id, this.mouseMoveCB, this)
         }
       }
-      else {
+      else if (sdk2D && this.sdk === sdk2D) {
+        if (this.clickCallBack == null && this.options && this.options.id) {
+          regMoveCallback3(this.options.id, this.leftClickCB, this)
+        }
+      } else {
         if (this.mouseMoveCallBack == null && this.entity && this.entity.id) {
           regMoveCallback(this.entity.id, this.mouseMoveCB, this)
         }
@@ -338,7 +452,7 @@ class Base extends Tools {
 
       let position = { lng: 0, lat: 0 }
       let relativePosition = { ...cameraPosition84 }
-      if (this.options.position) {
+      if (this.options.position && Object.prototype.toString.call(this.options.position) === '[object Object]') {
         position = { ...this.options.position }
       }
       else if (this.options.positions) {

src/Obj/Element/Dialog/eventBinding.js

@@ -45,8 +45,14 @@ class EventBinding {
                     let value = e.target.value
                     value = Number(value)
                     if (e.data != '.' && (e.data != '-' || e.target.value)) {
-                      if (((!e.target.max) && (!e.target.min)) || ((value <= Number(e.target.max)) && value >= Number(e.target.min))) {
-                        that[m.value] = value
+                      if ((e.target.max) && value > Number(e.target.max)) {
+                        value = Number(e.target.max)
+                      }
+                      if ((e.target.min) && value < Number(e.target.min)) {
+                        value = Number(e.target.min)
+                      }
+                      if ((e.target.dataset.min) && value < Number(e.target.dataset.min)) {
+                        value = Number(e.target.dataset.min)
                       }
                     }
                   }

src/Obj/Element/Dialog/index.js

@@ -2,13 +2,10 @@ import BaseDialog from '../../../BaseDialog';
 
 class Dialog extends BaseDialog {
   constructor(sdk, info, options, only) {
-    super(sdk.viewer._container, options);
+    super(sdk.viewer._container, options, only);
     this.sdk = sdk
     this.viewer = sdk.viewer
     this.info = info
-    if (only) {
-      this.closeAll()
-    }
     this._init()
   }
 

src/Obj/Element/cy_html_tabs.js

@@ -1,6 +1,13 @@
 class cy_tabs {
-  constructor(id, clickTabCallBack, sdk) {
-    let elm = document.getElementById(id);
+  constructor(boxElm, clickTabCallBack, sdk) {
+    let elm
+    if(typeof boxElm === 'string') {
+      elm = document.getElementById(boxElm);
+    }
+    else {
+      elm = boxElm
+    }
+    // let elm = document.getElementById(id);
     let pane = elm.getElementsByTagName('DIV-cy-tab-pane')
 
     let tabTop = `<div class="DIV-cy-tab-top">`
@@ -37,7 +44,9 @@
     tabContent = tabContent + `</div>`
 
     let BoxElm = document.createElement('div');
-    BoxElm.setAttribute('id', id)
+    if(typeof boxElm === 'string') {
+      BoxElm.setAttribute('id', boxElm)
+    }
     BoxElm.setAttribute('class', 'DIV-cy-tabs')
     BoxElm.innerHTML = tabTop + tabContent
     elm.parentNode.insertBefore(BoxElm, elm);

src/Obj/Element/elm_html.js

@@ -100,7 +100,7 @@ function attributeElm(that) {
                   let tr = `
                     <div class="tr">
                       <div class="td">
-                        <input type="checkbox" value="${'ID' in data.data.list[i] ? data.data.list[i].ID : data.data.list[i].id}">
+                        <input type="checkbox" value="${data.data.list[i].deviceId}">
                         <span>绑定</span>
                       </div>
                       <div class="td">${data.data.list[i].cameraName}</div>
@@ -126,11 +126,8 @@ function attributeElm(that) {
                     }
                     else {
                       let newArray = that.attributeCamera.filter((item) => {
-                        if ('ID' in data.data.list[i]) {
-                          return item.ID !== data.data.list[i].ID
-                        }
-                        else {
-                          return item.id !== data.data.list[i].id
+                        if ('deviceId' in data.data.list[i]) {
+                          return item.deviceId !== data.data.list[i].deviceId
                         }
                       })
                       that.attributeCamera = newArray
@@ -139,7 +136,7 @@ function attributeElm(that) {
                   tableContent.appendChild(trElm)
 
                   for (let m = 0; m < that.attributeCamera.length; m++) {
-                    if (('ID' in data.data.list[i]) ? (that.attributeCamera[m].ID === data.data.list[i].ID) : (that.attributeCamera[m].id === data.data.list[i].id)) {
+                    if (('deviceId' in data.data.list[i]) ? (that.attributeCamera[m].deviceId === data.data.list[i].deviceId):false) {
                       checkbox.checked = true
                       break
                     }
@@ -200,17 +197,9 @@ function attributeElm(that) {
                   for (let i = that.attributeCamera.length - 1; i >= 0; i--) {
                     let flag = false
                     for (let m = 0; m < data.data.list.length; m++) {
-                      if ('ID' in data.data.list[m]) {
-                        if (that.attributeCamera[i].ID === data.data.list[m].ID) {
-                          flag = true
-                          break
-                        }
-                      }
-                      if ('id' in data.data.list[m]) {
-                        if (that.attributeCamera[i].id === data.data.list[m].id) {
-                          flag = true
-                          break
-                        }
+                      if (that.attributeCamera[i].deviceId === data.data.list[m].deviceId) {
+                        flag = true
+                        break
                       }
                     }
                     if (!flag) {

src/Obj/Element/richText.js

@@ -56,8 +56,8 @@ class richText {
       MENU_CONF: {
         uploadImage: {
           fieldName: 'file',
-          maxFileSize: 50 * 1024 * 1024,
-          base64LimitSize: 50 * 1024 * 1024, // 50M 以下插入 base64
+          // maxFileSize: 50 * 1024 * 1024,
+          // base64LimitSize: 50 * 1024 * 1024, // 50M 以下插入 base64
           server: this.uploadImageServer,
           // // 上传之前触发
           // onBeforeUpload(file) { // TS 语法
@@ -95,18 +95,18 @@ class richText {
           //   console.log(`${file.name} 上传出错`, err, res)
           // },
 
-          // // 自定义上传
-          // async customUpload(file, insertFn) {  // TS 语法
-          //   // async customUpload(file, insertFn) {                   // JS 语法
-          //   // file 即选中的文件
-          //   // 自己实现上传，并得到图片 url alt href
-          //   // 最后插入图片
-          //   console.log(file, insertFn)
-          //   insertFn(url, file.name)
-          // }
+          // 自定义上传
+          async customUpload(file, insertFn) {  // TS 语法
+            // async customUpload(file, insertFn) {                   // JS 语法
+            // file 即选中的文件
+            // 自己实现上传，并得到图片 url alt href
+            // 最后插入图片
+            let url = await _this.upload(file)
+            insertFn((_this.host = _this.host || getHost()) + '/' + url)
+          }
         },
         uploadVideo: {
-          maxFileSize: 500 * 1024 * 1024,
+          // maxFileSize: 500 * 1024 * 1024,
           server: this.uploadVideoServer,
           allowedFileTypes: ['video/mp4', 'video/mp3', 'video/ogg', 'video/webm', 'video/avi'],
           // 自定义上传

src/Obj/Element/svg.js

@@ -1,4 +1,4 @@
-let list = ['icon-py', 'icon-edit', 'icon-add', 'icon-add2', 'icon-minus', 'icon-play', 'icon-pause', 'icon-updateheight', 'icon-draw', 'icon-positions', 'icon-reset', 'icon-xj', 'icon-yj', 'icon-zj', 'icon-close', 'icon-query', 'icon-route', 'icon-copy', 'icon-load', 'icon-rubric', 'icon-pen', 'icon-cross']
+let list = ['icon-py', 'icon-edit', 'icon-add', 'icon-add2', 'icon-minus', 'icon-play', 'icon-pause', 'icon-updateheight', 'icon-draw', 'icon-positions', 'icon-reset', 'icon-xj', 'icon-yj', 'icon-zj', 'icon-close', 'icon-query', 'icon-route', 'icon-copy', 'icon-load', 'icon-rubric', 'icon-pen', 'icon-cross', 'icom-confirm']
 function setSvg() {
   let svgElm = document.createElement('svg');
   svgElm.xmlns = 'http://www.w3.org/2000/svg'

src/Obj/Element/yj-color-picker.js

@@ -1,7 +1,11 @@
 class YJColorPicker {
   constructor(options = {}) {
     let _this = this
-    let pickAlphaInput
+    let RInput
+    let GInput
+    let BInput
+    let AInput
+
     let config = {
       el: options.el,
       size: "mini",
@@ -12,18 +16,22 @@ class YJColorPicker {
       hasClear: true,
       openPickerAni: 'opacity',
       defaultColor: options.defaultColor,
+      pickerInputChange: pickerInputChange,
       startMainCallback: (t) => {
-        customizeStyle()
+        _this.colorPicker && (_this.colorPicker.picker.style.opacity = 0)
+        setTimeout(() => {
+          customizeStyle()
+        }, 0);
       }
     }
     this.el = options.el
     if (options.sure) {
       config.sure = (color) => {
-        this.colorPicker.config.defaultColor = this.colorPicker.pickerInput.value
+        // this.colorPicker.config.defaultColor = this.colorPicker.pickerInput.value
         let c = Cesium.Color.fromCssColorString(color)
-        if (pickAlphaInput) {
-          c = c.withAlpha(pickAlphaInput.value / 100)
-          this.pickAlphaInputValue = pickAlphaInput.value
+        if (AInput) {
+          c = c.withAlpha(AInput.value)
+          this.pickAlphaInputValue = AInput.value
         }
         color = c.toCssHexString()
         if (typeof options.sure == 'function') {
@@ -34,8 +42,8 @@ class YJColorPicker {
     }
     if (options.clear) {
       config.clear = () => {
-        if (pickAlphaInput) {
-          pickAlphaInput.value = this.pickAlphaInputValue = 100
+        if (AInput) {
+          AInput.value = this.pickAlphaInputValue = 1
         }
         this.colorPicker.config.defaultColor = ''
         customizeStyle()
@@ -53,7 +61,7 @@ class YJColorPicker {
       }
     }
     let CesiumColor
-    if(config.defaultColor) {
+    if (config.defaultColor) {
       CesiumColor = Cesium.Color.fromCssColorString(config.defaultColor)
     }
     // if (options.predefineColor) {
@@ -66,42 +74,172 @@ class YJColorPicker {
     customizeStyle()
 
     function customizeStyle() {
-      if (!_this.colorPicker) {
+      if (!_this.colorPicker || !_this.colorPicker.picker) {
         return
       }
       let isSubtract = false
       let box = _this.colorPicker.box
       let picker = _this.colorPicker.picker
+      let x = box.getBoundingClientRect().x
+      let y = box.getBoundingClientRect().y
+      let height = 0
+
+      // if (picker.style.display === 'none') {
+      //   picker.style.display = 'block'
+      //   height = picker.offsetHeight
+      //   console.log('picker.style.display.opacity', picker.style.display.opacity)
+      //   picker.style.display = 'none'
+      // }
+      // console.log('===========================================')
+      // console.log((y + box.offsetHeight + 4),  height, window.innerHeight)
+      // if ((y + box.offsetHeight + 4) + height > window.innerHeight) {
+      //   console.log(y, height)
+      //   picker.style.top = y - height + 'px'
+      // }
+      // else {
+      //   picker.style.top = (y + box.offsetHeight + 4) + 'px'
+      // }
+
+      picker.style.left = x + 'px'
       picker.style.minWidth = '325px'
-      let pickerContent = picker.getElementsByClassName('ew-color-picker-content')[0]
+      // let pickerContent = picker.getElementsByClassName('ew-color-picker-content')[0]
       let pickAlphaSliderBar = picker.getElementsByClassName('ew-alpha-slider-bar')[0]
       if (pickAlphaSliderBar) {
         pickAlphaSliderBar.parentNode.style.width = '16px'
         pickAlphaSliderBar.parentNode.removeChild(pickAlphaSliderBar)
       }
-      // let customDivider = document.createElement('span')
-      // customDivider.className = 'custom-divider'
-      // customDivider.style.margin = '10px 0'
-      // pickerContent.parentNode.insertBefore(customDivider, pickerContent.nextSibling)
+
       let pickPen = document.createElement('div')
       pickPen.className = 'icon-pen-box'
       pickPen.innerHTML = '<svg class="icon-pen"><use xlink:href="#yj-icon-pen"></use></svg>'
+
+      /** 为完成、暂时隐藏 *///////
+      pickPen.style.display = 'none'
+      pickPen.style.cursor = 'unset'
+
+
+
       let pickerInput = _this.colorPicker.pickerInput
       pickerInput.parentNode.insertBefore(pickPen, pickerInput)
       pickerInput.style.width = '188px'
+      pickerInput.style.display = 'none'
+
+      let colorInputBox = document.createElement('div')
+      let row1Elm = document.createElement('div')
+      row1Elm.className = 'row'
+      row1Elm.style.margin = '6px 0 0 0'
+      row1Elm.innerHTML = `
+          <div class="col">R</div>
+          <div class="col">G</div>
+          <div class="col">B</div>
+          <div class="col" style="flex: 0 0 92px;"></div>
+      `
+      let row2Elm = document.createElement('div')
+      row2Elm.className = 'row'
+      row2Elm.innerHTML = `
+          <div class="col">
+            <input type="number" step="1" min="0" max="255">
+          </div>
+          <div class="col">
+            <input type="number" step="1" min="0" max="255">
+          </div>
+          <div class="col">
+            <input type="number" step="1" min="0" max="255">
+          </div>
+      `
+      colorInputBox.appendChild(row1Elm)
+      colorInputBox.appendChild(row2Elm)
+      let Inputs = row2Elm.getElementsByTagName('input')
+      Inputs[0].style.width = '72px'
+      Inputs[1].style.width = '72px'
+      Inputs[2].style.width = '72px'
+      RInput = Inputs[0]
+      GInput = Inputs[1]
+      BInput = Inputs[2]
+
+      let dropbtns = picker.getElementsByClassName('ew-color-dropbtns')[0]
+      picker.insertBefore(colorInputBox, dropbtns)
+
+      RInput.addEventListener('blur', (e) => {
+        let value = e.target.value
+        if (e.target.value || (e.target.dataset.null !== 'undefined' && e.target.dataset.null !== '' && !Boolean(e.target.dataset.null))) {
+          value = Number(value)
+          if ((e.target.max) && value > Number(e.target.max)) {
+            value = Number(e.target.max)
+          }
+          if ((e.target.min) && value < Number(e.target.min)) {
+            value = Number(e.target.min)
+          }
+          if ((e.target.dataset.min) && value < Number(e.target.dataset.min)) {
+            value = Number(e.target.dataset.min)
+          }
+          RInput.value = parseInt(value)
+          _this.colorPicker.hsba = colorRgbaToHsba(`rgb(${RInput.value}, ${GInput.value}, ${BInput.value})`)
+          _this.colorPicker.changeColor(_this.colorPicker, _this.colorPicker.pickerPanel.offsetWidth,_this.colorPicker.pickerPanel.offsetHeight)
+        }
+      })
+      GInput.addEventListener('blur', (e) => {
+        let value = e.target.value
+        if (e.target.value || (e.target.dataset.null !== 'undefined' && e.target.dataset.null !== '' && !Boolean(e.target.dataset.null))) {
+          value = Number(value)
+          if ((e.target.max) && value > Number(e.target.max)) {
+            value = Number(e.target.max)
+          }
+          if ((e.target.min) && value < Number(e.target.min)) {
+            value = Number(e.target.min)
+          }
+          if ((e.target.dataset.min) && value < Number(e.target.dataset.min)) {
+            value = Number(e.target.dataset.min)
+          }
+          GInput.value = parseInt(value)
+          _this.colorPicker.hsba = colorRgbaToHsba(`rgb(${RInput.value}, ${GInput.value}, ${BInput.value})`)
+          _this.colorPicker.changeColor(_this.colorPicker, _this.colorPicker.pickerPanel.offsetWidth,_this.colorPicker.pickerPanel.offsetHeight)
+        }
+      })
+      BInput.addEventListener('blur', (e) => {
+        let value = e.target.value
+        if (e.target.value || (e.target.dataset.null !== 'undefined' && e.target.dataset.null !== '' && !Boolean(e.target.dataset.null))) {
+          value = Number(value)
+          if ((e.target.max) && value > Number(e.target.max)) {
+            value = Number(e.target.max)
+          }
+          if ((e.target.min) && value < Number(e.target.min)) {
+            value = Number(e.target.min)
+          }
+          if ((e.target.dataset.min) && value < Number(e.target.dataset.min)) {
+            value = Number(e.target.dataset.min)
+          }
+          BInput.value = parseInt(value)
+          _this.colorPicker.hsba = colorRgbaToHsba(`rgb(${RInput.value}, ${GInput.value}, ${BInput.value})`)
+          _this.colorPicker.changeColor(_this.colorPicker, _this.colorPicker.pickerPanel.offsetWidth,_this.colorPicker.pickerPanel.offsetHeight)
+        }
+      })
+
+
+
 
       if (options.alpha) {
+        Inputs[0].style.width = '52px'
+        Inputs[1].style.width = '52px'
+        Inputs[2].style.width = '52px'
         let pickAlpha = document.createElement('div')
-        pickAlpha.className = 'input-number input-number-unit-1 color-alpha'
+        pickAlpha.className = 'input-number input-number-unit color-alpha'
         pickAlpha.innerHTML = `
-        <input class="input" type="number" title="" step="0.01" min="0" max="100">
-        <span class="unit">%</span>
+        <input class="input" type="number" title="" step="0.01" min="0" max="1">
         <span class="arrow"></span>`
         pickerInput.parentNode.insertBefore(pickAlpha, pickerInput.nextSibling)
-        pickerInput.style.width = '106px'
-        pickAlpha.style.width = '80px'
-        pickAlphaInput = pickAlpha.getElementsByClassName('input')[0]
-        pickAlphaInput.addEventListener('blur', (e) => {
+        pickAlpha.style.width = '66px'
+        pickAlpha.style.margin = '0 6px 0 0'
+        AInput = pickAlpha.getElementsByClassName('input')[0]
+        row1Elm.innerHTML = `
+          <div class="col">R</div>
+          <div class="col">G</div>
+          <div class="col">B</div>
+          <div class="col">A</div>
+          <div class="col" style="flex: 0 0 106px;"></div>
+        `
+        row2Elm.appendChild(pickAlpha)
+        AInput.addEventListener('blur', (e) => {
           let value = e.target.value
           if (e.target.value || (e.target.dataset.null !== 'undefined' && e.target.dataset.null !== '' && !Boolean(e.target.dataset.null))) {
             value = Number(value)
@@ -114,23 +252,26 @@ class YJColorPicker {
             if ((e.target.dataset.min) && value < Number(e.target.dataset.min)) {
               value = Number(e.target.dataset.min)
             }
-            pickAlphaInput.value = Number(value.toFixed(2))
+            AInput.value = parseInt(value * 100) / 100
           }
         })
         if (_this.pickAlphaInputValue || _this.pickAlphaInputValue === 0 || _this.pickAlphaInputValue === '0') {
-          pickAlphaInput.value = Number(Number(_this.pickAlphaInputValue).toFixed(2))
+          AInput.value = parseInt(_this.pickAlphaInputValue * 100) / 100
         }
         else {
-          pickAlphaInput.value = CesiumColor ? Number((CesiumColor.alpha * 100).toFixed(2)) : 100
+          AInput.value = CesiumColor ? parseInt(Number(CesiumColor.alpha.toFixed(2)) * 100) / 100 : 1
         }
-        _this.pickAlphaInputValue = pickAlphaInput.value
-        box.style.background = Cesium.Color.fromCssColorString(_this.colorPicker.config.defaultColor || '#ffffff').withAlpha(pickAlphaInput.value / 100).toCssColorString()
+        _this.pickAlphaInputValue = AInput.value
+        box.style.background = Cesium.Color.fromCssColorString(_this.colorPicker.config.defaultColor || '#ffffff').withAlpha(AInput.value).toCssColorString()
       }
       else {
         CesiumColor = CesiumColor ? CesiumColor.withAlpha(1) : ''
         box.style.background = Cesium.Color.fromCssColorString(_this.colorPicker.config.defaultColor || '#ffffff').toCssColorString()
       }
 
+      let btngroup = picker.getElementsByClassName('ew-color-dropbtngroup')[0]
+      row2Elm.appendChild(btngroup)
+
       let defineColorContainer = picker.getElementsByClassName('ew-pre-define-color-container')[0]
       if (defineColorContainer) {
         let colorList = localStorage.getItem('custom-color')
@@ -157,8 +298,10 @@ class YJColorPicker {
         addColorBtn.className = 'yj-pre-collect-color add'
 
         let subtractColorBtn = document.createElement('div')
-        subtractColorBtn.innerHTML = '<svg class="icon-minus"><use xlink:href="#yj-icon-minus"></use></svg>'
+        subtractColorBtn.innerHTML = '<svg class="icon-minus" style="display: unset;"><use xlink:href="#yj-icon-minus"></use></svg><svg class="icon-confirm" style="display: none;"><use xlink:href="#yj-icom-confirm"></use></svg>'
         subtractColorBtn.className = 'yj-pre-collect-color subtract'
+        let minusIcon = subtractColorBtn.getElementsByClassName('icon-minus')[0]
+        let confirmIcon = subtractColorBtn.getElementsByClassName('icon-confirm')[0]
         collectColorContainer.appendChild(addColorBtn)
         collectColorContainer.appendChild(subtractColorBtn)
 
@@ -217,8 +360,8 @@ class YJColorPicker {
 
           let color = colorRgbaToHex(colorHsbaToRgba(_this.colorPicker.hsba))
           let c = Cesium.Color.fromCssColorString(color || '#ffffff')
-          if (pickAlphaInput) {
-            c = c.withAlpha(pickAlphaInput.value / 100)
+          if (AInput) {
+            c = c.withAlpha(AInput.value)
           }
           let colorString = c.toCssHexString()
           colorItemElm.style.backgroundColor = colorString
@@ -252,23 +395,43 @@ class YJColorPicker {
         subtractColorBtn.addEventListener('click', () => {
           isSubtract = !isSubtract
           if (isSubtract) {
+            minusIcon.style.display = 'none'
+            confirmIcon.style.display = 'unset'
             for (let i = 0; i < subtractElmList.length; i++) {
               subtractElmList[i].style.display = 'block'
             }
           }
           else {
+            minusIcon.style.display = 'unset'
+            confirmIcon.style.display = 'none'
             for (let i = 0; i < subtractElmList.length; i++) {
               subtractElmList[i].style.display = 'none'
             }
           }
         })
       }
+
+      height = picker.offsetHeight
+      if (picker.style.display === 'none') {
+        picker.style.display = 'block'
+        height = picker.offsetHeight
+        picker.style.display = 'none'
+      }
+      if ((y + box.offsetHeight + 4) + height > window.innerHeight) {
+        picker.style.top = y - height + 'px'
+      }
+      else {
+        picker.style.top = (y + box.offsetHeight + 4) + 'px'
+      }
+      _this.colorPicker.pancelTop = parseFloat(picker.style.top) - 2
+
+      pickerInputChange(Cesium.Color.fromCssColorString(_this.colorPicker.config.defaultColor || '#ffffff').toCssHexString())
     }
 
     function clickDefineColor(color) {
-      if (pickAlphaInput) {
+      if (AInput) {
         let c = Cesium.Color.fromCssColorString(color)
-        pickAlphaInput.value = Number((c.alpha * 100).toFixed(2))
+        AInput.value = parseInt(Number(c.alpha.toFixed(2)) * 100) / 100
       }
     }
 
@@ -321,6 +484,84 @@ class YJColorPicker {
           "#" + n
       }
     }
+
+    function colorHexToRgba(hex, alpha) {
+      let a = alpha || 1,
+        hColor = hex.toLowerCase(),
+        hLen = hex.length,
+        rgbaColor = [];
+      hColor = Cesium.Color.fromCssColorString(hColor).toCssHexString().substring(0, 7)
+      const colorRegExp = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/;
+      if (hex && colorRegExp.test(hColor)) {
+        //the hex length may be 4 or 7,contained the symbol of #
+        if (hLen === 4) {
+          let hSixColor = '#';
+
+          for (let i = 1; i < hLen; i++) {
+            let sColor = hColor.slice(i, i + 1);
+            hSixColor += sColor.concat(sColor);
+          }
+
+          hColor = hSixColor;
+        }
+
+        for (let j = 1, len = hColor.length; j < len; j += 2) {
+          rgbaColor.push(parseInt('0X' + hColor.slice(j, j + 2), 16));
+        }
+
+        // return "rgba(" + rgbaColor.join(",") + ',' + a + ")";
+        return rgbaColor;
+      } else {
+        return;
+      }
+    }
+
+    function colorRgbaToHsba(e) {
+      var t = e.slice(e.indexOf("(") + 1, e.lastIndexOf(")")).split(",")
+        , r = t.length < 4 ? 1 : Number(t[3])
+        , n = Number(t[0]) / 255
+        , o = Number(t[1]) / 255
+        , i = Number(t[2]) / 255
+        , a = void 0
+        , s = void 0
+        , l = void 0
+        , c = Math.min(n, o, i)
+        , d = l = Math.max(n, o, i)
+        , u = d - c;
+      if (d === c)
+          a = 0;
+      else {
+          switch (d) {
+          case n:
+              a = (o - i) / u + (o < i ? 6 : 0);
+              break;
+          case o:
+              a = 2 + (i - n) / u;
+              break;
+          case i:
+              a = 4 + (n - o) / u
+          }
+          a = Math.round(60 * a)
+      }
+      s = 0 === d ? 0 : 1 - c / d;
+      return s = Math.round(100 * s),
+      l = Math.round(100 * l),
+      {
+          h: a,
+          s: s,
+          b: l,
+          a: r
+      }
+  }
+
+    function pickerInputChange(v) {
+      if (_this.colorPicker && _this.colorPicker.pickerInput) {
+        let rgbaColor = colorHexToRgba(v || _this.colorPicker.pickerInput.value)
+        RInput.value = rgbaColor[0]
+        GInput.value = rgbaColor[1]
+        BInput.value = rgbaColor[2]
+      }
+    }
   }
 }
 

src/Obj/Materail/CircleRippleMaterialProperty.js

@@ -50,7 +50,8 @@ export default class CircleDiffuseMaterialProperty {
       let color = this.colors[ratio[i]]
       _sourceColor = _sourceColor + `
         if(dis < float(${Number(ratio[i]) / 2})) {
-          material.diffuse = 1.5 * vec4(${color.red},${color.green},${color.blue},${color.alpha}).rgb;
+          material.diffuse = vec4(0.0,0.0,0.0,0.0).rgb;
+          material.emission = 1.0 * vec4(${color.red},${color.green},${color.blue},${color.alpha}).rgb;
         }
         `
     }
@@ -110,7 +111,7 @@ export default class CircleDiffuseMaterialProperty {
             transparency: 1,
             count: 4,
             gradient: 0.2,
-            frameNumber:  Cesium.getTimestamp(),
+            frameNumber: Cesium.getTimestamp(),
           },
           source: this._source,
         },

src/Obj/Materail/RoadTextureMaterialProperty.js

@@ -0,0 +1,113 @@
+/*
+ * @Description: 流动线
+ */
+function RoadTexture() {
+  class RoadTextureMaterialProperty {
+    constructor(options) {
+      this._definitionChanged = new Cesium.Event();
+      this._image = undefined;
+      this._repeat = undefined;
+      this._stRotation = undefined;
+      this._repeatLength = undefined;
+      this.image = options.image || "";
+      this.repeat = options.repeat || 1.0;
+      this.stRotation = options.stRotation || 0.0;
+      // this.rotations = options.rotations || new Array(100).fill(0.0);
+    }
+
+    get isConstant() {
+      return false;
+    }
+
+    get definitionChanged() {
+      return this._definitionChanged;
+    }
+
+    getType(time) {
+      return Cesium.Material.RoadTextureMaterialType;
+    }
+
+    getValue(time, result) {
+      if (!Cesium.defined(result)) {
+        result = {};
+      }
+      result.image = Cesium.Property.getValueOrDefault(
+        this._image,
+        time,
+        "",
+        result.image
+      );
+      result.repeat = Cesium.Property.getValueOrDefault(
+        this._repeat,
+        time,
+        1.0,
+        result.repeat
+      );
+      result.stRotation = Cesium.Property.getValueOrDefault(
+        this._stRotation,
+        time,
+        0.0,
+        result.stRotation
+      );
+      console.log(result, 'result')
+      return result;
+    }
+
+    equals(other) {
+      return (
+        this === other ||
+        (other instanceof RoadTextureMaterialProperty &&
+          Cesium.Property.equals(this._image, other._image) &&
+          Cesium.Property.equals(this._repeat, other._repeat) &&
+          // Cesium.Property.equals(this._rotations, other._rotations) &&
+          Cesium.Property.equals(this._stRotation, other._stRotation)
+        )
+      );
+    }
+  }
+
+  Object.defineProperties(RoadTextureMaterialProperty.prototype, {
+    image: Cesium.createPropertyDescriptor("image"),
+    repeat: Cesium.createPropertyDescriptor("repeat"),
+    repeatLength: Cesium.createPropertyDescriptor("stRotation"),
+  });
+
+  Cesium.RoadTextureMaterialProperty = RoadTextureMaterialProperty;
+  Cesium.Material.RoadTextureMaterialProperty = "RoadTextureMaterialProperty";
+  Cesium.Material.RoadTextureMaterialType = "RoadTextureMaterialType";
+  Cesium.Material.RoadTextureMaterialSource = `
+        uniform sampler2D image;
+        uniform float repeat;
+        czm_material czm_getMaterial(czm_materialInput materialInput)
+        {
+          czm_material material = czm_getDefaultMaterial(materialInput);
+          vec2 st = materialInput.st;
+          st.s *= repeat;
+          mat2 rot = mat2(cos(stRotation), -sin(stRotation), sin(stRotation), cos(stRotation));
+          vec2 newSt = rot * (st - 0.5) + 0.5;
+
+          vec4 colorImage = texture2D(image, newSt);
+          material.diffuse = colorImage.rgb;
+          return material;
+        }
+       `;
+  Cesium.Material._materialCache.addMaterial(
+    Cesium.Material.RoadTextureMaterialType,
+    {
+      fabric: {
+        type: Cesium.Material.RoadTextureMaterialType,
+        uniforms: {
+          image: '',
+          repeat: 1.0,
+          stRotation: 0.0,
+        },
+        source: Cesium.Material.RoadTextureMaterialSource,
+      },
+      translucent: function (material) {
+        return true;
+      },
+    }
+  );
+}
+
+export { RoadTexture }

src/Obj/Materail/WallMaterialProperty.js

@@ -70,7 +70,7 @@ function StreamWall1() {
       fragColor.rgb = color.rgb / 1.0;\n\
       fragColor = czm_gammaCorrect(fragColor);\n\
       material.alpha = colorImage.a * color.a;\n\
-      material.diffuse = (colorImage.rgb+color.rgb)/2.0;\n\
+      material.diffuse = color.rgb/20.0;\n\
       material.emission = fragColor.rgb;\n\
       return material;\n\
       }";
@@ -208,6 +208,14 @@ function StreamWall2() {
           Property.equals(this.repeat, other._repeat) &&
           Property.equals(this.repeats, other._repeats)
       };
+      // let code2 = 'material.diffuse = color.rgb*1.0;'
+      // if (uniforms.is2D) {
+      //   code2 = `
+      //     material.diffuse = color.rgb*0.0;
+      //     material.emission = color.rgb * 1.0;
+      //   `
+      // }
+      // console.log(code2, uniforms.is2D)
       // 将定义的材质对象添加到cesium的材质队列中
       Material._materialCache.addMaterial(MaterialType, {
         fabric: {
@@ -230,8 +238,8 @@ function StreamWall2() {
               else {
                 material.alpha = 1.0;
               }
-              material.diffuse = colorImage.rgb*color.rgb*0.0;
-              material.emission = colorImage.rgb*color.rgb * 1.4;
+              material.diffuse = colorImage.rgb * color.rgb*0.0;
+              material.emission = colorImage.rgb * color.rgb * 1.0;
               return material;
           }`,
           components: {

src/Obj/Materail/index.js

@@ -7,6 +7,7 @@ import { PolylineFlow } from './PolylineFlowMaterialProperty'
 import { PolylineFlowMult } from './PolylineFlowMultMaterialProperty'
 import { FlowDashedLine } from './FlowDashedLineFlowMaterialProperty'
 import { LineTexture } from './LineTextureMaterialProperty'
+import { RoadTexture } from './RoadTextureMaterialProperty'
 
 function init_material() {
   StreamWall1()
@@ -19,6 +20,7 @@ function init_material() {
   PolylineFlowMult()
   FlowDashedLine()
   LineTexture()
+  RoadTexture()
 }
 
 export { init_material }

src/Tools/index.js

@@ -1493,6 +1493,30 @@ class Tools {
     }
   }
 
+  message(option = {}) {
+    let type = option.type || 'success'
+    let text = option.text || ''
+    let duration = option.duration || 1500
+
+    let message = document.getElementById('YJ-custom-message');
+    if (message) {
+      document.body.removeChild(message)
+    }
+    message = document.createElement('div')
+    message.id = 'YJ-custom-message'
+    if (type == 'success') {
+      message.innerHTML = `
+      <i><?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1755929961282" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5064" width="16" height="16" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M874.119618 149.859922A510.816461 510.816461 0 0 0 511.997 0.00208a509.910462 509.910462 0 0 0-362.119618 149.857842c-199.817789 199.679789-199.817789 524.581447 0 724.260236a509.969462 509.969462 0 0 0 362.119618 149.857842A508.872463 508.872463 0 0 0 874.119618 874.120158c199.836789-199.679789 199.836789-524.581447 0-724.260236zM814.94268 378.210681L470.999043 744.132295a15.359984 15.359984 0 0 1-5.887994 4.095996c-1.751998 1.180999-2.913997 2.362998-5.276994 2.913997a34.499964 34.499964 0 0 1-13.469986 2.914997 45.547952 45.547952 0 0 1-12.897986-2.303998l-4.095996-2.363997a45.291952 45.291952 0 0 1-7.009992-4.095996l-196.902793-193.789796a34.126964 34.126964 0 0 1-10.555989-25.186973c0-9.37399 3.583996-18.74698 9.98399-25.186974a36.429962 36.429962 0 0 1 50.372947 0l169.98382 167.423824L763.389735 330.220732a37.059961 37.059961 0 0 1 50.371947-1.732998 33.647965 33.647965 0 0 1 11.165988 25.186973 35.544963 35.544963 0 0 1-9.98399 24.575974v-0.04z m0 0" fill="#52C41A" p-id="5065"></path></svg></i>${text}
+    `
+    } else if (type == 'warning') {
+      message.innerHTML = `
+      <i><?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1756093599258" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1648" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16"><path d="M512.002558 64.24521c-247.292176 0-447.75786 200.464661-447.75786 447.756837 0 247.287059 200.464661 447.752744 447.75786 447.752744 247.286036 0 447.75172-200.464661 447.75172-447.752744C959.754279 264.710894 759.288594 64.24521 512.002558 64.24521zM512.010745 735.87586c-20.602224 0-37.319977-16.718777-37.319977-37.323047 0-20.597107 16.717753-37.319977 37.319977-37.319977 20.60427 0 37.297464 16.72287 37.297464 37.319977C549.308209 719.158107 532.613992 735.87586 512.010745 735.87586zM549.308209 567.969733c0 20.600177-16.693194 37.293371-37.297464 37.293371-20.602224 0-37.319977-16.693194-37.319977-37.293371L474.690768 325.420581c0-20.605294 16.717753-37.297464 37.319977-37.297464 20.60427 0 37.297464 16.693194 37.297464 37.297464L549.308209 567.969733z" fill="#e98f36" p-id="1649"></path></svg></i>${text}
+    `
+    }
+
+    document.body.appendChild(message)
+    message.classList.add(type)
+  }
 
 }
 

src/YJEarth/index.js

@@ -10,6 +10,7 @@ import AModelLoader from '../Obj/Base/LoadObjModel/AModelLoader'
 import { setSvg } from '../Obj/Element/svg'
 import Tools from '../Tools'
 import { Proj } from '../Tools/proj'
+import { syncData, getSdk } from '../Global/MultiViewportMode'
 import {
   unRegLeftClickCallback,
   unRegRightClickCallback,
@@ -62,9 +63,9 @@ class YJEarth {
 
   removeIncetance(id) {
     this.entityMap.delete(id)
-    unRegLeftClickCallback(id)
-    unRegRightClickCallback(id)
-    unregMoveCallback(id)
+    unRegLeftClickCallback(this, id)
+    unRegRightClickCallback(this, id)
+    unregMoveCallback(this, id)
 
     syncSplitData(this, id)
   }
@@ -151,7 +152,7 @@ class YJEarth {
     }
     this.options.contextOptions = {
       webgl: {
-        alpha: true,
+        // alpha: true,
         depth: true,
         stencil: true,
         antialias: true,
@@ -419,7 +420,8 @@ class YJEarth {
 
     let ClickHandler = new Cesium.ScreenSpaceEventHandler(_this.viewer.canvas)
     ClickHandler.setInputAction((movement) => {
-      let textList = document.getElementsByClassName('popup-textarea')
+      // let textList = document.getElementsByClassName('popup-textarea')
+      let textList = _this.viewer._element.getElementsByClassName('popup-textarea')
       _this.isLeftClick = false
       for (let i = textList.length - 1; i > -1; i--) {
         let left = returnNumber(textList[i].style.left)
@@ -431,11 +433,20 @@ class YJEarth {
         if (x > left && x < left + width && y > top && y < top + height) {
           if (_this.clickTextDom) {
             _this.clickTextDom.style['pointer-events'] = 'none'
+            _this.clickTextDom.querySelector('textarea').removeEventListener('blur', _this.blurFun)
           }
+
           _this.clickTextDom = textList[i]
           textList[i].style['pointer-events'] = 'all'
           textList[i].querySelector('textarea').focus()
           _this.isLeftClick = true
+          _this.entityMap.get(_this.clickTextDom.id).isClick(movement.position, _this.clickTextDom.id)
+
+          _this.blurFun = () => {
+            _this.entityMap.get(_this.clickTextDom.id).isClick((movement && movement.position) || null, _this.clickTextDom.id)
+            _this.entityMap.get(_this.clickTextDom.id).getwords(_this.clickTextDom.getElementsByTagName('textarea')[0].value)
+          }
+          _this.clickTextDom.querySelector('textarea').addEventListener('blur', _this.blurFun)
           break;
         }
       }
@@ -466,6 +477,11 @@ class YJEarth {
             x: e.clientX - layerX + width / 2,
             y: e.clientY - layerY + height,
           }
+          let { sdkP } = getSdk()
+          if (_this != sdkP && sdkP) {//二维
+            let num = sdkP.viewer._element.clientWidth
+            param.x = param.x - num
+          }
           _this.entityMap.get(_this.clickTextDom.id).setHandeler(param)
 
         }
@@ -477,14 +493,14 @@ class YJEarth {
         }
 
         _this.clickTextDom.addEventListener('mousedown', mousedown);
-        document.addEventListener('mousemove', mousemove);
-        document.addEventListener('mouseup', mouseup);
+        _this.viewer._element.addEventListener('mousemove', mousemove);
+        _this.viewer._element.addEventListener('mouseup', mouseup);
       }
       // 点击其他地方取消
       if (!_this.isLeftClick && _this.clickTextDom) {
         _this.clickTextDom.removeEventListener('mousedown', mousedown);
-        document.removeEventListener('mousemove', mousemove);
-        document.removeEventListener('mouseup', mouseup);
+        _this.viewer._element.removeEventListener('mousemove', mousemove);
+        _this.viewer._element.removeEventListener('mouseup', mouseup);
         _this.entityMap.get(_this.clickTextDom.id).getwords(_this.clickTextDom.getElementsByTagName('textarea')[0].value)
 
         _this.clickTextDom.style['pointer-events'] = 'none'

static/3rdparty/ewPlugins.min.js

@@ -746,6 +746,7 @@
         o.colorHsbaToRgba)(e.hsba) : e.pickerInput.value = (0,
         o.colorRgbaToHex)((0,
         o.colorHsbaToRgba)(e.hsba))
+        e.config.pickerInputChange && e.config.pickerInputChange()
     }
     function f(e) {
         if (this.pickerFlag = !1,
@@ -795,6 +796,8 @@
                 n.isFunction)(e.sure) ? e.sure : null,
                 clear: (0,
                 n.isFunction)(e.clear) ? e.clear : null,
+                pickerInputChange: (0,
+                    n.isFunction)(e.pickerInputChange) ? e.pickerInputChange : null,
                 startMainCallback: (0,
                   n.isFunction)(e.startMainCallback) ? e.startMainCallback : null,
                 clickDefineColor: (0,
@@ -807,8 +810,10 @@
             else
                 this.init(o, this.config)
         }
+        this.changeColor = g
         this.close = () => {
           this.pickerFlag = !this.pickerFlag,
+          this.picker.style.opacity = 0
           this.render(this.box.parentNode, this.config),
           d(this),
           g(this, this.panelWidth, this.panelHeight)
@@ -890,6 +895,7 @@
             var u = i - e.hsba.a * i;
             c(e.alphaBarThumb, "top", u + "px")
         }
+        e.config.pickerInputChange && e.config.pickerInputChange()
     }
     function b(e, t) {
         var r = e.hueBar.offsetHeight
@@ -965,6 +971,7 @@
     }
     ,
     f.prototype.startMain = function(e, t) {
+        // console.log(e,t)
         var r = this;
         this.box = l(e, "ew-color-picker-box"),
         this.box.setAttribute("color-box-id", this.uid),
@@ -1002,8 +1009,21 @@
             c += s.offsetParent.offsetTop,
             f += s.offsetParent.offsetLeft,
             s = s.offsetParent;
-        this.pancelLeft = f,
-        this.pancelTop = c + e.offsetHeight,
+        this.pancelLeft = f;
+        let defineColorContainer = this.picker.getElementsByClassName('ew-pre-define-color-container')[0]
+        let customColorHeight = 0
+        if(defineColorContainer) {
+            let colorList = localStorage.getItem('custom-color') || '{}'
+            colorList = JSON.parse(colorList)
+            customColorHeight = (Math.floor((Object.keys(colorList).length+2) / 11)+1) * 30
+        }
+        this.picker.style.display = 'block'
+        this.pancelTop = e.getBoundingClientRect().y + (e.offsetHeight + customColorHeight) + 2
+        if((this.picker.offsetHeight + customColorHeight) + this.pancelTop > window.innerHeight) {
+            this.pancelTop = e.getBoundingClientRect().y - (this.picker.offsetHeight + customColorHeight)
+            this.picker.style.top = this.pancelTop + 2 + 'px'
+        }
+        this.picker.style.display = 'none'
         this.preDefineItem = l(e, "ew-pre-define-color", !0),
         this.preDefineItem.length && (0,
         n.ewObjToArray)(this.preDefineItem).map(function(e) {
@@ -1054,7 +1074,7 @@
         }, !1),
         this.pickerClear.addEventListener("click", function() {
             !function(e, t) {
-                t.config.defaultColor = "rgba(255,255,255,1)",
+                t.config.defaultColor = "",
                 t.pickerFlag = !t.pickerFlag,
                 t.render(e, t.config),
                 d(t),
@@ -1070,6 +1090,9 @@
                 o.colorHsbaToRgba)(e.hsba) : (0,
                 o.colorRgbaToHex)((0,
                 o.colorHsbaToRgba)(e.hsba));
+                e.config.defaultColor = e.pickerInput.value
+                e.config.pickerInputChange && e.config.pickerInputChange()
+                e.render(e.box.parentNode, e.config),
                 e.config.sure(t, e)
             }(r)
         }),
@@ -1097,6 +1120,7 @@
             }(r, e)
         }, !1),
         this.bindEvent(this.pickerCursor, function(e, t, r, n) {
+            // console.log(e)
           r=r-7
           n=n-7
             u(e, Math.max(0, Math.min(r - e.pancelLeft, i)), Math.max(0, Math.min(n - e.pancelTop, a)), i, a)
@@ -1119,7 +1143,8 @@
                 a = i,
                 o.moveX = n.eventType[0].indexOf("touch") > -1 ? a.changedTouches[0].clientX : a.clientX,
                 o.moveY = n.eventType[0].indexOf("touch") > -1 ? a.changedTouches[0].clientY : a.clientY,
-                r ? t(o, o.moveX, o.moveY) : t(o, e, o.moveX, o.moveY)
+                r ? t(o, o.moveX, o.moveY) : t(o, e, o.moveX, o.moveY);
+                // console.log('222222', i, t,e,  o.moveX, o.moveY)
             };
             document.addEventListener(n.eventType[1], a, {
                 capture: !1,

static/custom/css/index.css

@@ -68,7 +68,6 @@
   z-index: 999999;
   background: linear-gradient(0deg, var(--color-sdk-bg-gradual)), rgba(0, 0, 0, 0.6);
   border: 1.5px solid;
-  backdrop-filter: blur(2px);
   border-image: linear-gradient(to bottom, var(--color-sdk-gradual)) 1;
   text-align: left;
   font-family: 'sy-boldface';
@@ -1033,16 +1032,31 @@
   background: linear-gradient(0deg, var(--color-sdk-bg-gradual)), rgba(0, 0, 0, 0.6);
   border-image: linear-gradient(to bottom, var(--color-sdk-gradual)) 1;
   padding: 5px;
+  position: fixed !important;
 }
 
-.YJ-custom-base-dialog .ew-color-picker>.ew-color-picker-content {
+.YJ-custom-base-dialog>.content .ew-color-picker input {
+  font-size: 14px;
+  line-height: 28px;
+  height: 28px;
+  padding: 0 8px;
+  font-weight: 400;
+}
+
+.YJ-custom-base-dialog>.content .ew-color-picker .input-number-unit input[type=number] {
+  padding: 0 20px 0 8px;
+  width: 66px;
+}
+
+.YJ-custom-base-dialog.ew-color-picker>.ew-color-picker-content {
   margin-bottom: 10px;
 }
-.YJ-custom-base-dialog .ew-color-picker>.ew-color-picker-content>.ew-color-panel  {
+
+.YJ-custom-base-dialog .ew-color-picker>.ew-color-picker-content>.ew-color-panel {
   width: 302px;
 }
 
-.YJ-custom-base-dialog .ew-color-picker> .ew-color-input {
+.YJ-custom-base-dialog .ew-color-picker>.ew-color-input {
   margin-top: 1px;
   font-size: 14px;
   background-color: rgba(0, 0, 0, 0.5);
@@ -1058,13 +1072,16 @@
 .YJ-custom-base-dialog .ew-color-picker .icon-pen-box {
   display: inline-block;
   /* cursor: pointer; */
-  cursor: no-drop;
   width: 24px;
   height: 24px;
   text-align: center;
   line-height: 24px;
 }
 
+.YJ-custom-base-dialog>.content>div .ew-color-picker .row>.col {
+  margin: 0 !important;
+}
+
 .YJ-custom-base-dialog .ew-color-picker .icon-pen-box .icon-pen {
   margin: 0;
 }
@@ -1080,9 +1097,9 @@
 }
 
 .YJ-custom-base-dialog .ew-color-picker .color-alpha>input {
-  font-weight: 400;
-  font-family: Arial;
-  font-size: 14px;
+  font-weight: 400 !important;
+  font-family: Arial !important;
+  font-size: 14px !important;
 }
 
 .YJ-custom-base-dialog .ew-color-picker>.ew-pre-define-color-container {
@@ -1095,6 +1112,7 @@
   margin: 0 0 8px 8px;
   border: 1px solid #9b979b;
 }
+
 .YJ-custom-base-dialog .ew-color-picker>.ew-pre-define-color-container>.ew-pre-define-color:nth-child(11n+1) {
   width: 22px;
   height: 22px;
@@ -1124,6 +1142,7 @@
   text-align: center;
   background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAIAAADZF8uwAAAAGUlEQVQYV2M4gwH+YwCGIasIUwhT25BVBADtzYNYrHvv4gAAAABJRU5ErkJggg==");
 }
+
 .YJ-custom-base-dialog .ew-color-picker>.yj-pre-collect-color-container>.yj-pre-collect-color:nth-child(11n+1) {
   margin: 0 0 8px 0;
 }
@@ -1132,14 +1151,16 @@
 .YJ-custom-base-dialog .ew-color-picker>.yj-pre-collect-color-container>.yj-pre-collect-color.subtract {
   border-color: rgba(var(--color-sdk-base-rgb), 0.2);
   background: unset;
+  line-height: 22px;
 }
+
 .YJ-custom-base-dialog .ew-color-picker>.yj-pre-collect-color-container>.yj-pre-collect-color.add:hover,
 .YJ-custom-base-dialog .ew-color-picker>.yj-pre-collect-color-container>.yj-pre-collect-color.subtract:hover {
   border-color: rgba(var(--color-sdk-base-rgb), 0.4);
 }
 
 .YJ-custom-base-dialog .ew-color-picker>.yj-pre-collect-color-container svg,
-.YJ-custom-base-dialog .ew-color-picker>.yj-pre-collect-color-container> svg {
+.YJ-custom-base-dialog .ew-color-picker>.yj-pre-collect-color-container>svg {
   margin: 0;
 }
 
@@ -1156,10 +1177,12 @@
   border-radius: 3px;
   cursor: pointer;
 }
+
 .YJ-custom-base-dialog .ew-color-picker>.yj-pre-collect-color-container>.yj-pre-collect-color>.yj-pre-define-color-item.subtract-btn {
   position: absolute;
   top: 0;
   left: 0;
+  line-height: 20px;
 }
 
 .YJ-custom-base-dialog .ew-color-picker>.yj-pre-collect-color-container>.yj-pre-collect-color:hover {
@@ -1168,11 +1191,15 @@
 
 .YJ-custom-base-dialog .ew-color-picker .ew-color-dropbtngroup {
   display: flex;
+  position: unset;
 }
 
 .YJ-custom-base-dialog .ew-color-picker .ew-color-dropbtngroup button {
-  padding: 5px 10px 4px 10px;
+  padding: 0 8px;
+  height: 28px;
+  line-height: 28px;
 }
+
 .YJ-custom-base-dialog .ew-color-picker .ew-color-dropbtngroup button.ew-color-clear {
   margin-right: 8px;
 }
@@ -1180,6 +1207,7 @@
 .YJ-custom-base-dialog .ew-color-picker-box {
   border-width: 4px;
   border-color: #ffffff;
+  display: block;
 }
 
 .YJ-custom-base-dialog .ew-color-picker-box>.ew-color-picker-no,
@@ -1209,12 +1237,12 @@
   transform: rotate(-45deg);
 }
 
-.YJ-custom-base-dialog .ew-color-picker .ew-color-dropbtns{
+.YJ-custom-base-dialog .ew-color-picker .ew-color-dropbtns {
   display: flex;
   align-items: center;
 }
 
-.YJ-custom-base-dialog .ew-color-picker svg{
+.YJ-custom-base-dialog .ew-color-picker svg {
   margin: 0;
 }
 
@@ -1401,6 +1429,24 @@
   margin-bottom: 10px;
   display: flex;
   position: relative;
+  overflow-y: auto;
+}
+
+.DIV-cy-tabs .DIV-cy-tab-top::-webkit-scrollbar {
+  width: 4px;
+  height: 4px;
+}
+
+.DIV-cy-tabs .DIV-cy-tab-top::-webkit-scrollbar-thumb {
+  border-radius: 5px;
+  -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+  background-color: rgba(var(--color-sdk-base-rgb));
+}
+
+.DIV-cy-tabs .DIV-cy-tab-top::-webkit-scrollbar-track {
+  -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+  border-radius: 5px;
+  background-color: rgba(var(--color-sdk-base-rgb), 0.1);
 }
 
 .DIV-cy-tabs .DIV-cy-tab-top::after {
@@ -1445,7 +1491,14 @@
   border-bottom: 2px solid #dddddd00;
   position: relative;
   z-index: 2;
+  white-space: nowrap;
+  user-select: none;
   cursor: pointer;
+  -webkit-pointer-events: auto;
+  -moz-pointer-events: auto;
+  -ms-pointer-events: auto;
+  -o-pointer-events: auto;
+  pointer-events: auto;
 }
 
 .DIV-cy-tabs .DIV-cy-tab-pane-title-p span {
@@ -1935,6 +1988,7 @@
 .YJ-custom-base-dialog.water-surface>.content>div .row .label {
   flex: 0 0 60px;
 }
+
 /* 流光飞线 */
 .YJ-custom-base-dialog.flow-line-surface>.content {
   width: 586px;
@@ -2104,6 +2158,10 @@
   width: 200px;
 }
 
+.YJ-custom-base-dialog.particle-effects>.content .ew-color-picker .row>.col {
+  width: auto;
+}
+
 .YJ-custom-base-dialog.particle-effects>.content [type="range"] {
   margin-top: 10px;
 }
@@ -2749,6 +2807,7 @@
 .YJ-custom-base-dialog.polyline>.content {
   width: 580px;
 }
+
 .YJ-custom-base-dialog.polyline>.content>div #dashTextureDom {
   display: none;
 }
@@ -2800,6 +2859,7 @@
 .YJ-custom-base-dialog.polyline>.content>div .spatial-info-table .table-body {
   max-height: 185px;
 }
+
 .YJ-custom-base-dialog.polyline>.content>div .input-select-unit-box textarea {
   border-radius: unset !important;
 }
@@ -2928,34 +2988,37 @@
 }
 
 .YJ-custom-base-dialog.polyline>.content>div .input-select-unit-box textarea {
-  border-radius: unset!important;
+  border-radius: unset !important;
 }
 
 .YJ-custom-base-dialog.polyline>.content>div .input-select-unit .datalist {
-   background-color:rgba(var(--color-sdk-base-rgb), 0.1)!important;
+  background-color: rgba(var(--color-sdk-base-rgb), 0.1) !important;
   border-radius: 4px 0px 0px 4px !important;
 }
+
 .YJ-custom-base-dialog.polyline>.content>div .input-select-unit:nth-of-type(1) .datalist {
-   background-color:rgba(var(--color-sdk-base-rgb), 0.1)!important;
-   border-radius: 4px 0px, 0px, 4px!important;
+  background-color: rgba(var(--color-sdk-base-rgb), 0.1) !important;
+  border-radius: 4px 0px, 0px, 4px !important;
 }
+
 .YJ-custom-base-dialog.polyline>.content>div .input-select-unit:nth-of-type(2) .datalist {
-   background-color:rgba(var(--color-sdk-base-rgb), 0.1)!important;
-  border-radius: 0px 4px 4px 0px!important;
+  background-color: rgba(var(--color-sdk-base-rgb), 0.1) !important;
+  border-radius: 0px 4px 4px 0px !important;
 }
 
 .YJ-custom-base-dialog.polyline>.content>div .input-select-unit:nth-of-type(1) input {
-    border: 1px solid rgba(var(--color-sdk-base-rgb), 0.5)!important;
-}
-.YJ-custom-base-dialog.polyline>.content>div .input-select-unit:nth-of-type(2) input {
-  border: 1px solid rgba(var(--color-sdk-base-rgb), 0.5)!important;
+  border: 1px solid rgba(var(--color-sdk-base-rgb), 0.5) !important;
 }
 
-.YJ-custom-base-dialog.polyline>.content input.input-text{
-    background-color: rgba(0, 0, 0, 0.5)!important;
-    border-radius: unset!important;
-    border-top: 1px solid rgba(var(--color-sdk-base-rgb), 0.5)!important;
-    border-bottom: 1px solid rgba(var(--color-sdk-base-rgb), 0.5) !important;
+.YJ-custom-base-dialog.polyline>.content>div .input-select-unit:nth-of-type(2) input {
+  border: 1px solid rgba(var(--color-sdk-base-rgb), 0.5) !important;
+}
+
+.YJ-custom-base-dialog.polyline>.content input.input-text {
+  background-color: rgba(0, 0, 0, 0.5) !important;
+  border-radius: unset !important;
+  border-top: 1px solid rgba(var(--color-sdk-base-rgb), 0.5) !important;
+  border-bottom: 1px solid rgba(var(--color-sdk-base-rgb), 0.5) !important;
 }
 
 .YJ-custom-base-dialog.polyline>.content>div .input-select-line-type-box .cy_datalist input {
@@ -2979,65 +3042,78 @@
   height: 13px;
   margin-right: 7px;
 }
+
 .YJ-custom-base-dialog.polyline>.content>div .input-select-line-type-box .cy_datalist i.line {
   border: 1px solid rgba(var(--color-sdk-base-rgb), 1);
   height: 0px;
   margin-top: 4px;
 }
+
 .YJ-custom-base-dialog.polyline>.content>div .input-select-line-type-box .cy_datalist i.dash-line {
   border: 1px dashed rgba(var(--color-sdk-base-rgb), 1);
   height: 0px;
   margin-top: 4px;
 }
+
 .YJ-custom-base-dialog.polyline>.content>div .input-select-line-type-box .cy_datalist i.light-line {
   border: 1px solid rgba(var(--color-sdk-base-rgb), 1);
   height: 0px;
   margin-top: 4px;
   box-shadow: 0 0 3px #fff
 }
+
 .YJ-custom-base-dialog.polyline>.content>div .input-select-line-type-box .cy_datalist i.tail-line {
   background: url(../../img/arrow/tail.png) 100% 100% no-repeat;
   background-size: 100% 100%;
 }
+
 .YJ-custom-base-dialog.polyline>.content>div .input-select-line-type-box .cy_datalist i.mult-tail-line {
   background: url(../../img/arrow/tail.png) 100% 100% no-repeat;
   background-size: 100% 100%;
 }
+
 .YJ-custom-base-dialog.polyline>.content>div .input-select-line-type-box .cy_datalist i.flow-dash-line1 {
   border: 1px dashed rgba(var(--color-sdk-base-rgb), 1);
   height: 0px;
   margin-top: 4px;
 }
+
 .YJ-custom-base-dialog.polyline>.content>div .input-select-line-type-box .cy_datalist i.flow-dash-line2 {
   border: 1px dashed rgba(var(--color-sdk-base-rgb), 1);
   height: 0px;
   margin-top: 4px;
 }
+
 .YJ-custom-base-dialog.polyline>.content>div .input-select-line-type-box .cy_datalist i.pic-line1 {
   background: url(../../img/arrow/1.png);
   background-size: cover;
   background-position: center;
 }
+
 .YJ-custom-base-dialog.polyline>.content>div .input-select-line-type-box .cy_datalist i.pic-line2 {
   background: url(../../img/arrow/2.png);
   background-size: cover;
   background-position: center;
 }
+
 .YJ-custom-base-dialog.polyline>.content>div .input-select-line-type-box .cy_datalist i.pic-line3 {
   background: url(../../img/arrow/3.png);
   background-size: cover;
   background-position: center;
 }
+
 .YJ-custom-base-dialog.polyline>.content>div .input-select-line-type-box .cy_datalist i.pic-line4 {
-  background: url(../../img/arrow/4.png) ;
+  background: url(../../img/arrow/4.png);
   background-size: cover;
   background-position: center;
 }
+
 .YJ-custom-base-dialog.polyline>.content>div .input-select-line-type-box .cy_datalist i.pic-line5 {
   background: url(../../img/arrow/5.png);
   background-size: cover;
   background-position: center;
 }
+
 .YJ-custom-base-dialog.polyline>.content>div .input-select-line-type-box .cy_datalist i.pic-line6 {
   background: url(../../img/arrow/6.png) 100% 100% no-repeat;
   background-size: 100% 100%;
@@ -3046,9 +3122,9 @@
 /* 文本框 */
 .popup-textarea{
   /* width: 212px; */
-  width: 161.6px;
+  width: 161px;
   /* height: 154px; */
-  height: 119.2px;
+  height: 119px;
   display: block;
   pointer-events: none;
   position: absolute;
@@ -3058,6 +3134,8 @@
   padding: 5px 5px 0px 5px;
 }
 .popup-textarea textarea{
+  width: 158px;
+  height: 95px;
   background-color: unset!important;
   border: unset!important;
   color: #fff;
@@ -3081,7 +3159,7 @@
 
 /* 贴地图片 */
 .YJ-custom-base-dialog.ground-image>.content {
-  width: 500px;
+  width: 560px;
 }
 
 /* 模型 */
@@ -3415,6 +3493,7 @@
   cursor: e-resize;
   background-color: #d3d3d3;
   user-select: none;
+  z-index: 1;
 }
 
 .cesium-performanceDisplay-defaultContainer {
@@ -3503,3 +3582,242 @@
 .YJ-custom-base-dialog.contour>.content .label {
   flex: unset;
 }
+
+/* 锚点设置 */
+.YJ-custom-base-dialog.anchor-point {
+  user-select: none;
+}
+
+.YJ-custom-base-dialog.anchor-point>.content {
+  padding: 14px 40px;
+}
+
+.YJ-custom-base-dialog.anchor-point>.content>div {
+  border: 1px solid #757575;
+  position: relative;
+}
+
+.YJ-custom-base-dialog.anchor-point>.content>div>.point {
+  width: 10px;
+  height: 10px;
+  position: absolute;
+  background: #FFDF53;
+  border-radius: 50%;
+  border: 1px solid #ff7300;
+  cursor: pointer;
+}
+
+.billboard-attribute-box {
+  position: absolute;
+  z-index: 1;
+  background: linear-gradient(0deg, var(--color-sdk-bg-gradual)), rgba(0, 0, 0, 0.6);
+  border: 1.5px solid;
+  border-image: linear-gradient(to bottom, var(--color-sdk-gradual)) 1;
+  color: #fff;
+  min-width: 200px;
+  min-height: 120px;
+  box-sizing: border-box;
+  /* -webkit-pointer-events: none;
+  -moz-pointer-events: none;
+  -ms-pointer-events: none;
+  -o-pointer-events: none;
+  pointer-events: none; */
+}
+
+.billboard-attribute-box .DIV-cy-tabs {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  backdrop-filter: blur(2px);
+}
+
+.billboard-attribute-box .DIV-cy-tabs .DIV-cy-tab-top .DIV-cy-tab-pane-title {
+  padding: 0 2px;
+}
+
+.billboard-attribute-box .DIV-cy-tabs .DIV-cy-tab-top .DIV-cy-tab-pane-title:first-child {
+  padding-left: 0;
+}
+
+.billboard-attribute-box .DIV-cy-tabs .DIV-cy-tab-top .DIV-cy-tab-pane-title:last-child {
+  padding-right: 0;
+}
+
+.billboard-attribute-box .DIV-cy-tabs .DIV-cy-tab-top .DIV-cy-tab-pane-title span {
+  margin: 0 5px;
+}
+
+.billboard-attribute-box .DIV-cy-tabs .DIV-cy-tab-content {
+  padding: 0 5px 5px 5px;
+  box-sizing: border-box;
+  flex: 1;
+  overflow: auto;
+}
+
+.billboard-attribute-box .DIV-cy-tabs .DIV-cy-tab-content::-webkit-scrollbar {
+  width: 8px;
+  height: 8px;
+}
+
+.billboard-attribute-box .DIV-cy-tabs .DIV-cy-tab-content::-webkit-scrollbar-thumb {
+  border-radius: 5px;
+  -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+  background-color: rgba(var(--color-sdk-base-rgb));
+}
+
+.billboard-attribute-box .DIV-cy-tabs .DIV-cy-tab-content::-webkit-scrollbar-track {
+  -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+  border-radius: 5px;
+  background-color: rgba(var(--color-sdk-base-rgb), 0.1);
+}
+
+.billboard-attribute-box .DIV-cy-tabs .DIV-cy-tab-content-pane {
+  width: 100%;
+  height: 100%;
+}
+
+.billboard-attribute-box .DIV-cy-tabs .DIV-cy-tab-content-pane iframe {
+  border: none;
+}
+
+.billboard-attribute-box .billboard-attribute-box-line {
+  position: absolute;
+  width: 0px;
+  /* border-left: 1px solid rgba(var(--color-sdk-base-rgb), 0.5); */
+  border-left: 1px solid rgba(var(--color-sdk-base-rgb), 1);
+  /* transform: rotate(45deg); */
+  transform-origin: 0px 0px;
+  -webkit-pointer-events: none;
+  -moz-pointer-events: none;
+  -ms-pointer-events: none;
+  -o-pointer-events: none;
+  pointer-events: none;
+}
+
+.billboard-attribute-box .drag-nook {
+  position: absolute;
+  width: 12px;
+  height: 12px;
+  display: block;
+  user-select: none;
+  -webkit-pointer-events: auto;
+  -moz-pointer-events: auto;
+  -ms-pointer-events: auto;
+  -o-pointer-events: auto;
+  pointer-events: auto;
+  z-index: 3;
+  clip-path: polygon(0% 100%, 100% 100%, 50% 50%);
+  background-image: linear-gradient(to top, #ffffff 1px, #00000000 1px);
+  background-size: 100% 3px;
+  /* background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAJRJREFUWEftltsJgFAMQ5NNdBJ1Eh3NTdRJdJPIBQXF50/p/WgHSNNDCSGch877EQbyIyCpBtAa/cZEsj9qXwhImgEURgZA8rTzzkAiYGVgITm+ErC6/Ek3vycMAkHAnYCkAUDKAosZSTaeSZiCqIwgCgJBIG8CWyXzKySSZBGBu+afStYBqIxMfJdSo8WPslHJgsAKWjkmIRBy/c8AAAAASUVORK5CYII='); */
+}
+
+.billboard-attribute-box .drag-nook.left-top {
+  top: -6px;
+  left: -6px;
+  cursor: se-resize;
+  transform: rotate(-45deg);
+  display: none;
+}
+
+.billboard-attribute-box .drag-nook.right-top {
+  top: -6px;
+  right: -6px;
+  cursor: ne-resize;
+  transform: rotate(45deg);
+  display: none;
+}
+
+.billboard-attribute-box .table {
+  background-color: #ffffff00;
+  color: #ffffff;
+  overflow: hidden;
+  border: 1px solid rgba(var(--color-sdk-base-rgb), 0.5);
+}
+
+.billboard-attribute-box .table .table-head .tr {
+  border-top: none;
+  border-left: none;
+  border-right: none;
+}
+
+.billboard-attribute-box .table .tr {
+  display: flex;
+  border: 1px solid rgba(var(--color-sdk-base-rgb), 0.5);
+  border-right: none;
+}
+.billboard-attribute-box .table .tr .th, .billboard-attribute-box .table .tr .td {
+  border-right: 1px solid rgba(var(--color-sdk-base-rgb), 0.5);
+  display: flex;
+  justify-content: center;
+}
+.billboard-attribute-box .table .tr .th:last-child, .billboard-attribute-box .table .tr .td:last-child {
+  border-right: none;
+}
+
+
+.billboard-attribute-box .table .table-body .tr {
+  border-bottom: none;
+  border-left: none;
+}
+
+.billboard-attribute-box .table .table-body .tr:first-child {
+  border-top: none;
+}
+
+/* 自定义提示 */
+#YJ-custom-message {
+  /* 固定在顶部中央 */
+  position: fixed;
+  top: 0;
+  left: 50%;
+  transform: translate(-50%, 0%);
+  /* 初始位置在屏幕顶部外 */
+
+  /* 样式美化 */
+  display: flex;
+  border-radius: 4px;
+  font-size: 14px;
+  padding: 15px 20px;
+  width: 380px;
+  box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+  z-index: 9999999;
+
+
+  /* 动画定义 */
+  animation: YJ-custom-message-slideDown 0.5s forwards,
+    YJ-custom-message-fadeOut 0.5s 1500ms forwards;
+}
+
+#YJ-custom-message i {
+  margin: 2px 10px 0 0;
+  display: flex;
+  align-items: center;
+  width: 16px;
+}
+
+#YJ-custom-message.success {
+  background-color: #f0f9eb;
+  color: rgb(82, 196, 26);
+}
+#YJ-custom-message.warning {
+  background-color: #fdf6ec;
+  color: #e6a23c;
+}
+
+/* 滑入动画 */
+@keyframes YJ-custom-message-slideDown {
+  to {
+    top: 20px;
+    /* 移动到屏幕顶部 */
+  }
+}
+
+/* 淡出动画 - 1500ms后执行 */
+@keyframes YJ-custom-message-fadeOut {
+  to {
+    opacity: 0;
+    top: -200px
+      /* 移回顶部外 */
+  }
+}

static/custom/img/icom-confirm.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="9.19921875" viewBox="0 0 12 9.19921875" fill="none">
+<path d="M4.66806 9.2C4.47815 9.2 4.29548 9.12926 4.15776 9.00078L0.22761 5.35124C-0.0666872 5.0784 -0.0768368 4.62509 0.204411 4.33925C0.485649 4.0534 0.953909 4.04474 1.2482 4.31759L4.60427 7.43442L10.6916 0.260945C10.9511 -0.0436629 11.4165 -0.0884161 11.731 0.162779C12.0457 0.413972 12.0905 0.864388 11.8325 1.17044L5.23924 8.94014C5.10877 9.09461 4.91741 9.18845 4.713 9.2L4.66806 9.2Z"   fill="#FFFFFF" >
+</path>
+</svg>