feat: 添加右键取消选中的功能

open-mmlab · Sep 14, 2024 · dd1aea1 · dd1aea1
1 parent 88d6b6b
commit dd1aea1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/packages/lb-annotation/src/core/pointCloud/index.ts b/packages/lb-annotation/src/core/pointCloud/index.ts
@@ -241,7 +241,9 @@ export class PointCloud extends EventListener {
       if (intersects.length > 0) {
         const intersectedObject = intersects[0].object;
         this.pipe?.setNeedUpdateCenter(false);
-        this.pipe?.setSelectedIDs([intersectedObject.userData.selectedID]);
+        this.pipe?.setSelectedIDs(intersectedObject.userData.selectedID);
+      } else {
+        this.pipe?.setSelectedIDs(undefined);
       }
     });
   }

diff --git a/packages/lb-annotation/src/core/toolOperation/ViewOperation.ts b/packages/lb-annotation/src/core/toolOperation/ViewOperation.ts
@@ -183,7 +183,6 @@ export default class ViewOperation extends BasicToolOperation {
 
   public onRightClick(e: MouseEvent): void {
     const targetId = this.getClickTargetId(e);
-    if (!targetId) return;
     this.needUpdatePosition = false;
     if (this.posTimer) {
       clearTimeout(this.posTimer);

diff --git a/packages/lb-annotation/src/core/toolOperation/basicToolOperation.ts b/packages/lb-annotation/src/core/toolOperation/basicToolOperation.ts
@@ -830,7 +830,6 @@ class BasicToolOperation extends EventListener {
     this.container.addEventListener('mouseleave', this.onMouseLeave);
     this.container.addEventListener('click', this.onClick);
     this.container.addEventListener('wheel', this.onWheel);
-    this.container.addEventListener('contextmenu', this.onRightClick);
     document.addEventListener('keydown', this.onKeyDown);
     document.addEventListener('keyup', this.onKeyUp);
     window.parent.document.addEventListener('contextmenu', this.onContextmenu, false);
@@ -843,7 +842,6 @@ class BasicToolOperation extends EventListener {
     this.container.removeEventListener('mouseleave', this.onMouseLeave);
     this.container.removeEventListener('wheel', this.onWheel);
     this.container.removeEventListener('click', this.onClick);
-    this.container.removeEventListener('contextmenu', this.onRightClick);
     document.removeEventListener('keydown', this.onKeyDown);
     document.removeEventListener('keyup', this.onKeyUp);
     window.parent.document.removeEventListener('contextmenu', this.onContextmenu, false);
@@ -957,6 +955,10 @@ class BasicToolOperation extends EventListener {
     }
 
     this.startTime = 0;
+
+    if (e.button === 2) {
+      this.onRightClick(e);
+    }
     this.render();
   }
 

diff --git a/packages/lb-annotation/src/core/toolOperation/pointCloud2DRectOperation.ts b/packages/lb-annotation/src/core/toolOperation/pointCloud2DRectOperation.ts
@@ -134,9 +134,7 @@ class PointCloud2DRectOperation extends RectOperation {
 
   public rightMouseUp(e: MouseEvent) {
     const hoverRect: (IRect & { boxID?: string }) | undefined = super.rightMouseUp(e);
-    if (hoverRect) {
-      this.emit('onRightClick', { event: e, targetId: hoverRect.boxID });
-    }
+    this.emit('onRightClick', { event: e, targetId: hoverRect?.boxID });
     return hoverRect;
   }
 }