fixed bug of notice when has render and title bug no desc

This commit is contained in:
zhigang.li 2018-01-05 15:23:46 +08:00
parent 6b2cd6742a
commit efc65a34ff
2 changed files with 17 additions and 2 deletions

View file

@ -6,6 +6,7 @@
<Button @click="success(false)">成功</Button> <Button @click="success(false)">成功</Button>
<Button @click="warning(false)">警告</Button> <Button @click="warning(false)">警告</Button>
<Button @click="error(false)">错误</Button> <Button @click="error(false)">错误</Button>
<Button @click="testRender()">render</Button>
<p>仅标题</p> <p>仅标题</p>
<Button @click="info(true)">消息</Button> <Button @click="info(true)">消息</Button>
<Button @click="success(true)">成功</Button> <Button @click="success(true)">成功</Button>
@ -54,7 +55,7 @@
warning (nodesc) { warning (nodesc) {
this.$Notice.warning({ this.$Notice.warning({
title: '这是通知标题', title: '这是通知标题',
desc: nodesc ? '' : '这里是通知描述这里,是通知描述这里是通知描述这里,是通知描述这里,是通知描述这里是通知描述这里是通知描述' desc: nodesc ? '' : '这里是通知描述这里,是通知描述这里是通知描述这里,是通知描述这里,是通知描述这里是通知描述这里是通知描述',
}); });
}, },
error (nodesc) { error (nodesc) {
@ -63,6 +64,20 @@
desc: nodesc ? '' : '这里是通知描述这里,是通知描述这里是通知描述这里,是通知描述这里,是通知描述这里是通知描述这里是通知描述' desc: nodesc ? '' : '这里是通知描述这里,是通知描述这里是通知描述这里,是通知描述这里,是通知描述这里是通知描述这里是通知描述'
}); });
}, },
testRender () {
this.$Notice.info({
title: '这是通知标题',
duration: 0,
// desc: 'render',
render: h => {
return h('span', {}, [
'这是',
h('Button', {props: {type: 'text'}}, 'render'),
'函数渲染的'
]);
},
});
},
destroy () { destroy () {
this.$Notice.destroy(); this.$Notice.destroy();
} }

View file

@ -45,7 +45,7 @@ function notice (type, options) {
let withIcon; let withIcon;
const with_desc = (options.render && !title) ? '' : desc === '' ? '' : ` ${prefixCls}-with-desc`; const with_desc = (options.render && !title) ? '' : (desc || options.render) ? ` ${prefixCls}-with-desc` : '';
if (type == 'normal') { if (type == 'normal') {
withIcon = false; withIcon = false;