center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #10135 from dataease/pr@dev-v2_st

Browse Source 
fix(嵌入式): 嵌入式跳转测试
This commit is contained in:
dataeaseShu 2024-06-06 09:56:06 +08:00 committed by GitHub
commit 90a5f2a2c8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/core-frontend/src/views/chart/components/views/index.vue
View File

@ -419,6 +419,10 @@ const jumpClick = param => {
return return
} }
if (isIframe.value) {
embeddedStore.clearState()
}
if (iframeSelf) { if (iframeSelf) {
router.push(parseUrl(url)) router.push(parseUrl(url))
return return
@ -438,6 +442,10 @@ const jumpClick = param => {
divEmbedded('Iframe') divEmbedded('Iframe')
return return
} }
if (isIframe.value) {
embeddedStore.clearState()
}
windowsJump(url, jumpInfo.jumpType) windowsJump(url, jumpInfo.jumpType)
} }
} else { } else {

2
core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
View File

@ -73,6 +73,7 @@ const loadCanvasDataAsync = async (dvId, dvType) => {
ElMessage.error(t('visualization.outer_param_decode_error')) ElMessage.error(t('visualization.outer_param_decode_error'))
} }
} }
console.log('PreviewCanvas', dvId, jumpParam, attachParam)
initCanvasData( initCanvasData(
dvId, dvId,
@ -107,6 +108,7 @@ let p = null
const XpackLoaded = () => p(true) const XpackLoaded = () => p(true)
onMounted(async () => { onMounted(async () => {
await new Promise(r => (p = r)) await new Promise(r => (p = r))
console.log('embeddedStore', embeddedStore, router)
const dvId = embeddedStore.dvId || router.currentRoute.value.query.dvId const dvId = embeddedStore.dvId || router.currentRoute.value.query.dvId
const { dvType, callBackFlag } = router.currentRoute.value.query const { dvType, callBackFlag } = router.currentRoute.value.query
if (dvId) { if (dvId) {