Merge pull request #595 from lixinghua123/LLMM-lxh

feat: Rect tool supports one-key setting invalid / feat: LLMMultiWheel tool label supports maximum display characters
open-mmlab · Dec 2, 2024 · cfc2c9e · cfc2c9e
2 parents 6b75591 + 79fabd8
commit cfc2c9e
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 10 deletions.
diff --git a/packages/lb-annotation/src/core/toolOperation/rectOperation.ts b/packages/lb-annotation/src/core/toolOperation/rectOperation.ts
@@ -995,11 +995,8 @@ class RectOperation extends BasicToolOperation {
     this.clearActiveStatus();
   }
 
-  public setRectValidAndRender(id: string) {
-    if (!id) {
-      return;
-    }
-
+  public setRectValidAndRender(id?: string) {
+    const hasValid = this.rectList.some((rect) => rect?.valid);
     this.setRectList(
       this.rectList.map((rect) => {
         if (rect.id === id) {
@@ -1008,6 +1005,9 @@ class RectOperation extends BasicToolOperation {
             valid: !rect.valid,
           };
         }
+        if (this.selection.isIdSelected(rect.id)) {
+          rect.valid = !hasValid;
+        }
         return rect;
       }),
       true,
@@ -1385,7 +1385,7 @@ class RectOperation extends BasicToolOperation {
         break;
 
       case EKeyCode.F:
-        if (this.selectedRectID) {
+        if (this.selectedIDs.length > 0) {
           this.setRectValidAndRender(this.selectedRectID);
         }
 

diff --git a/packages/lb-components/src/components/longText/index.tsx b/packages/lb-components/src/components/longText/index.tsx
@@ -18,7 +18,7 @@ interface IProps {
   openByText?: boolean; // hover文字展开
   style?: CSSProperties;
   isToolTips?: boolean;
-  wordCount?: number;
+  maxWordCount?: number;
   overflowMaxLines?: number;
 }
 
@@ -75,6 +75,7 @@ const LongText = (props: IProps) => {
     style,
     isToolTips,
     overflowMaxLines = 1,
+    maxWordCount,
   } = props;
 
   const el = useRef<null | HTMLDivElement>(null);
@@ -87,6 +88,29 @@ const LongText = (props: IProps) => {
     return el.current && el.current?.clientWidth < el.current?.scrollWidth;
   }, [size]);
 
+  if (maxWordCount) {
+    if (text.length > maxWordCount) {
+      const newText = text.substring(0, maxWordCount) + '...';
+      const tipsProps = {
+        placement,
+        content: text,
+      };
+      if (isToolTips) {
+        return (
+          <Tooltip {...tipsProps} title={text}>
+            <TextDom overflowMaxLines={overflowMaxLines} style={style} ref={el} text={newText} />
+          </Tooltip>
+        );
+      }
+      return (
+        <Popover {...tipsProps}>
+          <TextDom overflowMaxLines={overflowMaxLines} style={style} ref={el} text={newText} />
+        </Popover>
+      );
+    }
+    return <span>{text}</span>;
+  }
+
   if (openByText) {
     let tipsProps = {
       placement,

diff --git a/packages/lb-components/src/components/tagList/index.module.scss b/packages/lb-components/src/components/tagList/index.module.scss
@@ -27,7 +27,6 @@
 
     .tagItem {
       display: flex;
-      max-width: 60px;
     }
 
     .disabled {

diff --git a/packages/lb-components/src/components/tagList/index.tsx b/packages/lb-components/src/components/tagList/index.tsx
@@ -49,7 +49,7 @@ const CheckBoxList = ({ tagItem, selectedTags, handleChange, disabeledAll }: ICh
             })}
           >
             <span className={styles.tagItem}>
-              <LongText text={tag?.key} openByText={true} />
+              <LongText text={tag?.key} openByText={true} maxWordCount={10} />
             </span>
           </CheckableTag>
         ))}
@@ -72,7 +72,7 @@ const CheckBoxList = ({ tagItem, selectedTags, handleChange, disabeledAll }: ICh
       {subSelected.map((tag) => (
         <Radio value={tag?.value} key={tag?.value} disabled={disabled}>
           <span className={styles.tagItem}>
-            <LongText text={tag?.key} openByText={true} />
+            <LongText text={tag?.key} openByText={true} maxWordCount={10} />
           </span>
         </Radio>
       ))}