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

Merge branch 'master' of https://github.com/vueComponent/ant-design-vue

pull/1396/head^2
tanjinzhou 2019-11-07 17:49:57 +08:00
parent c4bac70e9b 094f0325d9
commit 90ba73da7a
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/comment/__tests__/__snapshots__/demo.test.js.snap
View File

@ -124,7 +124,7 @@ exports[`renders ./components/comment/demo/nested.md correctly 1`] = `
</ul> </ul>
</div> </div>
</div> </div>
<div class="undefined-nested"> <div class="ant-comment-nested">
<div class="ant-comment"> <div class="ant-comment">
<div class="ant-comment-inner"> <div class="ant-comment-inner">
<div class="ant-comment-avatar"><span class="ant-avatar ant-avatar-circle ant-avatar-image"><img src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png" alt="Han Solo"></span></div> <div class="ant-comment-avatar"><span class="ant-avatar ant-avatar-circle ant-avatar-image"><img src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png" alt="Han Solo"></span></div>
@ -141,7 +141,7 @@ exports[`renders ./components/comment/demo/nested.md correctly 1`] = `
</ul> </ul>
</div> </div>
</div> </div>
<div class="undefined-nested"> <div class="ant-comment-nested">
<div class="ant-comment"> <div class="ant-comment">
<div class="ant-comment-inner"> <div class="ant-comment-inner">
<div class="ant-comment-avatar"><span class="ant-avatar ant-avatar-circle ant-avatar-image"><img src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png" alt="Han Solo"></span></div> <div class="ant-comment-avatar"><span class="ant-avatar ant-avatar-circle ant-avatar-image"><img src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png" alt="Han Solo"></span></div>

6
components/comment/index.jsx
View File

@ -30,9 +30,7 @@ const Comment = {
const actionList = actions.map((action, index) => <li key={`action-${index}`}>{action}</li>); const actionList = actions.map((action, index) => <li key={`action-${index}`}>{action}</li>);
return actionList; return actionList;
}, },
renderNested(children) { renderNested(prefixCls, children) {
const { prefixCls } = this.$props;
return <div class={`${prefixCls}-nested`}>{children}</div>; return <div class={`${prefixCls}-nested`}>{children}</div>;
}, },
}, },
@ -85,7 +83,7 @@ const Comment = {
return ( return (
<div class={prefixCls} {...{ on: this.$listeners }}> <div class={prefixCls} {...{ on: this.$listeners }}>
{comment} {comment}
{children ? this.renderNested(children) : null} {children ? this.renderNested(prefixCls, children) : null}
</div> </div>
); );
}, },