mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-12-25 04:34:06 -08:00
Code Issues Actions 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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show stats 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'; import { Message, MessageBox } from 'element-ui';
export function useMessage() { export function useMessage() {
const handleCancelOrClose = (e: unknown) => {
if (e instanceof Error) throw e;
else return e;
};
async function alert( async function alert(
message: string, message: string,
configOrTitle?: string | ElMessageBoxOptions, configOrTitle?: string | ElMessageBoxOptions,
@ -14,9 +19,9 @@ export function useMessage() {
}; };
if (typeof configOrTitle === 'string') { 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( async function confirm(
@ -34,9 +39,9 @@ export function useMessage() {
}; };
if (typeof configOrTitle === 'string') { 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( async function prompt(
@ -51,9 +56,9 @@ export function useMessage() {
}; };
if (typeof configOrTitle === 'string') { 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 { return {