@jx3box/jx3box-editor 1.3.1 → 1.3.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/assets/css/module/author.less +39 -19
- package/assets/css/tinymce/a.less +12 -0
- package/package.json +1 -1
- package/src/Author.vue +7 -3
- package/src/Resource.vue +11 -6
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
.w-author {
|
|
2
2
|
.w-author-wrapper {
|
|
3
|
-
@max-width:
|
|
4
|
-
@min-width:
|
|
3
|
+
@max-width: 280px;
|
|
4
|
+
@min-width: 280px;
|
|
5
5
|
max-width: @max-width;
|
|
6
6
|
min-width: @min-width;
|
|
7
|
-
|
|
7
|
+
width: 280px;
|
|
8
|
+
padding: 10px;
|
|
8
9
|
background-color: #fff;
|
|
9
10
|
box-sizing: border-box;
|
|
10
11
|
|
|
@@ -27,8 +28,9 @@
|
|
|
27
28
|
}
|
|
28
29
|
.nobreak;
|
|
29
30
|
}
|
|
30
|
-
.u-info{
|
|
31
|
-
.pr;
|
|
31
|
+
.u-info {
|
|
32
|
+
.pr;
|
|
33
|
+
top: -4px;
|
|
32
34
|
.h(68px);
|
|
33
35
|
display: flex;
|
|
34
36
|
flex-direction: column;
|
|
@@ -48,17 +50,33 @@
|
|
|
48
50
|
padding: 2px 8px;
|
|
49
51
|
.fz(12px, 14px);
|
|
50
52
|
color: #fff;
|
|
51
|
-
background-color
|
|
53
|
+
background-color: #aaa;
|
|
52
54
|
border-radius: 2px;
|
|
53
55
|
|
|
54
|
-
&.lv-1{
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
&.lv-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
&.lv-
|
|
61
|
-
|
|
56
|
+
&.lv-1 {
|
|
57
|
+
background-color: #32d3c4;
|
|
58
|
+
}
|
|
59
|
+
&.lv-2 {
|
|
60
|
+
background-color: #86c0fb;
|
|
61
|
+
}
|
|
62
|
+
&.lv-3 {
|
|
63
|
+
background-color: #33d9ff;
|
|
64
|
+
}
|
|
65
|
+
&.lv-4 {
|
|
66
|
+
background-color: #ffdb2a;
|
|
67
|
+
}
|
|
68
|
+
&.lv-5 {
|
|
69
|
+
background-color: #ffa739;
|
|
70
|
+
}
|
|
71
|
+
&.lv-6 {
|
|
72
|
+
background-color: #ff70b2;
|
|
73
|
+
}
|
|
74
|
+
&.lv-7 {
|
|
75
|
+
background-color: #ff3399;
|
|
76
|
+
}
|
|
77
|
+
&.lv-8 {
|
|
78
|
+
background-color: #f93c3c;
|
|
79
|
+
}
|
|
62
80
|
}
|
|
63
81
|
.u-vip {
|
|
64
82
|
.ml(5px);
|
|
@@ -124,8 +142,8 @@
|
|
|
124
142
|
}
|
|
125
143
|
}
|
|
126
144
|
|
|
127
|
-
.u-medal{
|
|
128
|
-
img{
|
|
145
|
+
.u-medal {
|
|
146
|
+
img {
|
|
129
147
|
padding: 0;
|
|
130
148
|
margin: 0;
|
|
131
149
|
.size(20px);
|
|
@@ -144,7 +162,7 @@
|
|
|
144
162
|
}
|
|
145
163
|
|
|
146
164
|
.u-teams {
|
|
147
|
-
.mt(
|
|
165
|
+
.mt(5px);
|
|
148
166
|
.u-team {
|
|
149
167
|
.db;
|
|
150
168
|
background-color: #f2f6fc;
|
|
@@ -154,10 +172,12 @@
|
|
|
154
172
|
// color:@color-link;
|
|
155
173
|
}
|
|
156
174
|
.r(3px);
|
|
175
|
+
padding: 0 5px;
|
|
176
|
+
display: flex;
|
|
177
|
+
align-items: center;
|
|
157
178
|
}
|
|
158
179
|
.u-team-logo {
|
|
159
|
-
.size(
|
|
160
|
-
.y;
|
|
180
|
+
.size(22px);
|
|
161
181
|
.mr(4px);
|
|
162
182
|
.r(4px);
|
|
163
183
|
}
|
|
@@ -7,6 +7,18 @@
|
|
|
7
7
|
box-shadow: 0 1px 0 #0366d6;
|
|
8
8
|
}
|
|
9
9
|
}
|
|
10
|
+
|
|
11
|
+
.e-jx3-author{
|
|
12
|
+
padding: 2px 5px;
|
|
13
|
+
border-radius: 3px;
|
|
14
|
+
border: 1px solid #8250df;
|
|
15
|
+
color:#8250df;
|
|
16
|
+
|
|
17
|
+
&:hover{
|
|
18
|
+
box-shadow: none;
|
|
19
|
+
background-color: #fafbfc;
|
|
20
|
+
}
|
|
21
|
+
}
|
|
10
22
|
}
|
|
11
23
|
// @media print {
|
|
12
24
|
// .c-article {
|
package/package.json
CHANGED
package/src/Author.vue
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
<div class="u-info">
|
|
7
7
|
<a class="u-name" :href="authorLink(uid)" target="_blank">
|
|
8
8
|
<span>{{ data.display_name.slice(0, 8) }}</span>
|
|
9
|
-
<a class="u-superauthor" href="/dashboard
|
|
9
|
+
<a class="u-superauthor" href="/dashboard/cooperation" target="_blank">
|
|
10
10
|
<img :src="super_author_icon" alt="superauthor" />
|
|
11
11
|
</a>
|
|
12
12
|
</a>
|
|
@@ -97,7 +97,6 @@ export default {
|
|
|
97
97
|
},
|
|
98
98
|
loadMedals: function() {
|
|
99
99
|
return getUserMedals(this.uid).then((data) => {
|
|
100
|
-
console.log(data)
|
|
101
100
|
this.medals = data;
|
|
102
101
|
});
|
|
103
102
|
},
|
|
@@ -131,15 +130,20 @@ export default {
|
|
|
131
130
|
@import "../assets/css/module/author.less";
|
|
132
131
|
.w-author {
|
|
133
132
|
.w-author-wrapper {
|
|
133
|
+
.u-author{
|
|
134
|
+
padding:5px 0 15px 0;
|
|
135
|
+
}
|
|
134
136
|
.u-avatar {
|
|
135
137
|
.fl;
|
|
136
138
|
.mr(15px);
|
|
137
|
-
.size(48px);
|
|
138
139
|
}
|
|
139
140
|
img {
|
|
140
141
|
border: none;
|
|
142
|
+
margin:0;
|
|
143
|
+
padding:0;
|
|
141
144
|
}
|
|
142
145
|
a {
|
|
146
|
+
.lh(28px);
|
|
143
147
|
text-decoration: none;
|
|
144
148
|
&:hover {
|
|
145
149
|
text-decoration: none;
|
package/src/Resource.vue
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div class="c-resource">
|
|
3
3
|
<!-- 上传触发按钮 -->
|
|
4
|
-
<el-button class="u-switch" type="primary" @click="openDialog" :disabled="!enable"> <img class="u-icon" svg-inline src="../assets/img/jx3.svg"
|
|
4
|
+
<el-button class="u-switch" type="primary" @click="openDialog" :disabled="!enable"> <img class="u-icon" svg-inline src="../assets/img/jx3.svg" />剑三资源 </el-button>
|
|
5
5
|
|
|
6
6
|
<!-- 弹出界面 -->
|
|
7
7
|
<el-dialog class="c-large-dialog" title="剑三数据库" :visible.sync="dialogVisible">
|
|
@@ -166,7 +166,7 @@
|
|
|
166
166
|
</el-tab-pane>
|
|
167
167
|
<el-tab-pane label="魔盒用户" name="authors">
|
|
168
168
|
<span slot="label" class="u-tab-label">
|
|
169
|
-
<i class="el-icon-s-custom"></i>
|
|
169
|
+
<i class="el-icon-s-custom" style="margin-right:5px;"></i>
|
|
170
170
|
<b>魔盒用户</b>
|
|
171
171
|
</span>
|
|
172
172
|
<p v-if="total && done" class="m-resource-count">
|
|
@@ -180,6 +180,9 @@
|
|
|
180
180
|
<span class="u-name">
|
|
181
181
|
{{ o.display_name }}
|
|
182
182
|
</span>
|
|
183
|
+
<div class="u-remark">
|
|
184
|
+
{{o.user_bio}}
|
|
185
|
+
</div>
|
|
183
186
|
</span>
|
|
184
187
|
</li>
|
|
185
188
|
</ul>
|
|
@@ -468,7 +471,7 @@ export default {
|
|
|
468
471
|
this.dialogVisible = false;
|
|
469
472
|
this.selectedAuthor = {};
|
|
470
473
|
} else {
|
|
471
|
-
this.$
|
|
474
|
+
this.$alert('您的等级不足或无权限（Lv2以上可用）', '消息');
|
|
472
475
|
return;
|
|
473
476
|
}
|
|
474
477
|
} else {
|
|
@@ -532,7 +535,7 @@ export default {
|
|
|
532
535
|
this.resetItems();
|
|
533
536
|
this.selectedAuthor = o;
|
|
534
537
|
o.isSelected = true;
|
|
535
|
-
this.html = `<a data-type="author" class="e-jx3-author w-jx3-element" data-mode="" data-id="${o.ID}" target="_blank" href="/author/${o.ID}"
|
|
538
|
+
this.html = `<a data-type="author" class="e-jx3-author w-jx3-element" data-mode="" data-id="${o.ID}" target="_blank" href="/author/${o.ID}">@${o.display_name}</a>`
|
|
536
539
|
},
|
|
537
540
|
selectEmotion: function (o){
|
|
538
541
|
this.resetItems();
|
|
@@ -561,11 +564,13 @@ export default {
|
|
|
561
564
|
return domain + getLink(type,id).slice(1)
|
|
562
565
|
},
|
|
563
566
|
userAvatar: function(url) {
|
|
564
|
-
return showAvatar(url);
|
|
567
|
+
return showAvatar(url,'m');
|
|
565
568
|
},
|
|
566
569
|
loadUserInfo: function (){
|
|
567
570
|
if (!this.uid) return;
|
|
568
|
-
getUserInfo(this.uid)
|
|
571
|
+
getUserInfo(this.uid).then(res => {
|
|
572
|
+
this.userInfo = res
|
|
573
|
+
})
|
|
569
574
|
},
|
|
570
575
|
|
|
571
576
|
// 杂项
|