From 899f3474a9bc54d1a72710b4fd992176c1888e70 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Thu, 16 Jul 2026 17:08:49 +0800
Subject: [PATCH] feat:增加轨迹状态默认值

---
 applications/drone-command/src/utils/cesium/shapeTools/draw/DrawRectangleTool.js |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/applications/drone-command/src/utils/cesium/shapeTools/draw/DrawRectangleTool.js b/applications/drone-command/src/utils/cesium/shapeTools/draw/DrawRectangleTool.js
index bf89199..a5686a9 100644
--- a/applications/drone-command/src/utils/cesium/shapeTools/draw/DrawRectangleTool.js
+++ b/applications/drone-command/src/utils/cesium/shapeTools/draw/DrawRectangleTool.js
@@ -33,7 +33,7 @@
 		this.handler.setInputAction(click => this.handleLeftClick(click), Cesium.ScreenSpaceEventType.LEFT_CLICK)
 		this.handler.setInputAction(movement => this.handleMouseMove(movement), Cesium.ScreenSpaceEventType.MOUSE_MOVE)
 
-		this.tooltip.show('单击设置起点', { x: 0, y: 0 })
+		this.tooltip.hide()
 	}
 
 	handleLeftClick(click) {
@@ -60,14 +60,17 @@
 	}
 
 	handleMouseMove(movement) {
-		if (!this.isDrawing) {
+		const tipText = this.startPosition ? '单击结束绘制' : '单击设置起点'
+		if (!this.tooltip?.isVisible) {
+			this.tooltip.show(tipText, movement.endPosition)
+		} else {
+			this.tooltip.show(tipText)
 			this.tooltip.move(movement.endPosition)
-			return
 		}
+		if (!this.isDrawing) return
 		const position = this.getPositionFromScreen(movement.endPosition)
 		if (!position) return
 		this.endPosition = position
-		this.tooltip.move(movement.endPosition)
 	}
 
 	createEntities() {
@@ -114,7 +117,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