vue2-client 1.4.34 → 1.4.36
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
|
@@ -235,8 +235,8 @@ export default {
|
|
|
235
235
|
}
|
|
236
236
|
},
|
|
237
237
|
methods: {
|
|
238
|
-
refreshTable () {
|
|
239
|
-
this.$refs.xTable.refresh(
|
|
238
|
+
refreshTable (toFirstPage = true) {
|
|
239
|
+
this.$refs.xTable.refresh(toFirstPage)
|
|
240
240
|
},
|
|
241
241
|
clearRowKeys () {
|
|
242
242
|
this.$refs.xTable.clearRowKeys()
|
package/src/services/api/cas.js
CHANGED
|
@@ -40,7 +40,7 @@ export function CASLoginByAuth (serviceKey) {
|
|
|
40
40
|
export function CASLogin (serviceKey, inner) {
|
|
41
41
|
// 从第三方跳转登录
|
|
42
42
|
const tgc = getTGTCookie()
|
|
43
|
-
if (tgc) {
|
|
43
|
+
if (tgc && !inner) {
|
|
44
44
|
return new Promise((resolve, reject) => {
|
|
45
45
|
post(casApi.createSTByTGC, {
|
|
46
46
|
serviceKey: serviceKey,
|
|
@@ -56,11 +56,7 @@ export function CASLogin (serviceKey, inner) {
|
|
|
56
56
|
})
|
|
57
57
|
logout().then(() => {
|
|
58
58
|
setTimeout(() => {
|
|
59
|
-
|
|
60
|
-
window.location.href = '/login'
|
|
61
|
-
} else {
|
|
62
|
-
window.location.href = '/login?serviceKey=' + serviceKey
|
|
63
|
-
}
|
|
59
|
+
window.location.href = '/login?serviceKey=' + serviceKey
|
|
64
60
|
}, 1500)
|
|
65
61
|
})
|
|
66
62
|
} else {
|