diff --git a/core/core-frontend/src/components/dashboard/DbToolbar.vue b/core/core-frontend/src/components/dashboard/DbToolbar.vue index 10e6cd2fa2..bd35b336ff 100644 --- a/core/core-frontend/src/components/dashboard/DbToolbar.vue +++ b/core/core-frontend/src/components/dashboard/DbToolbar.vue @@ -140,7 +140,10 @@ const previewOuter = () => { return } canvasSave(() => { - const url = '#/preview?dvId=' + dvInfo.value.id + '&ignoreParams=true' + let url = '#/preview?dvId=' + dvInfo.value.id + '&ignoreParams=true' + if (embeddedStore.baseUrl) { + url = `${embedded.baseUrl}${url}`.replaceAll('\/\/#', '\/#') + } const newWindow = window.open(url, '_blank') initOpenHandler(newWindow) }) @@ -650,7 +653,7 @@ const initOpenHandler = newWindow => { - + {{ t('work_branch.new_page_preview') }} diff --git a/core/core-frontend/src/views/share/share/ShareGrid.vue b/core/core-frontend/src/views/share/share/ShareGrid.vue index 42e02fad34..49141599b5 100644 --- a/core/core-frontend/src/views/share/share/ShareGrid.vue +++ b/core/core-frontend/src/views/share/share/ShareGrid.vue @@ -10,6 +10,7 @@ import { useI18n } from '@/hooks/web/useI18n' import { ref, reactive, watch, computed } from 'vue' import GridTable from '@/components/grid-table/src/GridTable.vue' import request from '@/config/axios' +import { useEmbedded } from '@/store/modules/embedded' import dayjs from 'dayjs' import { propTypes } from '@/utils/propTypes' import ShareHandler from './ShareHandler.vue' @@ -23,6 +24,7 @@ const props = defineProps({ const { wsCache } = useCache('localStorage') const { t } = useI18n() const interactiveStore = interactiveStoreWithOut() +const embeddedStore = useEmbedded() const busiDataMap = computed(() => interactiveStore.getData) const panelKeyword = ref() @@ -47,6 +49,9 @@ const triggerFilterPanel = () => { } const preview = id => { const routeUrl = `/#/preview?dvId=${id}` + if (embeddedStore.baseUrl) { + routeUrl = `${embedded.baseUrl}${routeUrl}`.replaceAll('\/\/#', '\/#') + } window.open(routeUrl, '_blank') } const formatterTime = (_, _column, cellValue) => { @@ -235,7 +240,7 @@ watch(