贴地svg编辑点改为图标

src/Global/ClickCallback/index.js

@@ -72,13 +72,267 @@ function openLeftClick(sdk, cb) {
         click = true
       }, 600);
       if (!YJ.Measure.GetMeasureStatus() && cartesian) {
-        let flag = false
+        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)
+                    return
+                  }
+                }
+              }
+            }
+            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)
+                return
+              }
+            }
+            else if (leftClickCallbackMap.has(pick.id.id)) {
+              let obj = leftClickCallbackMap.get(pick.id.id)
+              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)
+                      return
+                    }
+                  }
+                }
+              }
+              // 聚集地
+              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)
+                      return
+                    }
+                  }
+                }
+              }
+              // 单箭头
+              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)
+                      return
+                    }
+                  }
+                }
+              }
+              // 双箭头
+              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)
+                      return
+                    }
+                  }
+                }
+              }
+              // 圆
+              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)
+                      return
+                    }
+                  }
+
+                }
+              }
+              // 扇形
+              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)
+                      return
+                    }
+                  }
+
+                }
+              }
+              if (obj.that.picking) {
+                obj.callback(
+                  movement,
+                  pick.id.id,
+                  cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
+                return
+              }
+            }
+            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)
+                return
+              }
+            }
+            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)
+                return
+              }
+            }
+          }
+          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)
+                }
+              }
+            }
+          }
+        }
         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 && obj.that.show && (obj.that.entity && obj.that.entity.show)) {
               // 是否为多边形
               if (obj.that.type === 'PolygonObject') {
                 // 是否可点击y
@@ -103,7 +357,6 @@ function openLeftClick(sdk, cb) {
                         movement,
                         obj.that.options.id,
                         cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
-                      flag = true
                       break
                     }
                   }
@@ -129,7 +382,6 @@ function openLeftClick(sdk, cb) {
                         movement,
                         obj.that.options.id,
                         cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
-                      flag = true
                       break
                     }
                   }
@@ -153,7 +405,6 @@ function openLeftClick(sdk, cb) {
                         movement,
                         obj.that.options.id,
                         cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
-                      flag = true
                       break
                     }
                   }
@@ -179,7 +430,6 @@ function openLeftClick(sdk, cb) {
                         movement,
                         obj.that.options.id,
                         cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
-                      flag = true
                       break
                     }
                   }
@@ -200,7 +450,6 @@ function openLeftClick(sdk, cb) {
                         movement,
                         obj.that.options.id,
                         cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
-                      flag = true
                       break
                     }
                   }
@@ -224,7 +473,6 @@ function openLeftClick(sdk, cb) {
                         movement,
                         obj.that.options.id,
                         cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
-                      flag = true
                       break
                     }
                   }
@@ -234,114 +482,6 @@ function openLeftClick(sdk, cb) {
             }
           }
         }
-        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)
-                  }
-                }
-              }
-            }
-          }
-        }
       }
     }
 

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/MultiViewportMode/ClickCallback/index.js

@@ -72,13 +72,267 @@ function openLeftClick(sdk, cb) {
         click = true
       }, 600);
       if (!YJ.Measure.GetMeasureStatus() && cartesian) {
-        let flag = false
+        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)
+                    return
+                  }
+                }
+              }
+            }
+            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)
+                return
+              }
+            }
+            else if (leftClickCallbackMap.has(pick.id.id)) {
+              let obj = leftClickCallbackMap.get(pick.id.id)
+              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)
+                      return
+                    }
+                  }
+                }
+              }
+              // 聚集地
+              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)
+                      return
+                    }
+                  }
+                }
+              }
+              // 单箭头
+              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)
+                      return
+                    }
+                  }
+                }
+              }
+              // 双箭头
+              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)
+                      return
+                    }
+                  }
+                }
+              }
+              // 圆
+              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)
+                      return
+                    }
+                  }
+
+                }
+              }
+              // 扇形
+              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)
+                      return
+                    }
+                  }
+
+                }
+              }
+              if (obj.that.picking) {
+                obj.callback(
+                  movement,
+                  pick.id.id,
+                  cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
+                return
+              }
+            }
+            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)
+                return
+              }
+            }
+            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)
+                return
+              }
+            }
+          }
+          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)
+                }
+              }
+            }
+          }
+        }
         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 && obj.that.show && (obj.that.entity && obj.that.entity.show)) {
               // 是否为多边形
               if (obj.that.type === 'PolygonObject') {
                 // 是否可点击y
@@ -103,7 +357,6 @@ function openLeftClick(sdk, cb) {
                         movement,
                         obj.that.options.id,
                         cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
-                      flag = true
                       break
                     }
                   }
@@ -129,7 +382,6 @@ function openLeftClick(sdk, cb) {
                         movement,
                         obj.that.options.id,
                         cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
-                      flag = true
                       break
                     }
                   }
@@ -153,7 +405,6 @@ function openLeftClick(sdk, cb) {
                         movement,
                         obj.that.options.id,
                         cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
-                      flag = true
                       break
                     }
                   }
