From 7cf04da7eaba7cad9c3b5e5f674d2e038ebcd305 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 12 九月 2025 17:36:56 +0800
Subject: [PATCH] Merge branch 'master' into dev-v1.1
---
packages/utils/message.tsx | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/packages/utils/message.tsx b/packages/utils/message.tsx
index 2e3b9e6..fb8abd6 100644
--- a/packages/utils/message.tsx
+++ b/packages/utils/message.tsx
@@ -25,11 +25,19 @@
title?: string;
message?: string | VNode;
confirmText?: string;
+ cancelText?: string;
+ showCancelBtn?: boolean;
};
export class Message {
static confirm(options: ConfirmOptions = {}) {
- const { title = '鎻愮ず', message = '纭畾瑕佸垹闄よ鏁版嵁鍚�?', confirmText = '纭' } = options;
+ const {
+ title = '鎻愮ず',
+ message = '纭畾瑕佸垹闄よ鏁版嵁鍚�?',
+ confirmText = '纭',
+ cancelText = '鍙栨秷',
+ showCancelBtn = true,
+ } = options;
return new Promise((resolve, reject) => {
Portal.add((key) => {
return (
@@ -42,6 +50,8 @@
title={title}
visible={open.value}
content={message}
+ showCancelBtn={showCancelBtn}
+ cancelText={cancelText}
onCancel={() => {
onClose();
reject();
@@ -51,6 +61,11 @@
resolve(1);
}}
confirmText={confirmText}
+ //@ts-ignore
+ onClickOverlay={() => {
+ onClose();
+ reject();
+ }}
></Model>
),
}}
--
Gitblit v1.9.1