From 7bfe30d28005e18fd914022c15aef8d4769553ac Mon Sep 17 00:00:00 2001 From: selicens <1244620067@qq.com> Date: Sun, 6 Aug 2023 12:43:09 +0800 Subject: [PATCH] docs(Modal): confirm default oktext synch (#6745) (#6748) * docs(Modal): confim default oktext synch * fix: okText logic --- components/modal/ConfirmDialog.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/components/modal/ConfirmDialog.tsx b/components/modal/ConfirmDialog.tsx index 2653dbf27..dc1a2cfe7 100644 --- a/components/modal/ConfirmDialog.tsx +++ b/components/modal/ConfirmDialog.tsx @@ -88,6 +88,7 @@ export default defineComponent({ onCancel, onOk, close, + okText, closable = false, zIndex, afterClose, @@ -141,9 +142,6 @@ export default defineComponent({ const prefixCls = props.prefixCls || 'ant-modal'; const contentPrefixCls = `${prefixCls}-confirm`; const style = attrs.style || {}; - const okText = - renderSomeContent(props.okText) || - (okCancel ? locale.value.okText : locale.value.justOkText); const mergedOkCancel = okCancel ?? type === 'confirm'; const autoFocusButton = props.autoFocusButton === null ? false : props.autoFocusButton || 'ok'; @@ -157,6 +155,8 @@ export default defineComponent({ attrs.class, ); + const mergedLocal = locale.value; + const cancelButton = mergedOkCancel && ( ({ buttonProps={cancelButtonProps} prefixCls={`${rootPrefixCls}-btn`} > - {renderSomeContent(props.cancelText) || locale.value.cancelText} + {renderSomeContent(props.cancelText) || mergedLocal.cancelText} ); return ( @@ -219,7 +219,7 @@ export default defineComponent({ buttonProps={okButtonProps} prefixCls={`${rootPrefixCls}-btn`} > - {okText} + {okText || (mergedOkCancel ? mergedLocal.okText : mergedLocal.justOkText)} )}