From be6f99d4ed16d48ac894749b2e37a1472b6e696c Mon Sep 17 00:00:00 2001 From: BoyYangZai <2365539910@qq.com> Date: Thu, 29 Dec 2022 11:50:19 +0800 Subject: [PATCH] fix: useModal default okText --- components/modal/useModal/HookModal.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/components/modal/useModal/HookModal.tsx b/components/modal/useModal/HookModal.tsx index ecbeee322dd6..66a71e3ae2cd 100644 --- a/components/modal/useModal/HookModal.tsx +++ b/components/modal/useModal/HookModal.tsx @@ -44,6 +44,8 @@ const HookModal: React.ForwardRefRenderFunction = }, })); + const mergedOkCancel = innerConfig.okCancel ?? innerConfig.type === 'confirm'; + return ( {(contextLocale) => ( @@ -55,8 +57,7 @@ const HookModal: React.ForwardRefRenderFunction = open={open} afterClose={afterClose} okText={ - innerConfig.okText || - (innerConfig.okCancel ? contextLocale.okText : contextLocale.justOkText) + innerConfig.okText || (mergedOkCancel ? contextLocale.okText : contextLocale.justOkText) } direction={direction} cancelText={innerConfig.cancelText || contextLocale.cancelText}