Merge pull request #12175 from dataease/pr@dev-v2@fix_preview

fix(仪表板): preview页面链接访问错误
This commit is contained in:
fit2cloud-chenyw 2024-09-12 15:40:12 +08:00 committed by GitHub
commit e194486176
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -28,7 +28,7 @@ const embeddedRouteWhiteList = ['/dataset-embedded', '/dataset-form', '/dataset-
router.beforeEach(async (to, from, next) => {
start()
loadStart()
checkPlatform()
const platform = checkPlatform()
let isDesktop = wsCache.get('app.desktop')
if (isDesktop === null) {
await appStore.setAppModel()
@ -130,7 +130,7 @@ router.beforeEach(async (to, from, next) => {
permissionStore.setCurrentPath(to.path)
next()
} else if (
embeddedWindowWhiteList.includes(to.path) ||
(!platform && embeddedWindowWhiteList.includes(to.path)) ||
whiteList.includes(to.path) ||
to.path.startsWith('/de-link/')
) {
@ -138,7 +138,7 @@ router.beforeEach(async (to, from, next) => {
permissionStore.setCurrentPath(to.path)
next()
} else {
next(`/login?redirect=${to.path}`) // 否则全部重定向到登录页
next(`/login?redirect=${to.fullPath || to.path}`) // 否则全部重定向到登录页
}
}
})