Merge pull request #7631 from dataease/pr@dev-v2@feat_view_embedded

fix: 登录日志导致社区版无lic无法登录
This commit is contained in:
fit2cloud-chenyw
2024-01-15 16:25:11 +08:00
committed by GitHub
6 changed files with 41 additions and 3 deletions

View File

@@ -46,6 +46,7 @@ quartz:
dataease:
version: '@project.version@'
origin-list: http://192.168.2.70:9080
apisix-api:
domain: http://192.168.0.121:9180
key: edd1c9f034335f136f87ad84b625c8f1

View File

@@ -18,7 +18,7 @@ const { start, done } = useNProgress()
const { loadStart, loadDone } = usePageLoading()
const whiteList = ['/login', '/de-link'] // 不重定向白名单
const whiteList = ['/login', '/de-link', '/chart-view'] // 不重定向白名单
router.beforeEach(async (to, from, next) => {
start()

View File

@@ -112,6 +112,13 @@ export const routes: AppRouteRecordRaw[] = [
meta: { hidden: true }
}
]
},
{
path: '/chart-view',
name: 'chart-view',
hidden: true,
meta: {},
component: () => import('@/views/chart/ChartView.vue')
}
]

View File

@@ -0,0 +1,29 @@
<script lang="ts" setup>
import ViewWrapper from '@/pages/panel/ViewWrapper.vue'
import { useRoute } from 'vue-router'
import { onBeforeMount } from 'vue'
const route = useRoute()
const init = () => {
const busiFlag = route.query.busiFlag
const dvId = route.query.dvId
const chartId = route.query.chartId
const embeddedToken = route.query.embeddedToken
console.log(busiFlag)
console.log(dvId)
console.log(chartId)
console.log(embeddedToken)
window.DataEaseBi = {
token: embeddedToken,
chartId: chartId,
dvId: dvId,
busiFlag: busiFlag
}
}
onBeforeMount(() => {
init()
})
</script>
<template>
<view-wrapper />
</template>

View File

@@ -173,7 +173,8 @@ const showLoginErrorMsg = () => {
onMounted(() => {
checkPlatform()
if (localStorage.getItem('DE-GATEWAY-FLAG')) {
loginErrorMsg.value = localStorage.getItem('DE-GATEWAY-FLAG')
const msg = localStorage.getItem('DE-GATEWAY-FLAG')
loginErrorMsg.value = decodeURIComponent(msg)
showLoginErrorMsg()
localStorage.removeItem('DE-GATEWAY-FLAG')
logoutHandler(true)