@@ -179,7 +430,6 @@ function openLeftClick(sdk, cb) {
                         movement,
                         obj.that.options.id,
                         cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
-                      flag = true
                       break
                     }
                   }
@@ -200,7 +450,6 @@ function openLeftClick(sdk, cb) {
                         movement,
                         obj.that.options.id,
                         cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
-                      flag = true
                       break
                     }
                   }
@@ -224,7 +473,6 @@ function openLeftClick(sdk, cb) {
                         movement,
                         obj.that.options.id,
                         cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
-                      flag = true
                       break
                     }
                   }
@@ -234,114 +482,6 @@ function openLeftClick(sdk, cb) {
             }
           }
         }
-        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)
-                  }
-                }
-              }
-            }
-          }
-        }
       }
     }
 

src/Global/MultiViewportMode/index.js

@@ -157,7 +157,12 @@ async function syncData2(sdk, id, entityId) {
         if (that.showView == 3) {
           options.show = false
         }
-        let newObject = await new that.constructor(sdk2D, options)
+        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
@@ -252,7 +257,11 @@ async function syncData2(sdk, id, entityId) {
         if(target) {
           await target.remove()
         }
-        target = await new obj.constructor(sdk2D, options)
+        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

src/Global/SplitScreen/ClickCallback/index.js

@@ -72,13 +72,267 @@ function openLeftClick(sdk, cb) {
         click = true
       }, 600);
       if (!YJ.Measure.GetMeasureStatus() && cartesian) {
-        let flag = false
+        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)
+                    return
+                  }
+                }
+              }
+            }
+            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)
+                return
+              }
+            }
+            else if (leftClickCallbackMap.has(pick.id.id)) {
+              let obj = leftClickCallbackMap.get(pick.id.id)
+              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)
+                      return
+                    }
+                  }
+                }
+              }
+              // 聚集地
+              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)
+                      return
+                    }
+                  }
+                }
+              }
+              // 单箭头
+              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)
+                      return
+                    }
+                  }
+                }
+              }
+              // 双箭头
+              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)
+                      return
+                    }
+                  }
+                }
+              }
+              // 圆
+              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)
+                      return
+                    }
+                  }
+
+                }
+              }
+              // 扇形
+              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)
+                      return
+                    }
+                  }
+
+                }
+              }
+              if (obj.that.picking) {
+                obj.callback(
+                  movement,
+                  pick.id.id,
+                  cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
+                return
+              }
+            }
+            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)
+                return
+              }
+            }
+            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)
+                return
+              }
+            }
+          }
+          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)
+                }
+              }
+            }
+          }
+        }
         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 && obj.that.show && (obj.that.entity && obj.that.entity.show)) {
               // 是否为多边形
               if (obj.that.type === 'PolygonObject') {
                 // 是否可点击y
@@ -103,7 +357,6 @@ function openLeftClick(sdk, cb) {
                         movement,
                         obj.that.options.id,
                         cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
-                      flag = true
                       break
                     }
                   }
@@ -129,7 +382,6 @@ function openLeftClick(sdk, cb) {
                         movement,
                         obj.that.options.id,
                         cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
-                      flag = true
                       break
                     }
                   }
@@ -153,7 +405,6 @@ function openLeftClick(sdk, cb) {
                         movement,
                         obj.that.options.id,
                         cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
-                      flag = true
                       break
                     }
                   }
@@ -179,7 +430,6 @@ function openLeftClick(sdk, cb) {
                         movement,
                         obj.that.options.id,
                         cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
-                      flag = true
                       break
                     }
                   }
@@ -200,7 +450,6 @@ function openLeftClick(sdk, cb) {
                         movement,
                         obj.that.options.id,
                         cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
-                      flag = true
                       break
                     }
                   }
@@ -224,7 +473,6 @@ function openLeftClick(sdk, cb) {
                         movement,
                         obj.that.options.id,
                         cartesian3Towgs84(getcartesian(sdk, movement), sdk.viewer), obj.that)
-                      flag = true
                       break
                     }
                   }
@@ -234,114 +482,6 @@ function openLeftClick(sdk, cb) {
             }
           }
         }
