Skip to content

Commit 578a766

Browse files
yeyn19yeyn19
committed
update
1 parent 5c00536 commit 578a766

File tree

4 files changed

+99
-115
lines changed

4 files changed

+99
-115
lines changed

‎src/components/CommentBlock/CommentBlocks.vue‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<a-list
55
:data-source="comments"
66
:load="true"
7-
:size="large"
7+
size="large"
88
:split="false"
99
:pagination="{ ...pagination, onChange: onChange, onShowSizeChange: showSizeChange}"
1010
ref="comments"
@@ -58,6 +58,7 @@ export default {
5858
props: ['targetType', 'targetID'],
5959
data () {
6060
return {
61+
submitting: false,
6162
blockLoading: true,
6263
canEdit: false,
6364
canDeleteComment: false,

‎src/components/CommentBlock/OneComment.vue‎

Lines changed: 95 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -1,107 +1,105 @@
11
<template>
2-
<a-comment>
3-
<div>
4-
<a-spin :spinning="loading">
5-
<a-skeleton active :loading="loading">
6-
<div :style="{'--coll': this.coll}" class="basic">
2+
<div>
3+
<a-spin :spinning="loading">
4+
<a-skeleton active :loading="loading">
5+
<div :style="{'--coll': this.coll}" class="basic">
76

8-
<div style="margin-up:5pt; margin-left:2pt;margin-right:2pt;">
9-
<div>
10-
<a-row justify="space-between">
11-
<span><avatar size="large" :user="this.comment.User"></avatar></span>
12-
<span>{{ this.comment.User.nickname }}</span> <span
13-
v-if="this.comment.User.nickname===this.$store.state.user.info.nickname">(你)</span>
14-
<span> #{{ this.comment.ID }}</span>
15-
</a-row>
7+
<div style="margin-top:5pt; margin-left:2pt;margin-right:2pt;">
8+
<div>
9+
<a-row justify="space-between">
10+
<span><avatar size="large" :user="this.comment.User"></avatar></span>
11+
<span>{{ this.comment.User.nickname }}</span> <span
12+
v-if="this.comment.User.nickname===this.$store.state.user.info.nickname">(你)</span>
13+
<span> #{{ this.comment.ID }}</span>
14+
</a-row>
15+
<br>
16+
<a-row>
17+
<markdown v-model="this.comment.Content"></markdown>
1618
<br>
17-
<a-row>
18-
<markdown v-model="this.comment.Content"></markdown>
19-
<br>
20-
<div style="margin-right:20pt">
21-
<span key="comment-basic-like">
22-
<a-tooltip title="Like">
23-
<a-icon type="like" :theme="this.actions['👍'] === 1 ? 'filled' : 'outlined'" @click="active('👍')" />
24-
</a-tooltip>
25-
<span style="padding-left: '8px'; cursor: 'auto'">
26-
:{{ actionCount['👍'] }}
27-
</span>
19+
<div style="margin-right:20pt">
20+
<span>
21+
<a-tooltip title="Like">
22+
<a-icon type="like" :theme="this.actions['👍'] === 1 ? 'filled' : 'outlined'" @click="active('👍')" />
23+
</a-tooltip>
24+
<span style="padding-left: '8px'; cursor: 'auto'">
25+
:{{ actionCount['👍'] }}
2826
</span>
29-
<span key="comment-basic-dislike">
30-
<a-tooltip title="Dislike">
31-
<a-icon
32-
type="dislike"
33-
:theme="this.actions['👎'] === 1 ? 'filled' : 'outlined'"
34-
@click="active('👎')" />
35-
</a-tooltip>
36-
<span style="padding-left: '8px'; cursor: 'auto'">
37-
:{{ actionCount['👎'] }}
38-
</span>
27+
</span>
28+
<span>
29+
<a-tooltip title="Dislike">
30+
<a-icon
31+
type="dislike"
32+
:theme="this.actions['👎'] === 1 ? 'filled' : 'outlined'"
33+
@click="active('👎')" />
34+
</a-tooltip>
35+
<span style="padding-left: '8px'; cursor: 'auto'">
36+
:{{ actionCount['👎'] }}
3937
</span>
40-
<span v-if="!this.canEdit"><a-button @click="reply()"> 回复</a-button></span>
41-
<span
42-
v-if="this.canDeleteComment || (this.comment.User.nickname===this.$store.state.user.info.nickname)">
43-
<a-popconfirm
44-
title="确定删除此评论吗"
45-
ok-text="删除"
46-
cancel-text="再想想"
47-
@confirm="deleteTargetComment()"
48-
>
49-
<a-icon slot="icon" type="question-circle-o" style="color: red" />
50-
<a-button> 删除评论</a-button>
51-
</a-popconfirm>
52-
</span>
53-
<span style="float:right">
54-
<a-tooltip slot="datetime" :title="moment(this.comment.created_at).format('YYYY-MM-DD HH:mm:ss')">
55-
<span>{{ moment(this.comment.created_at).fromNow() }}</span>
56-
</a-tooltip>
57-
</span>
58-
</div>
59-
<div v-if="this.canEdit">
60-
<span><avatar size="large" :user="this.$store.state.user.info"></avatar></span>
61-
<span> 你的发言</span>
62-
<div slot="content">
63-
<a-form-item>
64-
<mark-down-editor v-model="description" :handleAt="handleAt" :handleHashTag="handleHashTag" />
65-
</a-form-item>
66-
<a-form-item>
67-
<div style="margin-left:20pt; margin-right:20pt">
68-
<span><a-button html-type="submit" :loading="submitting" type="primary" @click="handleCancel()">
69-
取消
70-
</a-button></span>
71-
<span style="float:right"><a-button
72-
html-type="submit"
73-
:loading="submitting"
74-
type="primary"
75-
@click="handleSubmit()">
76-
提交
77-
</a-button></span>
78-
</div>
79-
</a-form-item>
80-
</div>
38+
</span>
39+
<span v-if="!this.canEdit"><a-button @click="reply()"> 回复</a-button></span>
40+
<span
41+
v-if="this.canDeleteComment || (this.comment.User.nickname===this.$store.state.user.info.nickname)">
42+
<a-popconfirm
43+
title="确定删除此评论吗"
44+
ok-text="删除"
45+
cancel-text="再想想"
46+
@confirm="deleteTargetComment()"
47+
>
48+
<a-icon slot="icon" type="question-circle-o" style="color: red" />
49+
<a-button> 删除评论</a-button>
50+
</a-popconfirm>
51+
</span>
52+
<span style="float:right">
53+
<a-tooltip slot="datetime" :title="moment(this.comment.created_at).format('YYYY-MM-DD HH:mm:ss')">
54+
<span>{{ moment(this.comment.created_at).fromNow() }}</span>
55+
</a-tooltip>
56+
</span>
57+
</div>
58+
<div v-if="this.canEdit">
59+
<span><avatar size="large" :user="this.$store.state.user.info"></avatar></span>
60+
<span> 你的发言</span>
61+
<div slot="content">
62+
<a-form-item>
63+
<mark-down-editor v-model="description" :handleAt="handleAt" :handleHashTag="handleHashTag" />
64+
</a-form-item>
65+
<a-form-item>
66+
<div style="margin-left:20pt; margin-right:20pt">
67+
<span><a-button html-type="submit" :loading="submitting" type="primary" @click="handleCancel()">
68+
取消
69+
</a-button></span>
70+
<span style="float:right"><a-button
71+
html-type="submit"
72+
:loading="submitting"
73+
type="primary"
74+
@click="handleSubmit()">
75+
提交
76+
</a-button></span>
77+
</div>
78+
</a-form-item>
8179
</div>
82-
<a-list
83-
v-if="children.length!==0"
84-
:data-source="children"
85-
:split="false"
86-
:size="large">
87-
<a-list-item slot="renderItem" slot-scope="keyID">
88-
<one-comment
89-
style="width:95%; margin-left:5pt"
90-
:depth="depth + 1"
91-
:comment="jsonStr[keyID]['data']"
92-
:canDeleteComment="canDeleteComment"
93-
:jsonStr="jsonStr[keyID]">
94-
</one-comment>
95-
</a-list-item>
96-
</a-list>
97-
</a-row>
98-
</div>
80+
</div>
81+
<a-list
82+
v-if="children.length!==0"
83+
:data-source="children"
84+
:split="false"
85+
size="large">
86+
<a-list-item slot="renderItem" slot-scope="keyID">
87+
<one-comment
88+
style="width:95%; margin-left:5pt"
89+
:depth="depth + 1"
90+
:comment="jsonStr[keyID]['data']"
91+
:canDeleteComment="canDeleteComment"
92+
:jsonStr="jsonStr[keyID]">
93+
</one-comment>
94+
</a-list-item>
95+
</a-list>
96+
</a-row>
9997
</div>
10098
</div>
101-
</a-skeleton>
102-
</a-spin>
103-
</div>
104-
</a-comment>
99+
</div>
100+
</a-skeleton>
101+
</a-spin>
102+
</div>
105103
</template>
106104

107105
<script>
@@ -130,6 +128,7 @@ export default {
130128
comparerConf,
131129
languageConf,
132130
config,
131+
submitting: false,
133132
moment,
134133
loading: true,
135134
canEdit: false,

‎src/config/router.config.js‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -72,19 +72,6 @@ export const constantRouterMap = [
7272
}
7373
]
7474
},
75-
{
76-
path: '/comments/',
77-
component: RouteView,
78-
meta: { title: '评论管理', icon: 'database' },
79-
children: [
80-
{
81-
path: '/comments/add',
82-
name: 'comment.add',
83-
component: () => import('@/views/problem/CreateProblem'),
84-
meta: { title: '发送评论' }
85-
}
86-
]
87-
},
8875
{
8976
path: '/submissions',
9077
component: RouteView,

‎yarn.lock‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8359,11 +8359,6 @@ node-fetch@^1.0.1:
83598359
encoding "^0.1.11"
83608360
is-stream "^1.0.1"
83618361

8362-
node-fetch@^2.6.1:
8363-
version "2.6.2"
8364-
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.2.tgz#986996818b73785e47b1965cc34eb093a1d464d0"
8365-
integrity sha512-aLoxToI6RfZ+0NOjmWAgn9+LEd30YCkJKFSyWacNZdEKTit/ZMcKjGkTRo8uWEsnIb/hfKecNPEbln02PdWbcA==
8366-
83678362
node-forge@^0.10.0:
83688363
version "0.10.0"
83698364
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
@@ -11909,8 +11904,10 @@ watchpack@^1.7.4:
1190911904
resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453"
1191011905
integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==
1191111906
dependencies:
11907+
chokidar "^3.4.1"
1191211908
graceful-fs "^4.1.2"
1191311909
neo-async "^2.5.0"
11910+
watchpack-chokidar2 "^2.0.1"
1191411911
optionalDependencies:
1191511912
chokidar "^3.4.1"
1191611913
watchpack-chokidar2 "^2.0.1"

0 commit comments

Comments
 (0)