Skip to content

Commit

Permalink
fix(use-message): content not support vNode
Browse files Browse the repository at this point in the history
修复封装的`useMessage`部分函数中`content`不支持vNode类型以及`createConfirm`不支持html的问题
  • Loading branch information
mynetfan committed Jun 17, 2021
1 parent 0acc4ab commit 154ebc3
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion src/hooks/web/useMessage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -46,7 +47,11 @@ function getIcon(iconType: string) {
}

function renderContent({ content }: Pick<ModalOptionsEx, 'content'>) {
return <div innerHTML={`<div>${content as string}</div>`}></div>;
if (isString(content)) {
return <div innerHTML={`<div>${content as string}</div>`}></div>;
} else {
return content;
}
}

/**
Expand All @@ -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;
}
Expand Down

0 comments on commit 154ebc3

Please sign in to comment.