fix: 修复标注工具键盘事件配置未限制的错误

open-mmlab · Oct 14, 2021 · 3402d47 · 3402d47
1 parent 60c2497
commit 3402d47
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 13 deletions.
diff --git a/packages/lb-annotation/src/core/toolOperation/LineToolOperation.ts b/packages/lb-annotation/src/core/toolOperation/LineToolOperation.ts
@@ -1536,10 +1536,12 @@ class LineToolOperation extends BasicToolOperation {
     }
 
     if (this.isActive) {
-      const keyCode2Attribute = AttributeUtils.getAttributeByKeycode(e.keyCode, this.config.attributeList);
+      if (this.config.attributeConfigurable) {
+        const keyCode2Attribute = AttributeUtils.getAttributeByKeycode(e.keyCode, this.config.attributeList);
 
-      if (keyCode2Attribute !== undefined) {
-        this.setDefaultAttribute(keyCode2Attribute);
+        if (keyCode2Attribute !== undefined) {
+          this.setDefaultAttribute(keyCode2Attribute);
+        }
       }
     }
   }

diff --git a/packages/lb-annotation/src/core/toolOperation/pointOperation.ts b/packages/lb-annotation/src/core/toolOperation/pointOperation.ts
@@ -301,10 +301,12 @@ class PointOperation extends BasicToolOperation {
         this.render();
         break;
       default: {
-        const keyCode2Attribute = AttributeUtils.getAttributeByKeycode(keyCode, this.config.attributeList);
+        if (this.config.attributeConfigurable) {
+          const keyCode2Attribute = AttributeUtils.getAttributeByKeycode(keyCode, this.config.attributeList);
 
-        if (keyCode2Attribute !== undefined) {
-          this.setDefaultAttribute(keyCode2Attribute);
+          if (keyCode2Attribute !== undefined) {
+            this.setDefaultAttribute(keyCode2Attribute);
+          }
         }
         break;
       }

diff --git a/packages/lb-annotation/src/core/toolOperation/polygonOperation.ts b/packages/lb-annotation/src/core/toolOperation/polygonOperation.ts
@@ -640,10 +640,13 @@ class PolygonOperation extends BasicToolOperation {
       }
 
       default: {
-        const keyCode2Attribute = AttributeUtils.getAttributeByKeycode(keyCode, this.config.attributeList);
-
-        if (keyCode2Attribute !== undefined) {
-          this.setDefaultAttribute(keyCode2Attribute);
+        if (this.config.attributeConfigurable) {
+          const keyCode2Attribute = AttributeUtils.getAttributeByKeycode(keyCode, this.config.attributeList);
+
+          if (keyCode2Attribute !== undefined) {
+            this.setDefaultAttribute(keyCode2Attribute);
+          }
+
         }
         break;
       }

diff --git a/packages/lb-annotation/src/core/toolOperation/rectOperation.ts b/packages/lb-annotation/src/core/toolOperation/rectOperation.ts
@@ -1176,10 +1176,12 @@ class RectOperation extends BasicToolOperation {
       }
 
       default: {
-        const keyCode2Attribute = AttributeUtils.getAttributeByKeycode(keyCode, this.config.attributeList);
+        if (this.config.attributeConfigurable) {
+          const keyCode2Attribute = AttributeUtils.getAttributeByKeycode(keyCode, this.config.attributeList);
 
-        if (keyCode2Attribute !== undefined) {
-          this.setDefaultAttribute(keyCode2Attribute);
+          if (keyCode2Attribute !== undefined) {
+            this.setDefaultAttribute(keyCode2Attribute);
+          }
         }
 
         break;