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 (#3031)

pull/3048/head
John60676 2020-10-24 23:01:20 +08:00 committed by GitHub
parent 157d0e72e9
commit 9ac18c5e52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/modal/ConfirmDialog.jsx
View File

@ -82,7 +82,9 @@ const ConfirmDialog = (_, { attrs }) => {
<div class={`${contentPrefixCls}-body`}> <div class={`${contentPrefixCls}-body`}>
{typeof icon === 'function' ? icon() : icon} {typeof icon === 'function' ? icon() : icon}
{attrs.title === undefined ? null : ( {attrs.title === undefined ? null : (
<span class={`${contentPrefixCls}-title`}>{attrs.title}</span> <span class={`${contentPrefixCls}-title`}>
{typeof attrs.title === 'function' ? attrs.title() : attrs.title}
</span>
)} )}
<div class={`${contentPrefixCls}-content`}> <div class={`${contentPrefixCls}-content`}>
{typeof attrs.content === 'function' ? attrs.content() : attrs.content} {typeof attrs.content === 'function' ? attrs.content() : attrs.content}

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

@ -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>');
});
}); });