From 7e4a75dcbf4b030b2e4a543bab31cc3586ac41ee Mon Sep 17 00:00:00 2001 From: dataeaseShu Date: Tue, 12 Nov 2024 14:54:03 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F=E6=94=BE=E5=BC=80=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E8=AE=BF=E9=97=AE=E9=99=90=E5=88=B6=EF=BC=8C?= =?UTF-8?q?=E5=85=81=E8=AE=B8=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=AE=BF=E9=97=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/permission.ts | 6 ++---- core/core-frontend/src/permissionMobile.ts | 2 +- core/core-frontend/src/router/index.ts | 7 ------- core/core-frontend/src/router/mobile.ts | 7 ------- .../data-visualization/PreviewCanvasMobile.vue | 8 +++++--- core/core-frontend/src/views/share/link/mobile.vue | 14 ++++---------- 6 files changed, 12 insertions(+), 32 deletions(-) diff --git a/core/core-frontend/src/permission.ts b/core/core-frontend/src/permission.ts index c11604f1d5..61baf5e683 100644 --- a/core/core-frontend/src/permission.ts +++ b/core/core-frontend/src/permission.ts @@ -23,7 +23,7 @@ const { start, done } = useNProgress() const { loadStart, loadDone } = usePageLoading() -const whiteList = ['/login', '/de-link', '/chart-view', '/notSupport', '/admin-login', '/401'] // 不重定向白名单 +const whiteList = ['/login', '/de-link', '/chart-view', '/admin-login', '/401'] // 不重定向白名单 const embeddedWindowWhiteList = ['/dvCanvas', '/dashboard', '/preview', '/dataset-embedded-form'] const embeddedRouteWhiteList = ['/dataset-embedded', '/dataset-form', '/dataset-embedded-form'] router.beforeEach(async (to, from, next) => { @@ -35,7 +35,7 @@ router.beforeEach(async (to, from, next) => { await appStore.setAppModel() isDesktop = appStore.getDesktop } - if (isMobile() && !['/notSupport', '/chart-view'].includes(to.path)) { + if (isMobile() && !['/chart-view'].includes(to.path)) { done() loadDone() if (to.name === 'link') { @@ -49,8 +49,6 @@ router.beforeEach(async (to, from, next) => { } } window.location.href = window.origin + '/mobile.html#' + to.path + linkQuery - } else if (to.path === '/dvCanvas') { - next('/notSupport') } else if ( wsCache.get('user.token') || isDesktop || diff --git a/core/core-frontend/src/permissionMobile.ts b/core/core-frontend/src/permissionMobile.ts index ac883c3228..a482159a27 100644 --- a/core/core-frontend/src/permissionMobile.ts +++ b/core/core-frontend/src/permissionMobile.ts @@ -17,7 +17,7 @@ const { start, done } = useNProgress() const interactiveStore = interactiveStoreWithOut() const { loadStart, loadDone } = usePageLoading() -const whiteList = ['/login', '/panel', '/dvCanvas', '/DashboardEmpty', '/preview'] // 不重定向白名单 +const whiteList = ['/login', '/panel', '/DashboardEmpty', '/preview'] // 不重定向白名单 router.beforeEach(async (to, _, next) => { start() diff --git a/core/core-frontend/src/router/index.ts b/core/core-frontend/src/router/index.ts index aaf86225c9..0d64e546cb 100644 --- a/core/core-frontend/src/router/index.ts +++ b/core/core-frontend/src/router/index.ts @@ -36,13 +36,6 @@ export const routes: AppRouteRecordRaw[] = [ } ] }, - { - path: '/notSupport', - name: 'notSupport', - hidden: true, - meta: {}, - component: () => import('@/views/mobile/panel/NotSupport.vue') - }, { path: '/login', name: 'login', diff --git a/core/core-frontend/src/router/mobile.ts b/core/core-frontend/src/router/mobile.ts index a3ea9a8bfe..26b4adb417 100644 --- a/core/core-frontend/src/router/mobile.ts +++ b/core/core-frontend/src/router/mobile.ts @@ -52,13 +52,6 @@ export const routes: AppRouteRecordRaw[] = [ meta: {}, component: () => import('@/views/mobile/panel/Mobile.vue') }, - { - path: '/dvCanvas', - name: 'dv', - hidden: true, - meta: {}, - component: () => import('@/views/mobile/panel/NotSupport.vue') - }, { path: '/DashboardEmpty', name: 'DashboardEmpty', diff --git a/core/core-frontend/src/views/data-visualization/PreviewCanvasMobile.vue b/core/core-frontend/src/views/data-visualization/PreviewCanvasMobile.vue index 38b12429ca..6e15d96767 100644 --- a/core/core-frontend/src/views/data-visualization/PreviewCanvasMobile.vue +++ b/core/core-frontend/src/views/data-visualization/PreviewCanvasMobile.vue @@ -3,7 +3,7 @@ import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain' import { onMounted, reactive } from 'vue' import DePreview from '@/components/data-visualization/canvas/DePreview.vue' import router from '@/router/mobile' -import { initCanvasDataMobile } from '@/utils/canvasUtils' +import { initCanvasDataMobile, initCanvasData } from '@/utils/canvasUtils' import { queryTargetVisualizationJumpInfo } from '@/api/visualization/linkJump' import { Base64 } from 'js-base64' import { getOuterParamsInfo } from '@/api/visualization/outerParams' @@ -91,7 +91,9 @@ const loadCanvasDataAsync = async (dvId, dvType) => { return } } - initCanvasDataMobile( + + const req = dvType === 'dashboard' ? initCanvasDataMobile : initCanvasData + req( dvId, dvType, function ({ @@ -101,7 +103,7 @@ const loadCanvasDataAsync = async (dvId, dvType) => { canvasViewInfoPreview, curPreviewGap }) { - if (!dvInfo.mobileLayout) { + if (!dvInfo.mobileLayout && dvType === 'dashboard') { router.push('/DashboardEmpty') return } diff --git a/core/core-frontend/src/views/share/link/mobile.vue b/core/core-frontend/src/views/share/link/mobile.vue index c03b349096..96399f3a13 100644 --- a/core/core-frontend/src/views/share/link/mobile.vue +++ b/core/core-frontend/src/views/share/link/mobile.vue @@ -22,7 +22,6 @@ import PreviewCanvas from '@/views/data-visualization/PreviewCanvasMobile.vue' import TicketError from './TicketError.vue' import { ProxyInfo, shareProxy } from './ShareProxy' import Exp from './exp.vue' -import router from '@/router/mobile' import LinkError from './error.vue' import PwdTips from './pwd.vue' const linkExist = ref(false) @@ -53,16 +52,11 @@ onMounted(async () => { pwdValid.value = !!proxyInfo.pwdValid state.ticketValidVO = proxyInfo.ticketValidVO nextTick(() => { - if (curType.value === 'dashboard') { - const method = pcanvas?.value?.loadCanvasDataAsync - if (method) { - method(proxyInfo.resourceId, 'dashboard', null) - } - loading.value = false - } else { - loading.value = false - router.push('/dvCanvas') + const method = pcanvas?.value?.loadCanvasDataAsync + if (method) { + method(proxyInfo.resourceId, curType.value, null) } + loading.value = false }) })