mohiit1502/Automata
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(editor): Fix close and cancel operations on useMessage (no-changelog) (#6260)

Browse Source
This commit is contained in:
कारतोफ्फेलस्क्रिप्ट™
2023-05-16 09:00:22 +00:00
committed by GitHub
parent cd7c312fbd
commit 4a0e1b9e02
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/editor-ui/src/composables/useMessage.ts
View File

@@ -2,6 +2,11 @@ import type { ElMessageBoxOptions } from 'element-ui/types/message-box';
import { Message, MessageBox } from 'element-ui';
export function useMessage() {
const handleCancelOrClose = (e: unknown) => {
if (e instanceof Error) throw e;
else return e;
};
async function alert(
message: string,
configOrTitle?: string | ElMessageBoxOptions,
@@ -14,9 +19,9 @@ export function useMessage() {
};
if (typeof configOrTitle === 'string') {
return MessageBox.alert(message, configOrTitle, resolvedConfig);
return MessageBox.alert(message, configOrTitle, resolvedConfig).catch(handleCancelOrClose);
}
return MessageBox.alert(message, resolvedConfig);
return MessageBox.alert(message, resolvedConfig).catch(handleCancelOrClose);
}
async function confirm(
@@ -34,9 +39,9 @@ export function useMessage() {
};
if (typeof configOrTitle === 'string') {
return MessageBox.confirm(message, configOrTitle, resolvedConfig);
return MessageBox.confirm(message, configOrTitle, resolvedConfig).catch(handleCancelOrClose);
}
return MessageBox.confirm(message, resolvedConfig);
return MessageBox.confirm(message, resolvedConfig).catch(handleCancelOrClose);
}
async function prompt(
@@ -51,9 +56,9 @@ export function useMessage() {
};
if (typeof configOrTitle === 'string') {
return MessageBox.prompt(message, configOrTitle, resolvedConfig);
return MessageBox.prompt(message, configOrTitle, resolvedConfig).catch(handleCancelOrClose);
}
return MessageBox.prompt(message, resolvedConfig);
return MessageBox.prompt(message, resolvedConfig).catch(handleCancelOrClose);
}
return {