Skip to content

Commit 7796894

Browse files
tangjinzhoutangjinzhou
committed
fix: comment actions not work
1 parent d3d631b commit 7796894

File tree

4 files changed

+50
-17
lines changed

4 files changed

+50
-17
lines changed

‎components/comment/__tests__/__snapshots__/demo.test.js.snap

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ exports[`renders ./antdv-demo/docs/comment/demo/list.md correctly 1`] = `
7373
<div class="ant-comment-content-detail">
7474
<p>We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure), to help people create their product prototypes beautifully and efficiently.</p>
7575
</div>
76-
<!---->
76+
<ul class="ant-comment-actions">
77+
<li><span>Reply to</span></li>
78+
</ul>
7779
</div>
7880
</div>
7981
<!---->
@@ -90,7 +92,9 @@ exports[`renders ./antdv-demo/docs/comment/demo/list.md correctly 1`] = `
9092
<div class="ant-comment-content-detail">
9193
<p>We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure), to help people create their product prototypes beautifully and efficiently.</p>
9294
</div>
93-
<!---->
95+
<ul class="ant-comment-actions">
96+
<li><span>Reply to</span></li>
97+
</ul>
9498
</div>
9599
</div>
96100
<!---->
@@ -117,7 +121,9 @@ exports[`renders ./antdv-demo/docs/comment/demo/nested.md correctly 1`] = `
117121
<div class="ant-comment-content-detail">
118122
<p> We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure). </p>
119123
</div>
120-
<!---->
124+
<ul class="ant-comment-actions">
125+
<li><span>Reply to</span></li>
126+
</ul>
121127
</div>
122128
</div>
123129
<div class="ant-comment-nested">
@@ -131,7 +137,9 @@ exports[`renders ./antdv-demo/docs/comment/demo/nested.md correctly 1`] = `
131137
<div class="ant-comment-content-detail">
132138
<p> We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure). </p>
133139
</div>
134-
<!---->
140+
<ul class="ant-comment-actions">
141+
<li><span>Reply to</span></li>
142+
</ul>
135143
</div>
136144
</div>
137145
<div class="ant-comment-nested">
@@ -145,7 +153,9 @@ exports[`renders ./antdv-demo/docs/comment/demo/nested.md correctly 1`] = `
145153
<div class="ant-comment-content-detail">
146154
<p> We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure). </p>
147155
</div>
148-
<!---->
156+
<ul class="ant-comment-actions">
157+
<li><span>Reply to</span></li>
158+
</ul>
149159
</div>
150160
</div>
151161
<!---->
@@ -160,7 +170,9 @@ exports[`renders ./antdv-demo/docs/comment/demo/nested.md correctly 1`] = `
160170
<div class="ant-comment-content-detail">
161171
<p> We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure). </p>
162172
</div>
163-
<!---->
173+
<ul class="ant-comment-actions">
174+
<li><span>Reply to</span></li>
175+
</ul>
164176
</div>
165177
</div>
166178
<!---->

‎components/comment/index.jsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,11 @@ const Comment = {
5555
</div>
5656
);
5757

58-
const actionDom =
59-
actions && actions.length ? (
60-
<ul class={`${prefixCls}-actions`}>{this.getAction(actions)}</ul>
61-
) : null;
58+
const actionDom = actions ? (
59+
<ul class={`${prefixCls}-actions`}>
60+
{this.getAction(Array.isArray(actions) ? actions : [actions])}
61+
</ul>
62+
) : null;
6263

6364
const authorContent = (
6465
<div class={`${prefixCls}-content-author`}>

‎components/mentions/__tests__/__snapshots__/demo.test.js.snap

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

3-
exports[`renders ./antdv-demo/docs/mentions/demo/async.md correctly 1`] = `<div class="ant-mentions"><textarea rows="1"></textarea></div>`;
3+
exports[`renders ./antdv-demo/docs/mentions/demo/async.md correctly 1`] = `
4+
<div class="ant-mentions"><textarea rows="1"></textarea>
5+
<!---->
6+
</div>
7+
`;
48

5-
exports[`renders ./antdv-demo/docs/mentions/demo/basic.md correctly 1`] = `<div class="ant-mentions"><textarea rows="1"></textarea></div>`;
9+
exports[`renders ./antdv-demo/docs/mentions/demo/basic.md correctly 1`] = `
10+
<div class="ant-mentions"><textarea autofocus="" rows="1"></textarea>
11+
<!---->
12+
</div>
13+
`;
614

715
exports[`renders ./antdv-demo/docs/mentions/demo/form.md correctly 1`] = `
816
<form class="ant-form ant-form-horizontal">
@@ -32,15 +40,27 @@ exports[`renders ./antdv-demo/docs/mentions/demo/form.md correctly 1`] = `
3240
</form>
3341
`;
3442

35-
exports[`renders ./antdv-demo/docs/mentions/demo/placement.md correctly 1`] = `<div class="ant-mentions"><textarea rows="1"></textarea></div>`;
43+
exports[`renders ./antdv-demo/docs/mentions/demo/placement.md correctly 1`] = `
44+
<div class="ant-mentions"><textarea rows="1"></textarea>
45+
<!---->
46+
</div>
47+
`;
3648

37-
exports[`renders ./antdv-demo/docs/mentions/demo/prefix.md correctly 1`] = `<div class="ant-mentions"><textarea rows="1" placeholder="input @ to mention people, # to mention tag"></textarea></div>`;
49+
exports[`renders ./antdv-demo/docs/mentions/demo/prefix.md correctly 1`] = `
50+
<div class="ant-mentions"><textarea rows="1" placeholder="input @ to mention people, # to mention tag"></textarea>
51+
<!---->
52+
</div>
53+
`;
3854

3955
exports[`renders ./antdv-demo/docs/mentions/demo/readonly.md correctly 1`] = `
4056
<div>
4157
<div style="margin-bottom: 10px;">
42-
<div class="ant-mentions ant-mentions-disabled"><textarea disabled="disabled" rows="1" placeholder="this is disabled Mentions"></textarea></div>
58+
<div class="ant-mentions ant-mentions-disabled"><textarea disabled="" rows="1" placeholder="this is disabled Mentions"></textarea>
59+
<!---->
60+
</div>
61+
</div>
62+
<div class="ant-mentions"><textarea rows="1" placeholder="this is readOnly a-mentions" readonly=""></textarea>
63+
<!---->
4364
</div>
44-
<div class="ant-mentions"><textarea rows="1" placeholder="this is readonly a-mentions" readonly="readonly"></textarea></div>
4565
</div>
4666
`;

‎examples/App.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
</div>
55
</template>
66
<script>
7-
import demo from '../antdv-demo/docs/menu/demo/template';
7+
import demo from '../antdv-demo/docs/comment/demo/nested';
88
99
export default {
1010
components: {

0 commit comments

Comments
 (0)