From 1a6899cf8fd004f1719723ab28e2b53824b370e8 Mon Sep 17 00:00:00 2001 From: limengnan <420004014@qq.com> Date: Tue, 24 Jun 2025 10:41:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=89=8D=E7=AB=AFsrc/views/p?= =?UTF-8?q?ages=E7=9B=AE=E5=BD=95=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/pages/index/main.ts | 3 +-- core/core-frontend/src/pages/panel/App.vue | 4 +++- .../src/pages/panel/DashboardPreview.vue | 2 +- .../core-frontend/src/pages/panel/ViewWrapper.vue | 15 +++++++++++++-- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/core/core-frontend/src/pages/index/main.ts b/core/core-frontend/src/pages/index/main.ts index 9081003..44551cd 100644 --- a/core/core-frontend/src/pages/index/main.ts +++ b/core/core-frontend/src/pages/index/main.ts @@ -6,7 +6,7 @@ import App from './App.vue' import FcDesigner from '@/fcDesignerPro/index.es.js' import ElementPlus from 'element-plus'; -import zhCn from 'element-plus/dist/locale/zh-cn.mjs' +import zhCn from 'element-plus/dist/locale/zh-cn.mjs' import 'element-plus/theme-chalk/index.css'; import { setupI18n } from '@/plugins/vue-i18n' import { setupStore } from '@/store' @@ -15,7 +15,6 @@ import { setupElementPlus, setupElementPlusIcons } from '@/plugins/element-plus' // 注册数据大屏组件 import { setupCustomComponent } from '@/custom-component' import { installDirective } from '@/directive' -// import FcDesigner from '@form-create/designer'; import '@/utils/DateUtil' import '@/permission' import WebSocketPlugin from '../../websocket' diff --git a/core/core-frontend/src/pages/panel/App.vue b/core/core-frontend/src/pages/panel/App.vue index 49fe9bc..8afedcb 100644 --- a/core/core-frontend/src/pages/panel/App.vue +++ b/core/core-frontend/src/pages/panel/App.vue @@ -24,6 +24,7 @@ const DashboardPanel = defineAsyncComponent( ) const Copilot = defineAsyncComponent(() => import('@/views/copilot/index.vue')) +const TemplateManage = defineAsyncComponent(() => import('@/views/template/indexInject.vue')) const Preview = defineAsyncComponent(() => import('@/views/data-visualization/PreviewCanvas.vue')) const DashboardEmpty = defineAsyncComponent(() => import('@/views/mobile/panel/DashboardEmpty.vue')) @@ -48,7 +49,8 @@ const componentMap = { DashboardPanel, DatasetEditor, DashboardEmpty, - Copilot + Copilot, + TemplateManage } const isDataFilling = ref(false) diff --git a/core/core-frontend/src/pages/panel/DashboardPreview.vue b/core/core-frontend/src/pages/panel/DashboardPreview.vue index 2cd447b..3a23a96 100644 --- a/core/core-frontend/src/pages/panel/DashboardPreview.vue +++ b/core/core-frontend/src/pages/panel/DashboardPreview.vue @@ -81,7 +81,7 @@ onBeforeMount(async () => { req( embeddedParams.dvId, - embeddedParams.busiFlag, + { busiFlag: embeddedParams.busiFlag }, function ({ canvasDataResult, canvasStyleResult, diff --git a/core/core-frontend/src/pages/panel/ViewWrapper.vue b/core/core-frontend/src/pages/panel/ViewWrapper.vue index 1b76c08..0e4333d 100644 --- a/core/core-frontend/src/pages/panel/ViewWrapper.vue +++ b/core/core-frontend/src/pages/panel/ViewWrapper.vue @@ -11,6 +11,7 @@ import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain' import { useI18n } from '@/hooks/web/useI18n' import { XpackComponent } from '@/components/plugin' import EmptyBackground from '../../components/empty-background/src/EmptyBackground.vue' +import exeRequest from '@/config/axios' const { wsCache } = useCache() const interactiveStore = interactiveStoreWithOut() const embeddedStore = useEmbedded() @@ -55,7 +56,7 @@ const checkPer = async resourceId => { if (!window.DataEaseBi || !resourceId) { return true } - const request = { busiFlag: embeddedParams.busiFlag } + const request = { busiFlag: embeddedParams.busiFlag, resourceTable: 'core' } await interactiveStore.setInteractive(request) const key = embeddedParams.busiFlag === 'dataV' ? 'screen-weight' : 'panel-weight' return check(wsCache.get(key), resourceId, 1) @@ -69,6 +70,13 @@ onBeforeMount(async () => { state.suffixId = embeddedParams.suffixId || 'common' window.addEventListener('message', winMsgHandle) + let tokenInfo = null + if (embeddedStore.getToken && !Object.keys((tokenInfo = embeddedStore.getTokenInfo)).length) { + const res = await exeRequest.get({ url: '/embedded/getTokenArgs' }) + embeddedStore.setTokenInfo(res.data) + tokenInfo = embeddedStore.getTokenInfo + } + // 添加外部参数 let attachParams await getOuterParamsInfo(embeddedParams.dvId).then(rsp => { @@ -87,11 +95,14 @@ onBeforeMount(async () => { return } } + if (tokenInfo && Object.keys(tokenInfo).length) { + attachParams = Object.assign({}, attachParams, tokenInfo) + } const chartId = embeddedParams?.chartId initCanvasData( embeddedParams.dvId, - embeddedParams.busiFlag, + { busiFlag: embeddedParams.busiFlag }, function ({ canvasDataResult, canvasStyleResult, dvInfo, canvasViewInfoPreview }) { state.canvasDataPreview = canvasDataResult state.canvasStylePreview = canvasStyleResult