From 154ebc3d96f73bb3ceab99ea0229a3619d585aba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=A0=E6=9C=A8?= Date: Thu, 17 Jun 2021 22:38:22 +0800 Subject: [PATCH] fix(use-message): `content` not support vNode MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复封装的`useMessage`部分函数中`content`不支持vNode类型以及`createConfirm`不支持html的问题 --- src/hooks/web/useMessage.tsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/hooks/web/useMessage.tsx b/src/hooks/web/useMessage.tsx index ecb8fbbd..97f5b2d0 100644 --- a/src/hooks/web/useMessage.tsx +++ b/src/hooks/web/useMessage.tsx @@ -5,6 +5,7 @@ import { InfoCircleFilled, CheckCircleFilled, CloseCircleFilled } from '@ant-des import { ArgsProps, ConfigProps } from 'ant-design-vue/lib/notification'; import { useI18n } from './useI18n'; +import { isString } from '/@/utils/is'; export interface NotifyApi { info(config: ArgsProps): void; @@ -46,7 +47,11 @@ function getIcon(iconType: string) { } function renderContent({ content }: Pick) { - return
${content as string}
`}>; + if (isString(content)) { + return
${content as string}
`}>; + } else { + return content; + } } /** @@ -59,6 +64,7 @@ function createConfirm(options: ModalOptionsEx): ConfirmOptions { centered: true, icon: getIcon(iconType), ...options, + content: renderContent(options), }; return Modal.confirm(opt) as unknown as ConfirmOptions; } -- GitLab