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/draw/DrawRectangleTool.js | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 574f6b6..a5686a9 100644
--- a/applications/drone-command/src/utils/cesium/shapeTools/draw/DrawRectangleTool.js
+++ b/applications/drone-command/src/utils/cesium/shapeTools/draw/DrawRectangleTool.js
@@ -1,5 +1,5 @@
import * as Cesium from 'cesium'
-import { MapTooltip } from '../Tooltip'
+import { MapTooltip } from '@ztzf/utils'
import { ToolBase } from '../ToolBase'
import { getBoundsFromCartesians, rectanglePositionsFromBounds } from '../shapeUtils'
@@ -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