-        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)
-                  }
-                }
-              }
-            }
-          }
-        }
       }
     }
 

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) {
@@ -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/global.js

@@ -29,7 +29,7 @@ function getCurrentView(sdk) {
     // heading: viewer.camera.heading,
     // pitch: viewer.camera.pitch,
     // roll: viewer.camera.roll,
-    position: tools.cartesian3Towgs84(viewer.camera.position, viewer),
+    position: tools.cartesian3Towgs84(viewer.camera._positionWC, viewer),
     orientation: {
       heading: Cesium.Math.toDegrees(viewer.camera.heading),
       pitch: Cesium.Math.toDegrees(viewer.camera.pitch),

src/Global/mouseRightMenu/index.js

@@ -92,12 +92,12 @@ function MouseRightMenu(sdk, status, callBack) {
           entityId = entityId.parentId
         }
         let addedMenu = ''
-        let that = sdk.entityMap.get(entityId)
+        let that = sdk.entityMap.get(entityId+'')
         if (!that && entityId) {
-          let array = entityId.split('-')
+          let array = (entityId+'').split('-')
           array.splice(array.length - 1, 1)
           entityId = array.join('-')
-          that = sdk.entityMap.get(entityId)
+          that = sdk.entityMap.get(entityId+'')
         }
 
         if (that && that.picking) {

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/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
@@ -45,13 +46,19 @@ class BatchModel extends Base {
     this._EventBinding = new EventBinding()
     this._elms = {};
     this.pointArr = []
-    this.sdk.addIncetance(this.options.id, this)
+    // 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
+      console.log('kkkkk')
       switch (options.type) {
         case '点':
           Draw = new DrawPoint(this.sdk)
@@ -67,8 +74,37 @@ class BatchModel extends Base {
       }
       Draw && Draw.start((a, positions) => {
         this.options.positions = positions;
-        // this.callback(this.options);
-        (this.options.positions.length || this.options.positions.lng) && BatchModel.computeDis(this)
+        console.log('uuuuuu')
+        //判断范围是否过大
+        if (positions.length != 0 || positions.lng) {
+          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)
+        }
       })
 
     } else {
@@ -83,51 +119,59 @@ class BatchModel extends Base {
     let posiArr = []
     let array = []
     if (that.options.type == '面') {
-      that.options.positions.forEach(item => {
-        fromDegreesArray.push(item.lng, item.lat)
-      })
-      // arr = that.generateInterpolatedPoints(Cesium.Cartesian3.fromDegreesArray(fromDegreesArray), that.options.spacing)
-      arr = await that.computedArea(Cesium.Cartesian3.fromDegreesArray(fromDegreesArray), that.options.spacing)
-      array[0] = arr
-      array[1] = that.calculateRoadAngle(Cesium.Cartesian3.fromDegreesArray(fromDegreesArray)[0], Cesium.Cartesian3.fromDegreesArray(fromDegreesArray)[3])
-      arr.forEach((item, index) => {
-        const cartographic = Cesium.Cartographic.fromCartesian(
-          item // Cartesian3对象 {x, y, z}
-        );
-        const longitude = Cesium.Math.toDegrees(cartographic.longitude);
-        const latitude = Cesium.Math.toDegrees(cartographic.latitude);
-        const height = cartographic.height;
-        posiArr.push({
-          lng: longitude,
-          lat: latitude,
-          alt: height
+      if (that.options.positions.length != 0) {
+        that.options.positions.forEach(item => {
+          fromDegreesArray.push(item.lng, item.lat)
         })
-      })
+        // arr = that.generateInterpolatedPoints(Cesium.Cartesian3.fromDegreesArray(fromDegreesArray), that.options.spacing)
+        arr = await that.computedArea(Cesium.Cartesian3.fromDegreesArray(fromDegreesArray), that.options.spacing)
+        array[0] = arr
+        array[1] = that.calculateRoadAngle(Cesium.Cartesian3.fromDegreesArray(fromDegreesArray)[0], Cesium.Cartesian3.fromDegreesArray(fromDegreesArray)[3])
+        arr.forEach((item, index) => {
+          const cartographic = Cesium.Cartographic.fromCartesian(
+            item // Cartesian3对象 {x, y, z}
+          );
+          const longitude = Cesium.Math.toDegrees(cartographic.longitude);
+          const latitude = Cesium.Math.toDegrees(cartographic.latitude);
+          const height = cartographic.height;
+          posiArr.push({
+            lng: longitude,
+            lat: latitude,
+            alt: height
+          })
+        })
+      }
     } else if (that.options.type == '线') {
-      that.options.positions.forEach(item => {
-        fromDegreesArray.push(item.lng, item.lat)
-      })
-      array = await that.linePoint(Cesium.Cartesian3.fromDegreesArray(fromDegreesArray), that.options.spacing)
-      arr = array[0]
-      that.pointArr = arr
-      arr.forEach((item, index) => {
-        const cartographic = Cesium.Cartographic.fromCartesian(
-          item // Cartesian3对象 {x, y, z}
-        );
-        const longitude = Cesium.Math.toDegrees(cartographic.longitude);
-        const latitude = Cesium.Math.toDegrees(cartographic.latitude);
-        const height = cartographic.height;
-        posiArr.push({
-          lng: longitude,
-          lat: latitude,
-          alt: height
+      if (that.options.positions.length != 0) {
+        that.options.positions.forEach(item => {
+          fromDegreesArray.push(item.lng, item.lat)
         })
-      })
+        array = await that.linePoint(Cesium.Cartesian3.fromDegreesArray(fromDegreesArray), that.options.spacing)
+        arr = array[0]
+        that.pointArr = arr
+        arr.forEach((item, index) => {
+          const cartographic = Cesium.Cartographic.fromCartesian(
+            item // Cartesian3对象 {x, y, z}
+          );
+          const longitude = Cesium.Math.toDegrees(cartographic.longitude);
+          const latitude = Cesium.Math.toDegrees(cartographic.latitude);
+          const height = cartographic.height;
+          posiArr.push({
+            lng: longitude,
+            lat: latitude,
+            alt: height
+          })
+        })
+      }
+
     } else if (that.options.type == '点') {
-      let height = await that.getClampToHeight({ lng: that.options.positions.lng, lat: that.options.positions.lat })
-      posiArr = [{ lng: that.options.positions.lng, lat: that.options.positions.lat, alt: height }]
-      // posiArr = [that.options.positions]
-      that.pointArr = posiArr
+      if (that.options.positions.lng) {
+        let height = await that.getClampToHeight({ lng: that.options.positions.lng, lat: that.options.positions.lat })
+        posiArr = [{ lng: that.options.positions.lng, lat: that.options.positions.lat, alt: height }]
+        // posiArr = [that.options.positions]
+        that.pointArr = posiArr
+      }
+
     }
     let params = {
       type: that.options.type,

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,6 +41,11 @@ import {
 import { getGoodsList } from '../../../Tools/getGoodsList'
 
 class BillboardObject extends Base {
+  #_postRenderEvent = null
+  #_destroyMouseEvent = null
+  #_billboardHeight = 0
+
+
   /**
    * @constructor
    * @description 创建点标注
@@ -118,6 +124,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 +152,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 +196,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 +361,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,6 +386,7 @@ class BillboardObject extends Base {
             return img
           }, false)
           addCluster(that.sdk, that.entity)
+          that.attributeBoxState && (that.attributeBoxState = true)
         }
       })
     }
@@ -298,6 +418,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 +430,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,15 +587,36 @@ class BillboardObject extends Base {
     return this.options.show
   }
   set show(v) {
-    if(!this.isShowView) {
+    if (!this.isShowView) {
       this.options.show = v
       this.originalOptions.show = v
     }
-    if(!this.showView || this.showView == 3) {
+    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)
@@ -562,6 +705,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)
   }
@@ -616,6 +779,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()
@@ -1716,6 +1880,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'
@@ -2227,6 +2407,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()
   }
@@ -2234,6 +2415,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
     }
@@ -2424,6 +2606,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
@@ -2439,6 +2622,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) {
@@ -2454,15 +2638,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
           }
         }
@@ -2736,6 +2923,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

@@ -181,7 +181,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)

src/Obj/Base/CurvelineObject/index.js

@@ -348,9 +348,10 @@ class CurvelineObject extends Base {
       this._elms.lineWidth.forEach(item => {
         item.value = this.options.width
       })
-    this.entity &&
-      this.entity.polyline &&
-      (this.entity.polyline.width = this.options.width)
+    if (this.entity && this.entity.polyline) {
+      this.entity.polyline.width = this.entity.polyline.width + v - this.entity.polyline.oriWidth
+      this.entity.polyline.oriWidth = this.options.width
+    }
   }
 
   get lineType() {
@@ -1384,10 +1385,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/FlyRoam/index.js

@@ -162,6 +162,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/GroundSvg/index.js

@@ -376,7 +376,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
     })
@@ -909,11 +912,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,
@@ -1213,9 +1215,12 @@ class GroundSvg extends Base {
   * @param {boolean} status=false 状态
   */
   drag(status, cd) {
-    if (!this.#loaded || !this.sdk || !this.sdk.viewer) {
+    if (!this.#loaded || !this.sdk || !this.sdk.viewer || !this.entity || !this.entity.values || this.entity.values.length == 0) {
       return
     }
+    let greenImg = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAA+0lEQVR4AZSTPQ7CMAyFk0jAFYCRCbgEbHAKBqRyKCoYOAVs5RLAQseKKxQkwntWVCltJdzK+bO/59ZW6kztGX6mi/F7dhiV0ydWzxH2B8ZquIkSAN47bzNAW2vtBKtY2G8ZIyPOMFUJxuX8DF+C8c+SwAonCSSr9SvxaCawogHrQl2aNwOPLKHWoa5N5O5woNZ575cdNBFKrQsdjgLaA7XSRK2gjWMJeVtA40MJOUvgxdHwDQYlZO5r/akRUTqoda/e4wo+xehqKbXSxKJ/3xlvL+oMYEUDgSTAaorBbY1V8yVpYIGb+G9kVtTFi3Vkh4XAFPZHxsjAVdkPAAD//0PYov0AAAAGSURBVAMA5pZjby819WUAAAAASUVORK5CYII='
+    let redImg = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAA1klEQVR4AZST0Q2CQBBEF0qhEfjDKvgwwaIk+kEV8oeFSCs4D4+gB4l7ZIfszc7OLXDkFl2zWSnchJcwB5DDlZHcfgwkvkowCmehENYghxuDZuU3AxUeYlvhX7RBu+iWCUSwc70wvlsdeixXwnN5do6tmaRkgiauJKwbDKqEhlhaYcAbjgvedYGBV3yow2A6rPjICQMOjk++V40Y9HvezfR5ZvaUvBNSo6OXCUzJRd2D4I0h9Gz/goiTuj2TsDNayW0zYJWZMQkH667199chh6uCRuVPvAEAAP//mBlPPAAAAAZJREFUAwAzdy+JgzpBHQAAAABJRU5ErkJggg=='
+    let yellowImg = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAA8ElEQVR4AZyQMY7CQAxFbbe7W7IH2GrJJaCDU1AgwaFAUHAK6OASQAM9UAJtzLxRBikUKMwo1jjf//0oNnk518t/534uZtdTcbidC6fooxZmL3apBdwv7Ym6rV1kqCp/yUwftTDDk3TuZ0D40tJdR4jvCg/e5IkBVWoviQ3uXsWI8c+kNoBqFhhYM7dBbfLBC6yVLl3JPLDGhjN5gY1LzA2AM3c50uQUrJnKWjIPrJVaLjJ5gbWf1n6j6tNPQ2Bg4xK/WrtxCFiFavqsKkZiANT377ZPKv27woM3eZ4BCKS6ll0VmbNhNIo+amGGBy3VAwAA//9///lSAAAABklEQVQDAADzbcvdBag1AAAAAElFTkSuQmCC'
     this.ismove = false
     this._isdrag = status
     if (this.ScreenSpaceEventHandler) {
@@ -1296,37 +1301,11 @@ class GroundSvg extends Base {
               angleH = bearing2 - bearingH
               if ((angleW > -360 && angleW < -90) || (angleW < 360 && angleW > 90)) {
                 angleW = angleW + 180
-                flag=true
+                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')
-                }
+                flag2 = true
               }
               
               radiansW = (Math.PI / 180) * angleW
@@ -1334,9 +1313,58 @@ class GroundSvg extends Base {
               // 矩形高度
               w = (Math.cos(radiansW) * distance) * 2
               h = (Math.cos(radiansH) * distance) * 2
+
+              if(h<0) {
+                flag2 = !flag2
+              }
+              if(w<0) {
+                flag = !flag
+              }
+              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')
+                this.pointEntityCollection.values[1].billboard.image = greenImg
+                this.pointEntityCollection.values[3].billboard.image = greenImg
+                this.pointEntityCollection.values[7].billboard.image = greenImg
+                this.pointEntityCollection.values[9].billboard.image = redImg
+              }
+              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')
+                  this.pointEntityCollection.values[1].billboard.image = greenImg
+                  this.pointEntityCollection.values[3].billboard.image = redImg
+                  this.pointEntityCollection.values[7].billboard.image = greenImg
+                  this.pointEntityCollection.values[9].billboard.image = greenImg
+                }
+                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')
+                  this.pointEntityCollection.values[1].billboard.image = greenImg
+                  this.pointEntityCollection.values[3].billboard.image = greenImg
+                  this.pointEntityCollection.values[7].billboard.image = redImg
+                  this.pointEntityCollection.values[9].billboard.image = greenImg
+                }
+                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')
+                  this.pointEntityCollection.values[1].billboard.image = redImg
+                  this.pointEntityCollection.values[3].billboard.image = greenImg
+                  this.pointEntityCollection.values[7].billboard.image = greenImg
+                  this.pointEntityCollection.values[9].billboard.image = greenImg
+                }
+              }
               // 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':
@@ -1345,12 +1373,16 @@ 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')
+                // this.pointEntityCollection.values[2].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                // this.pointEntityCollection.values[8].point.color = Cesium.Color.fromCssColorString('#ff0000')
+                this.pointEntityCollection.values[2].billboard.image = greenImg
+                this.pointEntityCollection.values[8].billboard.image = redImg
               }
               else {
-                this.pointEntityCollection.values[2].point.color = Cesium.Color.fromCssColorString('#ff0000')
-                this.pointEntityCollection.values[8].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                // this.pointEntityCollection.values[2].point.color = Cesium.Color.fromCssColorString('#ff0000')
+                // this.pointEntityCollection.values[8].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                this.pointEntityCollection.values[2].billboard.image = redImg
+                this.pointEntityCollection.values[8].billboard.image = greenImg
               }
 
               radiansH = (Math.PI / 180) * angleH
@@ -1368,37 +1400,11 @@ class GroundSvg extends Base {
 
               if ((angleW > -360 && angleW < -90) || (angleW < 360 && angleW > 90)) {
                 angleW = angleW + 180
-                flag=true
+                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')
-                }
+                flag2 = true
               }
 
               radiansW = (Math.PI / 180) * angleW
@@ -1406,9 +1412,59 @@ class GroundSvg extends Base {
               // 矩形高度
               w = (Math.cos(radiansW) * distance) * 2
               h = (Math.cos(radiansH) * distance) * 2
+
+              if(h<0) {
+                flag2 = !flag2
+              }
+              if(w<0) {
+                flag = !flag
+              }
+
+              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')
+                this.pointEntityCollection.values[1].billboard.image = greenImg
+                this.pointEntityCollection.values[3].billboard.image = greenImg
+                this.pointEntityCollection.values[7].billboard.image = redImg
+                this.pointEntityCollection.values[9].billboard.image = greenImg
+              }
+              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')
+                  this.pointEntityCollection.values[1].billboard.image = redImg
+                  this.pointEntityCollection.values[3].billboard.image = greenImg
+                  this.pointEntityCollection.values[7].billboard.image = greenImg
+                  this.pointEntityCollection.values[9].billboard.image = greenImg
+                }
+                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')
+                  this.pointEntityCollection.values[1].billboard.image = greenImg
+                  this.pointEntityCollection.values[3].billboard.image = greenImg
+                  this.pointEntityCollection.values[7].billboard.image = greenImg
+                  this.pointEntityCollection.values[9].billboard.image = redImg
+                }
+                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')
+                  this.pointEntityCollection.values[1].billboard.image = greenImg
+                  this.pointEntityCollection.values[3].billboard.image = redImg
+                  this.pointEntityCollection.values[7].billboard.image = greenImg
+                  this.pointEntityCollection.values[9].billboard.image = greenImg
+                }
+              }
               // 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)
@@ -1416,12 +1472,16 @@ 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')
+                // this.pointEntityCollection.values[4].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                // this.pointEntityCollection.values[6].point.color = Cesium.Color.fromCssColorString('#ff0000')
+                this.pointEntityCollection.values[4].billboard.image = greenImg
+                this.pointEntityCollection.values[6].billboard.image = redImg
               }
               else {
-                this.pointEntityCollection.values[6].point.color = Cesium.Color.fromCssColorString('#00ff0a')
-                this.pointEntityCollection.values[4].point.color = Cesium.Color.fromCssColorString('#ff0000')
+                // this.pointEntityCollection.values[6].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                // this.pointEntityCollection.values[4].point.color = Cesium.Color.fromCssColorString('#ff0000')
+                this.pointEntityCollection.values[6].billboard.image = greenImg
+                this.pointEntityCollection.values[4].billboard.image = redImg
               }
 
               radiansW = (Math.PI / 180) * angleW
@@ -1452,12 +1512,16 @@ 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')
+                // this.pointEntityCollection.values[6].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                // this.pointEntityCollection.values[4].point.color = Cesium.Color.fromCssColorString('#ff0000')
+                this.pointEntityCollection.values[6].billboard.image = greenImg
+                this.pointEntityCollection.values[4].billboard.image = redImg
               }
               else {
-                this.pointEntityCollection.values[4].point.color = Cesium.Color.fromCssColorString('#00ff0a')
-                this.pointEntityCollection.values[6].point.color = Cesium.Color.fromCssColorString('#ff0000')
+                // this.pointEntityCollection.values[4].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                // this.pointEntityCollection.values[6].point.color = Cesium.Color.fromCssColorString('#ff0000')
+                this.pointEntityCollection.values[4].billboard.image = greenImg
+                this.pointEntityCollection.values[6].billboard.image = redImg
               }
 
               radiansW = (Math.PI / 180) * angleW
@@ -1522,18 +1586,22 @@ class GroundSvg extends Base {
           }
           for (let i = 0; i < this.pointEntityCollection.values.length; i++) {
             if (pickPoint && this.pointEntityCollection.values[i].id === pickPoint.id) {
-              pickPoint.point.color = Cesium.Color.fromCssColorString('#ffff00')
+              // pickPoint.point.color = Cesium.Color.fromCssColorString('#ffff00')
+              pickPoint.billboard.image = yellowImg
             }
             else {
               switch (this.pointEntityCollection.values[i].id) {
                 case 'svg-control-points_5':
-                  this.pointEntityCollection.values[i].point.color = Cesium.Color.fromCssColorString('#ffff00')
+                  // this.pointEntityCollection.values[i].point.color = Cesium.Color.fromCssColorString('#ffff00')
+                  this.pointEntityCollection.values[i].billboard.image = yellowImg
                   break
                 case 'svg-control-points_0':
-                  this.pointEntityCollection.values[i].point.color = Cesium.Color.fromCssColorString('#ff0000')
+                  // this.pointEntityCollection.values[i].point.color = Cesium.Color.fromCssColorString('#ff0000')
+                  this.pointEntityCollection.values[i].billboard.image = redImg
                   break
                 default:
-                  this.pointEntityCollection.values[i].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                  // this.pointEntityCollection.values[i].point.color = Cesium.Color.fromCssColorString('#00ff0a')
+                  this.pointEntityCollection.values[i].billboard.image = greenImg
               }
             }
           }
@@ -1548,7 +1616,8 @@ class GroundSvg extends Base {
           ) {
             YJ.Global.CameraController(this.sdk, false)
             this.pickPoint = pickedObject.primitive._id
-            this.pickPoint.point.color = Cesium.Color.fromCssColorString('#ff0000')
+            // this.pickPoint.point.color = Cesium.Color.fromCssColorString('#ff0000')
+            this.pickPoint.billboard.image = redImg
             break
           }
         }
@@ -1558,13 +1627,16 @@ class GroundSvg extends Base {
           YJ.Global.CameraController(this.sdk, true)
           switch (this.pickPoint.id) {
             case 'svg-control-points_4':
-              this.pickPoint.point.color = Cesium.Color.fromCssColorString('#ffff00')
+              // this.pickPoint.point.color = Cesium.Color.fromCssColorString('#ffff00')
+              this.pickPoint.billboard.image = yellowImg
               break
             case 'svg-control-points_9':
-              this.pickPoint.point.color = Cesium.Color.fromCssColorString('#ff0000')
+              // this.pickPoint.point.color = Cesium.Color.fromCssColorString('#ff0000')
+              this.pickPoint.billboard.image = redImg
               break
             default:
-              this.pickPoint.point.color = Cesium.Color.fromCssColorString('#00ff0a')
+              // this.pickPoint.point.color = Cesium.Color.fromCssColorString('#00ff0a')
+              this.pickPoint.billboard.image = greenImg
           }
           this.pickPoint = null
         }
@@ -1603,16 +1675,19 @@ class GroundSvg extends Base {
       controlPoints[9] = turf.destination(point, wh, 0 + angle, options).geometry.coordinates
 
       this.controlPoints = controlPoints
-      if(!this.sdk || !this.sdk.viewer) {
+      if (!this.sdk || !this.sdk.viewer) {
         return
       }
       for (let i = 0; i < this.controlPoints.length; i++) {
         let color = '#00ff0a'
+        let img = greenImg
         if (i === 5) {
           color = '#ffff00'
+          img = yellowImg
         }
         if (i === 0) {
           color = '#ff0000'
+          img = redImg
         }
         let entity = this.sdk.viewer.entities.getOrCreateEntity('svg-control-points_' + i)
         entity.show = true
@@ -1620,11 +1695,18 @@ class GroundSvg extends Base {
         entity.position = new Cesium.CallbackProperty(() => {
           return Cesium.Cartesian3.fromDegrees(...this.controlPoints[i])
         })
-        entity.point = new Cesium.PointGraphics({
-          color: Cesium.Color.fromCssColorString(color), // 点的颜色
-          pixelSize: 10, // 点的大小
+        // entity.point = new Cesium.PointGraphics({
+        //   color: Cesium.Color.fromCssColorString(color), // 点的颜色
+        //   pixelSize: 10, // 点的大小
+        //   heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+        //   scaleByDistance: new Cesium.NearFarScalar(0.0, 1.0, 1.0e10, 1.0),
+        //   disableDepthTestDistance: Number.POSITIVE_INFINITY  // 不应用深度测试
+        // })
+        entity.billboard = new Cesium.BillboardGraphics({
+          image: img,
+          width: 10,
+          height: 10,
           heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
-          scaleByDistance: new Cesium.NearFarScalar(0.0, 1.0, 1.0e10, 1.0),
           disableDepthTestDistance: Number.POSITIVE_INFINITY  // 不应用深度测试
         })
         this.pointEntityCollection.add(entity)
@@ -1846,7 +1928,7 @@ class GroundSvg extends Base {
     })
     this.hierarchys = [...hierarchys]
 
-    if (!this.entity) {
+    if (!this.entity || !this.entity.values || this.entity.values.length == 0) {
       return
     }
 

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
@@ -438,11 +440,12 @@ class LabelObject extends Base {
     this.updateBillboardImage()
   }
   updateBillboardImage() {
-    clearTimeout(this.#updateBillboardImageTimeout)
-    this.#updateBillboardImageTimeout = setTimeout(() => {
-      clearTimeout(this.#updateBillboardImageTimeout)
-      this.entity && (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
@@ -489,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
@@ -509,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,
@@ -558,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/PolylineObject/index.js

@@ -1410,10 +1410,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']) {

src/Obj/Base/RadarScan/index.js

@@ -138,7 +138,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)

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/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(
@@ -103,17 +134,66 @@ class TextBox extends Base {
   }
   async getwords(words) {
     this.options.text = words
-    this.callback(this.options)
+
+    let { sdkP } = getSdk()
+    if (this.sdk === sdkP && sdkP) {//三维
+      this.callback(this.options)
+      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) {
+      this.callback(this.options)
+      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 +284,8 @@ 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)
+    syncData(this.sdk, this.options.id)
   }
 
   flicker() { }

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

@@ -649,7 +649,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

@@ -508,7 +508,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="0" 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

@@ -78,6 +78,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
@@ -180,7 +181,8 @@ class TrajectoryMotion extends Base {
         if (this.realTimeRoute) {
           this.realTimeLine && (this.realTimeLine.show = (!this.showView || this.showView == 3 || !sdkD) ? true : false)
         }
-        this.label && (this.label.show = (!this.showView || this.showView == 3 || !sdkD) ? this.options.label.show : false)
+        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 = (!this.showView || this.showView == 3 || !sdkD) ? this.options.show : false
@@ -203,6 +205,7 @@ class TrajectoryMotion extends Base {
           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
       }
 
@@ -257,14 +260,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)
@@ -1168,18 +1174,21 @@ class TrajectoryMotion extends Base {
       show = false
     }
     if (this.show) {
-      this.label && (this.label.show = 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])
-          }
-          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 {
@@ -1197,6 +1206,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 &&
@@ -1211,6 +1221,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({
@@ -1238,6 +1249,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
     })
@@ -1249,6 +1267,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
     })
@@ -1264,6 +1283,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
     })
@@ -1279,11 +1299,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)
@@ -1402,6 +1477,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)
 
 
@@ -1411,13 +1487,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,
@@ -1427,6 +1503,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++) {
@@ -1531,8 +1627,8 @@ class TrajectoryMotion extends Base {
     else {
       setPosition(startDistance)
       setTimeout(() => {
-        _this.model && (_this.model.isMove = false)
-      }, 500);
+        _this.model.isMove = false
+      }, 1000);
 
 
       animateUpdate()
@@ -1555,6 +1651,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()
@@ -1666,9 +1764,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)) {
@@ -1766,6 +1865,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)
@@ -1791,7 +1891,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,
@@ -2162,6 +2262,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])
     }
@@ -2169,6 +2270,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
@@ -2222,6 +2324,7 @@ class TrajectoryMotion extends Base {
       this.model && (this.model.show = false)
     }
     this.labelShow = this.originalOptions.label.show
+    this.fuelShow = this.originalOptions.fuelShow
     this.labelColor = this.originalOptions.label.color
     this.labelFontSize = this.originalOptions.label.fontSize
     this.labelFontFamily = this.originalOptions.label.fontFamily

src/Obj/Base/index.js

@@ -137,7 +137,7 @@ class Base extends Tools {
           this.originalOptions.show = v
         }
       }
-      this.entity._showView = this.showView
+      this.entity && (this.entity._showView = this.showView)
       if (this.type == 'layer') {
         if (this.entity) {
           this.entity._objectState = this.options.show

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/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

@@ -238,8 +238,8 @@ function StreamWall2() {
               else {
                 material.alpha = 1.0;
               }
-              material.diffuse = color.rgb*0.0;
-              material.emission = color.rgb * 1.0;
+              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(this,id)
-    unRegRightClickCallback(this,id)
-    unregMoveCallback(this,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,24 @@ 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 = () => {
+            // let { sdkP } = getSdk()
+            // if (_this == sdkP && sdkP) {//二维
+            //   _this.entityMap.get(_this.clickTextDom.id).getwords(_this.clickTextDom.getElementsByTagName('textarea')[0].value)
+            // } else if (!sdkP) {
+            _this.entityMap.get(_this.clickTextDom.id).getwords(_this.clickTextDom.getElementsByTagName('textarea')[0].value)
+            // }
+            _this.clickTextDom.querySelector('textarea').removeEventListener('blur', _this.blurFun)
+          }
+          _this.clickTextDom.querySelector('textarea').addEventListener('blur', _this.blurFun)
           break;
         }
       }
@@ -457,7 +472,7 @@ class YJEarth {
           click = true
         }
         mousemove = function (e) {
-          if (!click) {
+          if (!click || !_this.clickTextDom) {
             return
           }
           let width = _this.clickTextDom.clientWidth * 1
@@ -466,6 +481,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,15 +497,15 @@ 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.entityMap.get(_this.clickTextDom.id).getwords(_this.clickTextDom.getElementsByTagName('textarea')[0].value)
+        _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'
         _this.clickTextDom = undefined

static/custom/css/index.css

@@ -1429,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 {
@@ -1473,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 {
@@ -3097,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;
@@ -3109,6 +3134,8 @@
   padding: 5px 5px 0px 5px;
 }
 .popup-textarea textarea{
+  width: 158px;
+  height: 95px;
   background-color: unset!important;
   border: unset!important;
   color: #fff;
@@ -3466,6 +3493,7 @@
   cursor: e-resize;
   background-color: #d3d3d3;
   user-select: none;
+  z-index: 1;
 }
 
 .cesium-performanceDisplay-defaultContainer {
@@ -3586,22 +3614,36 @@
   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{
+
+.billboard-attribute-box .DIV-cy-tabs .DIV-cy-tab-top .DIV-cy-tab-pane-title span {
   margin: 0 5px;
 }
 
@@ -3609,4 +3651,173 @@
   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
+      /* 移回顶部外 */
+  }
 }