github
/
ant-design-vue
mirror of https://github.com/vueComponent/ant-design-vue
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(modal): title props support render function (#3030)

pull/3052/head
John60676 2020-10-24 23:33:24 +08:00 committed by GitHub
parent 4a3e310db7
commit 6c521620b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/modal/ConfirmDialog.jsx
View File

@ -94,7 +94,9 @@ export default {
<div class={`${contentPrefixCls}-body`}> <div class={`${contentPrefixCls}-body`}>
{iconNode} {iconNode}
{props.title === undefined ? null : ( {props.title === undefined ? null : (
<span class={`${contentPrefixCls}-title`}>{props.title}</span> <span class={`${contentPrefixCls}-title`}>
{typeof props.title === 'function' ? props.title(h) : props.title}
</span>
)} )}
<div class={`${contentPrefixCls}-content`}> <div class={`${contentPrefixCls}-content`}>
{typeof props.content === 'function' ? props.content(h) : props.content} {typeof props.content === 'function' ? props.content(h) : props.content}

10
components/modal/__tests__/confirm.test.js
View File

@ -88,7 +88,7 @@ describe('Modal.confirm triggers callbacks correctly', () => {
expect($$('.ant-btn')[1].disabled).toBe(true); expect($$('.ant-btn')[1].disabled).toBe(true);
}); });
fit('trigger onCancel once when click on cancel button', async () => { it('trigger onCancel once when click on cancel button', async () => {
const arr = ['info', 'success', 'warning', 'error']; const arr = ['info', 'success', 'warning', 'error'];
for (let type of arr) { for (let type of arr) {
Modal[type]({ Modal[type]({
@ -102,4 +102,12 @@ describe('Modal.confirm triggers callbacks correctly', () => {
expect($$(`.ant-modal-confirm-${type}`)).toHaveLength(0); expect($$(`.ant-modal-confirm-${type}`)).toHaveLength(0);
} }
}); });
it('should render title', async () => {
open({
title: h => <span>title</span>,
});
await sleep();
expect($$('.ant-modal-confirm-title')[0].innerHTML).toBe('<span>title</span>');
});
}); });