@jx3box/jx3box-common-ui 6.6.5 → 6.6.6
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/left-sidebar.less +90 -94
- package/package.json +2 -2
- package/src/header/user.vue +23 -17
|
@@ -1,141 +1,137 @@
|
|
|
1
1
|
.c-sidebar-left {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
2
|
+
.w(@aside-left - 40px);
|
|
3
|
+
box-sizing: border-box;
|
|
4
|
+
padding: 10px;
|
|
5
|
+
.pf;
|
|
6
|
+
.z(600);
|
|
7
|
+
left: 0;
|
|
8
|
+
top: @header-height + @bread-height;
|
|
9
|
+
bottom: 0;
|
|
10
|
+
background-color: @bg-light;
|
|
11
|
+
border-right: 1px solid #eee;
|
|
12
12
|
}
|
|
13
13
|
|
|
14
14
|
.c-sidebar-left.without-bread {
|
|
15
|
-
|
|
15
|
+
top: @header-height;
|
|
16
16
|
}
|
|
17
17
|
|
|
18
18
|
.c-sidebar-left-inner {
|
|
19
|
-
|
|
20
|
-
overflow-y: hidden;
|
|
21
|
-
|
|
22
|
-
&:hover {
|
|
19
|
+
.size(100%);
|
|
23
20
|
overflow-y: auto;
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
}
|
|
21
|
+
|
|
22
|
+
&::-webkit-scrollbar {
|
|
23
|
+
width: 4px;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
&::-webkit-scrollbar-track,
|
|
27
|
+
&::-webkit-scrollbar-track-piece {
|
|
28
|
+
background-color: #fafafa;
|
|
29
|
+
border-radius: 6px;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
&::-webkit-scrollbar-thumb {
|
|
33
|
+
background-color: #eee;
|
|
34
|
+
border-radius: 6px;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
&::-webkit-scrollbar-button,
|
|
38
|
+
&::-webkit-scrollbar-corner,
|
|
39
|
+
&::-webkit-resizer {
|
|
40
|
+
display: none;
|
|
41
|
+
}
|
|
46
42
|
}
|
|
47
43
|
|
|
48
44
|
// 笔记本<1440 缩小双边栏
|
|
49
45
|
@media screen and (max-width: @smallpc) {
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
46
|
+
.c-sidebar-left {
|
|
47
|
+
.w(@aside-left - 40px);
|
|
48
|
+
}
|
|
53
49
|
}
|
|
54
50
|
|
|
55
51
|
// 平板横屏
|
|
56
52
|
@media screen and (max-width: @notebook) {
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
53
|
+
.c-sidebar-left {
|
|
54
|
+
.w(@aside-left - 60px);
|
|
55
|
+
}
|
|
60
56
|
}
|
|
61
57
|
|
|
62
58
|
@media screen and (max-width: @phone) {
|
|
63
59
|
.c-sidebar-left-inner {
|
|
64
|
-
|
|
60
|
+
overflow-y: auto;
|
|
65
61
|
}
|
|
66
62
|
}
|
|
67
63
|
|
|
68
64
|
// 折叠相关逻辑
|
|
69
65
|
.c-sidebar-left-toggle {
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
66
|
+
display: block;
|
|
67
|
+
.pa;
|
|
68
|
+
.rb(-21px, calc(50% - 20px));
|
|
69
|
+
width: 20px;
|
|
70
|
+
height: 40px;
|
|
71
|
+
line-height: 40px;
|
|
72
|
+
.pointer;
|
|
73
|
+
text-align: center;
|
|
74
|
+
background-color: @bg-light;
|
|
75
|
+
border-right: 1px solid #eee;
|
|
76
|
+
border-top: 1px solid #eee;
|
|
77
|
+
border-bottom: 1px solid #eee;
|
|
78
|
+
border-radius: 0px 2px 2px 0px;
|
|
79
|
+
font-size: 16px;
|
|
80
|
+
color: #999;
|
|
81
|
+
|
|
82
|
+
&:hover {
|
|
83
|
+
color: #222;
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
&.close-sidebar-left {
|
|
87
|
+
right: 0;
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
svg {
|
|
91
|
+
fill: @color;
|
|
92
|
+
}
|
|
97
93
|
}
|
|
98
94
|
|
|
99
95
|
.closeLeftSidebar() {
|
|
100
|
-
|
|
101
|
-
|
|
96
|
+
transition: 0.2s ease-in-out;
|
|
97
|
+
transform: translateX(-100%);
|
|
102
98
|
}
|
|
103
99
|
|
|
104
100
|
.openLeftSidebar() {
|
|
105
|
-
|
|
106
|
-
|
|
101
|
+
transition: 0.2s ease-in-out;
|
|
102
|
+
transform: translateX(0);
|
|
107
103
|
}
|
|
108
104
|
|
|
109
105
|
.c-sidebar-left.isclose {
|
|
110
|
-
|
|
106
|
+
.closeLeftSidebar();
|
|
111
107
|
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
108
|
+
.c-sidebar-left-toggle {
|
|
109
|
+
transition: 0.2s ease-in-out;
|
|
110
|
+
transform: translateX(100%);
|
|
111
|
+
}
|
|
116
112
|
}
|
|
117
113
|
|
|
118
114
|
.c-sidebar-left.isopen {
|
|
119
|
-
|
|
115
|
+
.openLeftSidebar();
|
|
120
116
|
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
117
|
+
.c-sidebar-left-toggle {
|
|
118
|
+
transition: 0.2s ease-in-out;
|
|
119
|
+
transform: translateX(0);
|
|
120
|
+
}
|
|
125
121
|
}
|
|
126
122
|
|
|
127
123
|
@media screen and (max-width: @ipad) {
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
124
|
+
.c-sidebar-left-toggle {
|
|
125
|
+
.none;
|
|
126
|
+
}
|
|
131
127
|
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
128
|
+
.c-sidebar-left.isopen {
|
|
129
|
+
box-shadow: 2px 0 3px rgba(0, 0, 0, 0.1);
|
|
130
|
+
}
|
|
135
131
|
}
|
|
136
132
|
|
|
137
133
|
@media print {
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
134
|
+
.c-sidebar-left {
|
|
135
|
+
.none;
|
|
136
|
+
}
|
|
141
137
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jx3box/jx3box-common-ui",
|
|
3
|
-
"version": "6.6.
|
|
3
|
+
"version": "6.6.6",
|
|
4
4
|
"description": "JX3BOX UI",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
"@jx3box/jx3box-comment-ui": "^1.7.6",
|
|
34
34
|
"@jx3box/jx3box-common": "^7.6.2",
|
|
35
35
|
"@jx3box/jx3box-data": "^3.0.3",
|
|
36
|
-
"@jx3box/jx3box-editor": "^1.6.
|
|
36
|
+
"@jx3box/jx3box-editor": "^1.6.6",
|
|
37
37
|
"axios": "^0.26.1",
|
|
38
38
|
"dayjs": "^1.11.0",
|
|
39
39
|
"element-ui": "^2.13.2",
|
package/src/header/user.vue
CHANGED
|
@@ -237,24 +237,30 @@ export default {
|
|
|
237
237
|
if (user_last_login && dayjs(user_last_login).isToday()) {
|
|
238
238
|
console.log("已签到");
|
|
239
239
|
} else {
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
message
|
|
245
|
-
|
|
246
|
-
|
|
240
|
+
// 延迟2秒执行 feedback#501
|
|
241
|
+
const signTimer = setTimeout(() => {
|
|
242
|
+
userSignIn()
|
|
243
|
+
.then((res) => {
|
|
244
|
+
let msg = this.$message({
|
|
245
|
+
type: "success",
|
|
246
|
+
message: "签到成功",
|
|
247
|
+
customClass: "c-header-signin",
|
|
248
|
+
duration: 0,
|
|
249
|
+
});
|
|
250
|
+
// 模拟手动关闭
|
|
251
|
+
setTimeout(() => {
|
|
252
|
+
msg.close();
|
|
253
|
+
}, 3000);
|
|
254
|
+
localStorage.setItem("user_last_login", JSON.stringify(dayjs()));
|
|
255
|
+
})
|
|
256
|
+
.catch((err) => {
|
|
257
|
+
localStorage.setItem("user_last_login", JSON.stringify(dayjs()));
|
|
258
|
+
console.log(dayjs.tz.guess());
|
|
259
|
+
})
|
|
260
|
+
.finally(() => {
|
|
261
|
+
clearTimeout(signTimer);
|
|
247
262
|
});
|
|
248
|
-
|
|
249
|
-
setTimeout(() => {
|
|
250
|
-
msg.close();
|
|
251
|
-
}, 3000);
|
|
252
|
-
localStorage.setItem("user_last_login", JSON.stringify(dayjs()));
|
|
253
|
-
})
|
|
254
|
-
.catch((err) => {
|
|
255
|
-
localStorage.setItem("user_last_login", JSON.stringify(dayjs()));
|
|
256
|
-
console.log(dayjs.tz.guess());
|
|
257
|
-
})
|
|
263
|
+
}, 2000);
|
|
258
264
|
}
|
|
259
265
|
} catch (e) {
|
|
260
266
|
console.log(e);
|