From 6e88705bd5b443a259b24c17c8a299765d059d96 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 23 Jul 2026 16:50:41 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/drone-command/src/utils/cesium/shapeTools/edit/EditEllipseTool.js | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/applications/drone-command/src/utils/cesium/shapeTools/edit/EditEllipseTool.js b/applications/drone-command/src/utils/cesium/shapeTools/edit/EditEllipseTool.js
index 7d41ec1..1a8ad67 100644
--- a/applications/drone-command/src/utils/cesium/shapeTools/edit/EditEllipseTool.js
+++ b/applications/drone-command/src/utils/cesium/shapeTools/edit/EditEllipseTool.js
@@ -117,7 +117,7 @@
this.handler.setInputAction(evt => this.handleLeftDown(evt), Cesium.ScreenSpaceEventType.LEFT_DOWN)
this.handler.setInputAction(evt => this.handleMouseMove(evt), Cesium.ScreenSpaceEventType.MOUSE_MOVE)
this.handler.setInputAction(() => this.handleLeftUp(), Cesium.ScreenSpaceEventType.LEFT_UP)
- this.tooltip.show('拖动控制点编辑', { x: 0, y: 0 })
+ this.tooltip.hide()
}
handleLeftDown(evt) {
@@ -130,7 +130,12 @@
}
handleMouseMove(evt) {
- this.tooltip.move(evt.endPosition)
+ if (!this.tooltip?.isVisible) {
+ this.tooltip.show('拖动控制点编辑', evt.endPosition)
+ } else {
+ this.tooltip.show('拖动控制点编辑')
+ this.tooltip.move(evt.endPosition)
+ }
if (!this.dragType) return
const position = this.getPositionFromScreen(evt.endPosition)
if (!position) return
@@ -250,7 +255,8 @@
getPositionFromScreen(screenPosition) {
const scene = this.viewer.scene
- const cartesian = scene.pickPosition(screenPosition)
+ const ray = scene.camera.getPickRay(screenPosition)
+ const cartesian = ray ? scene.globe.pick(ray, scene) : null
if (cartesian) return cartesian
return scene.camera.pickEllipsoid(screenPosition, scene.globe.ellipsoid)
}
--
Gitblit v1.9.3