From 16f763218b165fa648cac9917ab130df0c4a9bad Mon Sep 17 00:00:00 2001 From: ZhouWei <1244620067@qq.com> Date: Wed, 10 May 2023 21:32:30 +0800 Subject: [PATCH 1/3] fix: segmentd disabled label is undefined --- components/segmented/src/segmented.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/components/segmented/src/segmented.tsx b/components/segmented/src/segmented.tsx index 48f65994b9..81b3c085c8 100644 --- a/components/segmented/src/segmented.tsx +++ b/components/segmented/src/segmented.tsx @@ -27,6 +27,7 @@ export interface SegmentedOption extends SegmentedBaseOption { function normalizeOptions(options: (SegmentedOption | string | number)[]) { return options.map(option => { if (typeof option === 'object' && option !== null) { + option.label = option.value; return option; } From 8f7cb57cf8d51b77552f5e146b9e8086a8843c9f Mon Sep 17 00:00:00 2001 From: ZhouWei <1244620067@qq.com> Date: Wed, 10 May 2023 22:03:24 +0800 Subject: [PATCH 2/3] fix: segmentd disabled label is undefined --- components/segmented/src/segmented.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/components/segmented/src/segmented.tsx b/components/segmented/src/segmented.tsx index 81b3c085c8..f3c7284dbd 100644 --- a/components/segmented/src/segmented.tsx +++ b/components/segmented/src/segmented.tsx @@ -27,7 +27,6 @@ export interface SegmentedOption extends SegmentedBaseOption { function normalizeOptions(options: (SegmentedOption | string | number)[]) { return options.map(option => { if (typeof option === 'object' && option !== null) { - option.label = option.value; return option; } @@ -102,7 +101,9 @@ const SegmentedOption: FunctionalComponent< payload, title, }) - : label} + : label + ? label + : value} ); From 993506a7c914fa90f7247a6ae4a6c3b977c8b292 Mon Sep 17 00:00:00 2001 From: ZhouWei <1244620067@qq.com> Date: Fri, 12 May 2023 09:55:52 +0800 Subject: [PATCH 3/3] fix: segmentd disabled label is undefined --- components/segmented/src/segmented.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/components/segmented/src/segmented.tsx b/components/segmented/src/segmented.tsx index f3c7284dbd..816db84380 100644 --- a/components/segmented/src/segmented.tsx +++ b/components/segmented/src/segmented.tsx @@ -101,9 +101,7 @@ const SegmentedOption: FunctionalComponent< payload, title, }) - : label - ? label - : value} + : label ?? value} );