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

Merge pull request #13083 from dataease/pr@dev-v2@refactor_outer-params

Browse Source 
refactor(仪表板、数据大屏): 从系统内新Tab页预览可以指定忽略外部参数
This commit is contained in:
王嘉豪 2024-11-04 10:24:03 +08:00 committed by GitHub
commit 1ec5ffb6ac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-frontend/src/components/dashboard/DbToolbar.vue
View File

@ -138,7 +138,7 @@ const previewOuter = () => {
return
}
canvasSave(() => {
const url = '#/preview?dvId=' + dvInfo.value.id
const url = '#/preview?ignoreParams=true&dvId=' + dvInfo.value.id
const newWindow = window.open(url, '_blank')
initOpenHandler(newWindow)
})

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

@ -44,7 +44,7 @@ const props = defineProps({
ticketArgs: propTypes.string.def(null)
})
const loadCanvasDataAsync = async (dvId, dvType) => {
const loadCanvasDataAsync = async (dvId, dvType, ignoreParams = false) => {
const jumpInfoParam = embeddedStore.jumpInfoParam || router.currentRoute.value.query.jumpInfoParam
let jumpParam
// 获取外部跳转参数
@ -124,9 +124,11 @@ const loadCanvasDataAsync = async (dvId, dvType) => {
if (jumpParam) {
dvMainStore.addViewTrackFilter(jumpParam)
}
if (!ignoreParams) {
state.initState = false
dvMainStore.addOuterParamsFilter(attachParam)
state.initState = true
}
if (props.publicLinkStatus) {
// 设置浏览器title为当前仪表板名称
document.title = dvInfo.name
@ -161,12 +163,14 @@ onMounted(async () => {
})
await new Promise(r => (p = r))
const dvId = embeddedStore.dvId || router.currentRoute.value.query.dvId
// 检查外部参数
const ignoreParams = router.currentRoute.value.query.ignoreParams === 'true'
const { dvType, callBackFlag, taskId, showWatermark } = router.currentRoute.value.query
if (!!taskId) {
dvMainStore.setCanvasAttachInfo({ taskId, showWatermark })
}
if (dvId) {
loadCanvasDataAsync(dvId, dvType)
await loadCanvasDataAsync(dvId, dvType, ignoreParams)
return
}
dvMainStore.setEmbeddedCallBack(callBackFlag || 'no')

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

@ -35,7 +35,7 @@ const preview = () => {
baseUrl = baseUrl.replace('oidcbi/', '')
baseUrl = baseUrl.replace('casbi/', '')
}
const url = baseUrl + '#/preview?dvId=' + dvInfo.value.id
const url = baseUrl + '#/preview?&ignoreParams=true&dvId=' + dvInfo.value.id
const newWindow = window.open(url, '_blank')
initOpenHandler(newWindow)
}