From 23bab85419ae78b1ab7f05724d7586b11b938533 Mon Sep 17 00:00:00 2001 From: Uyarn Date: Wed, 11 Jan 2023 10:57:05 +0800 Subject: [PATCH] fix(tree-select): label overflow --- src/_common | 2 +- src/dropdown/_example/multiple.jsx | 90 +++++++++++++++++++++++------- src/tree-select/_example/base.jsx | 6 ++ src/tree/TreeItem.tsx | 2 +- 4 files changed, 78 insertions(+), 22 deletions(-) diff --git a/src/_common b/src/_common index e221fde26..c1cc3302f 160000 --- a/src/_common +++ b/src/_common @@ -1 +1 @@ -Subproject commit e221fde263897c01ab2125f07368cc7ad9a854e9 +Subproject commit c1cc3302f7e5d32a1b9f450532b52cf77ede0118 diff --git a/src/dropdown/_example/multiple.jsx b/src/dropdown/_example/multiple.jsx index fad57d386..48c81849e 100644 --- a/src/dropdown/_example/multiple.jsx +++ b/src/dropdown/_example/multiple.jsx @@ -5,65 +5,115 @@ import { Icon } from 'tdesign-icons-react'; export default function BasicDropdown() { const options = [ { - content: '选项一', + content: '操作一', value: 1, children: [ { - content: '选项九', + content: '操作九', value: 9, }, ], }, { - content: '选项二选项二选项二选项二', + content: '操作二操作二操作二操作二', value: 2, children: [ { - content: '选项五', + content: '操作五', value: 5, }, { - content: '选项六', + content: '操作六', value: 6, - children: [ - { - content: '选项七', - value: 7, - }, - { - content: '选项八', - value: 8, - }, - ], }, ], }, { - content: '选项三', + content: '操作三', value: 3, children: [ { - content: '选项十', + content: '操作十', value: 10, }, ], }, { - content: '选项四', + content: '操作四', value: 4, children: [ { - content: '选项十一', + content: '操作十一', value: 11, }, ], }, + { + content: '操作五', + value: 5, + children: [ + { + content: '操作十二', + value: 12, + }, + ], + }, + { + content: '操作六', + value: 6, + children: [ + { + content: '操作十三', + value: 13, + }, + ], + }, + { + content: '操作七', + value: 7, + }, + { + content: '操作八', + value: 8, + }, + { + content: '操作十八', + value: 18, + children: [ + { + content: '操作十四', + value: 14, + }, + { + content: '操作十五', + value: 15, + }, + { + content: '操作十六', + value: 16, + children: [ + { + content: '三级操作一', + value: 20, + }, + { + content: '三级操作二', + value: 21, + }, + ], + }, + { + content: '操作十七', + value: 17, + }, + ], + }, ]; const clickHandler = (data) => { MessagePlugin.success(`选中【${data.value}】`); }; return ( - + diff --git a/src/tree-select/_example/base.jsx b/src/tree-select/_example/base.jsx index ed17e65d6..362b0a680 100644 --- a/src/tree-select/_example/base.jsx +++ b/src/tree-select/_example/base.jsx @@ -13,6 +13,12 @@ const options = [ { label: '深圳市', value: 'shenzhen', + children: [ + { + label: '南山区海天二路33号腾讯滨海大厦', + value: 'Tencent', + }, + ], }, ], }, diff --git a/src/tree/TreeItem.tsx b/src/tree/TreeItem.tsx index 4e4603f0b..b2ef65855 100644 --- a/src/tree/TreeItem.tsx +++ b/src/tree/TreeItem.tsx @@ -222,7 +222,7 @@ const TreeItem = forwardRef((props: TreeItemProps, ref: React.Ref + {labelText} );