From e434725e9e6654f97342c9fcb473b4d2a6e655d9 Mon Sep 17 00:00:00 2001
From: ZhouWei <1244620067@qq.com>
Date: Mon, 17 Jul 2023 12:16:39 +0800
Subject: [PATCH 1/2] docs(Modal): confim default oktext synch

---
 components/locale/zh_CN.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/locale/zh_CN.ts b/components/locale/zh_CN.ts
index 3455f4f082..cb7b7dc9d8 100644
--- a/components/locale/zh_CN.ts
+++ b/components/locale/zh_CN.ts
@@ -43,7 +43,7 @@ const localeValues: Locale = {
   Modal: {
     okText: '确定',
     cancelText: '取消',
-    justOkText: '知道了',
+    justOkText: '确定',
   },
   Popconfirm: {
     cancelText: '取消',

From a3153bd0e1544bba02decf6d878c9c100c773aad Mon Sep 17 00:00:00 2001
From: ZhouWei <1244620067@qq.com>
Date: Wed, 19 Jul 2023 02:36:22 +0800
Subject: [PATCH 2/2] fix: okText logic

---
 components/locale/zh_CN.ts         |  2 +-
 components/modal/ConfirmDialog.tsx | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/locale/zh_CN.ts b/components/locale/zh_CN.ts
index cb7b7dc9d8..3455f4f082 100644
--- a/components/locale/zh_CN.ts
+++ b/components/locale/zh_CN.ts
@@ -43,7 +43,7 @@ const localeValues: Locale = {
   Modal: {
     okText: '确定',
     cancelText: '取消',
-    justOkText: '确定',
+    justOkText: '知道了',
   },
   Popconfirm: {
     cancelText: '取消',
diff --git a/components/modal/ConfirmDialog.tsx b/components/modal/ConfirmDialog.tsx
index 2653dbf279..dc1a2cfe71 100644
--- a/components/modal/ConfirmDialog.tsx
+++ b/components/modal/ConfirmDialog.tsx
@@ -88,6 +88,7 @@ export default defineComponent<ConfirmDialogProps>({
         onCancel,
         onOk,
         close,
+        okText,
         closable = false,
         zIndex,
         afterClose,
@@ -141,9 +142,6 @@ export default defineComponent<ConfirmDialogProps>({
       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<ConfirmDialogProps>({
         attrs.class,
       );
 
+      const mergedLocal = locale.value;
+
       const cancelButton = mergedOkCancel && (
         <ActionButton
           actionFn={onCancel}
@@ -165,7 +165,7 @@ export default defineComponent<ConfirmDialogProps>({
           buttonProps={cancelButtonProps}
           prefixCls={`${rootPrefixCls}-btn`}
         >
-          {renderSomeContent(props.cancelText) || locale.value.cancelText}
+          {renderSomeContent(props.cancelText) || mergedLocal.cancelText}
         </ActionButton>
       );
       return (
@@ -219,7 +219,7 @@ export default defineComponent<ConfirmDialogProps>({
                   buttonProps={okButtonProps}
                   prefixCls={`${rootPrefixCls}-btn`}
                 >
-                  {okText}
+                  {okText || (mergedOkCancel ? mergedLocal.okText : mergedLocal.justOkText)}
                 </ActionButton>
               </div>
             )}