fix(仪表板): 图表过滤取查看带选字段部分字段没有类型标识

This commit is contained in:
dataeaseShu 2024-06-14 14:16:32 +08:00
parent 935c83b501
commit 1c70e9dbe8
4 changed files with 12 additions and 5 deletions

View File

@ -22,7 +22,7 @@ const { start, done } = useNProgress()
const { loadStart, loadDone } = usePageLoading()
const whiteList = ['/login', '/de-link', '/chart-view'] // 不重定向白名单
const whiteList = ['/login', '/de-link', '/chart-view', '/notSupport'] // 不重定向白名单
const embeddedWindowWhiteList = ['/dvCanvas', '/dashboard', '/preview', '/dataset-embedded-form']
const embeddedRouteWhiteList = ['/dataset-embedded', '/dataset-form', '/dataset-embedded-form']
router.beforeEach(async (to, from, next) => {
@ -34,13 +34,13 @@ router.beforeEach(async (to, from, next) => {
await appStore.setAppModel()
isDesktop = appStore.getDesktop
}
if (isMobile()) {
if (isMobile() && to.path !== '/notSupport') {
done()
loadDone()
if (to.name === 'link') {
window.location.href = window.origin + '/mobile.html#' + to.path
} else if (to.path === '/dvCanvas') {
window.location.href = window.origin + '/mobile.html#' + to.path
next('/notSupport')
} else if (
wsCache.get('user.token') ||
isDesktop ||

View File

@ -39,7 +39,7 @@ router.beforeEach(async (to, _, next) => {
next()
}
} else {
if (whiteList.includes(to.path) || to.path.includes('/de-link')) {
if (whiteList.includes(to.path) || to.name === 'link') {
next()
} else {
next('/login') // 否则全部重定向到登录页

View File

@ -20,6 +20,13 @@ export const routes: AppRouteRecordRaw[] = [
}
]
},
{
path: '/notSupport',
name: 'notSupport',
hidden: true,
meta: {},
component: () => import('@/views/mobile/panel/NotSupport.vue')
},
{
path: '/login',
name: 'login',

View File

@ -26,7 +26,7 @@ const sysParamsIlns = sysParamsEnum.map(_ => {
return { value: `\${sysParams.${_}}`, label: `auth.sysParams_type.${toLine(_)}` }
})
const fieldEnums = ['text', 'time', 'value', 'value', , 'location']
const fieldEnums = ['text', 'time', 'value', 'value', 'value', 'location']
export {
textOptions,