vue2-client 1.8.18 → 1.8.21
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/CHANGELOG.md
CHANGED
package/package.json
CHANGED
|
@@ -255,12 +255,14 @@ export default {
|
|
|
255
255
|
}
|
|
256
256
|
}
|
|
257
257
|
// 设置表格高度
|
|
258
|
-
const height = document.documentElement.clientHeight
|
|
259
|
-
if (height >= 1070) {
|
|
260
|
-
|
|
261
|
-
} else {
|
|
262
|
-
|
|
263
|
-
}
|
|
258
|
+
// const height = document.documentElement.clientHeight
|
|
259
|
+
// if (height >= 1070) {
|
|
260
|
+
// this.scrollYHeight = 'calc(100vh - 526px)'
|
|
261
|
+
// } else {
|
|
262
|
+
// this.scrollYHeight = 'calc(100vh - 398px)'
|
|
263
|
+
// }
|
|
264
|
+
// 设置表格高度为固定值
|
|
265
|
+
this.scrollYHeight = 'calc(100vh - 33rem)'
|
|
264
266
|
// 横向滚动长度大于所有宽度,才能实现固定表头
|
|
265
267
|
this.scrollXWidth = totalWidth
|
|
266
268
|
// 加载筛选列完成
|
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
filter: invert(80%);
|
|
4
4
|
}
|
|
5
5
|
.beauty-scroll{
|
|
6
|
-
scrollbar-color: @primary-color @primary-2;
|
|
7
|
-
scrollbar-width: thin;
|
|
6
|
+
//scrollbar-color: @primary-color @primary-2;
|
|
7
|
+
//scrollbar-width: thin;
|
|
8
8
|
-ms-overflow-style:none;
|
|
9
9
|
position: relative;
|
|
10
10
|
&::-webkit-scrollbar{
|
package/src/utils/request.js
CHANGED
|
@@ -60,6 +60,7 @@ async function request (url, method, params, config) {
|
|
|
60
60
|
function setAuthorization (auth, authType = AUTH_TYPE.BEARER) {
|
|
61
61
|
switch (authType) {
|
|
62
62
|
case AUTH_TYPE.BEARER:
|
|
63
|
+
localStorage.setItem(V4_ACCESS_TOKEN, 'Bearer ' + auth.token)
|
|
63
64
|
Cookie.set(V4_ACCESS_TOKEN, 'Bearer ' + auth.token, { expires: auth.expireAt })
|
|
64
65
|
break
|
|
65
66
|
case AUTH_TYPE.BASIC:
|
|
@@ -93,6 +94,7 @@ function removeAuthorization (authType = AUTH_TYPE.BEARER) {
|
|
|
93
94
|
switch (authType) {
|
|
94
95
|
case AUTH_TYPE.BEARER:
|
|
95
96
|
Cookie.remove(V4_ACCESS_TOKEN)
|
|
97
|
+
localStorage.removeItem(V4_ACCESS_TOKEN)
|
|
96
98
|
break
|
|
97
99
|
case AUTH_TYPE.BASIC:
|
|
98
100
|
case AUTH_TYPE.AUTH1:
|
|
@@ -110,7 +112,7 @@ function removeAuthorization (authType = AUTH_TYPE.BEARER) {
|
|
|
110
112
|
function checkAuthorization (authType = AUTH_TYPE.BEARER) {
|
|
111
113
|
switch (authType) {
|
|
112
114
|
case AUTH_TYPE.BEARER:
|
|
113
|
-
if (Cookie.get(V4_ACCESS_TOKEN)) {
|
|
115
|
+
if (localStorage.getItem(V4_ACCESS_TOKEN) || Cookie.get(V4_ACCESS_TOKEN)) {
|
|
114
116
|
return true
|
|
115
117
|
}
|
|
116
118
|
break
|