From e848523308be4662afb631e6117d642e0fbb445a Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 07 十一月 2025 16:37:55 +0800
Subject: [PATCH] Merge branch 'dev-1.3.0.1' of http://120.26.58.240:8888/r/flexJobMiniApp into dev-1.3.0.1
---
packages/utils/message.tsx | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/packages/utils/message.tsx b/packages/utils/message.tsx
index 2e3b9e6..bdd4b3b 100644
--- a/packages/utils/message.tsx
+++ b/packages/utils/message.tsx
@@ -25,13 +25,22 @@
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) => {
+ console.log('key: ', key);
return (
//@ts-ignore
<Portal.Container keyNumber={key} delayOpen>
@@ -42,6 +51,8 @@
title={title}
visible={open.value}
content={message}
+ showCancelBtn={showCancelBtn}
+ cancelText={cancelText}
onCancel={() => {
onClose();
reject();
@@ -51,6 +62,11 @@
resolve(1);
}}
confirmText={confirmText}
+ //@ts-ignore
+ onClickOverlay={() => {
+ onClose();
+ reject();
+ }}
></Model>
),
}}
--
Gitblit v1.10.0