From 9d1a36d8a4355f393cf2b2b8f1c69043d120783c Mon Sep 17 00:00:00 2001 From: sunny1011111 Date: Sun, 21 Aug 2022 19:40:18 +0800 Subject: [PATCH 1/2] fix: fix Node text exceeds container width --- src/tree/src/Tree.tsx | 2 +- src/tree/src/styles/index.cssr.ts | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/tree/src/Tree.tsx b/src/tree/src/Tree.tsx index 0e885668320..a8263e5eea0 100644 --- a/src/tree/src/Tree.tsx +++ b/src/tree/src/Tree.tsx @@ -556,7 +556,7 @@ export default defineComponent({ loadingKeys.delete(node.key) resolve() }) - .catch((loadError) => { + .catch((loadError: Error) => { console.error(loadError) resetDragExpandState() }) diff --git a/src/tree/src/styles/index.cssr.ts b/src/tree/src/styles/index.cssr.ts index 066885382ae..e34203bb4a8 100644 --- a/src/tree/src/styles/index.cssr.ts +++ b/src/tree/src/styles/index.cssr.ts @@ -79,8 +79,8 @@ export default cB('tree', ` ]), cM('block-node', [ cB('tree-node-content', ` - flex-grow: 1; - flex-shrink: 0; + flex: 1; + min-width: 0; `) ]), cNotM('block-line', [ @@ -224,7 +224,8 @@ export default cB('tree', ` cE('text', ` border-bottom: 1px solid #0000; transition: border-color .3s var(--n-bezier); - flex-grow:1; + flex-grow: 1; + max-width: 100%; `), cE('suffix', ` display: inline-flex; From f62b1ee9c48a90d2858e6c93242aa374e3610b69 Mon Sep 17 00:00:00 2001 From: 07akioni <07akioni2@gmail.com> Date: Sun, 28 Aug 2022 23:41:28 +0800 Subject: [PATCH 2/2] Apply suggestions from code review --- src/tree/src/styles/index.cssr.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tree/src/styles/index.cssr.ts b/src/tree/src/styles/index.cssr.ts index e34203bb4a8..cb1b3b0f5c7 100644 --- a/src/tree/src/styles/index.cssr.ts +++ b/src/tree/src/styles/index.cssr.ts @@ -79,8 +79,8 @@ export default cB('tree', ` ]), cM('block-node', [ cB('tree-node-content', ` - flex: 1; - min-width: 0; + flex: 1; + min-width: 0; `) ]), cNotM('block-line', [