mirror of
https://github.com/dataease/dataease.git
synced 2025-02-25 20:42:55 +08:00
feat(系统设置): 系统设置的基础设置中添加页面打开方式选项
This commit is contained in:
parent
fcdf117799
commit
5bbd4a41e7
@ -286,7 +286,8 @@ const backHandler = (url: string) => {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
wsCache.delete('DE-DV-CATCH-' + dvInfo.value.id)
|
wsCache.delete('DE-DV-CATCH-' + dvInfo.value.id)
|
||||||
window.open(url, '_self')
|
wsCache.set('db-info-id', dvInfo.value.id)
|
||||||
|
history.back()
|
||||||
}
|
}
|
||||||
|
|
||||||
const multiplexingCanvasOpen = () => {
|
const multiplexingCanvasOpen = () => {
|
||||||
|
@ -235,7 +235,8 @@ const backHandler = (url: string) => {
|
|||||||
}
|
}
|
||||||
dvMainStore.canvasStateChange({ key: 'curPointArea', value: 'base' })
|
dvMainStore.canvasStateChange({ key: 'curPointArea', value: 'base' })
|
||||||
wsCache.delete('DE-DV-CATCH-' + dvInfo.value.id)
|
wsCache.delete('DE-DV-CATCH-' + dvInfo.value.id)
|
||||||
window.open(url, '_self')
|
wsCache.set('dv-info-id', dvInfo.value.id)
|
||||||
|
history.back()
|
||||||
}
|
}
|
||||||
const openHandler = ref(null)
|
const openHandler = ref(null)
|
||||||
|
|
||||||
|
@ -186,7 +186,9 @@ const menuList = computed(() => {
|
|||||||
return list
|
return list
|
||||||
})
|
})
|
||||||
|
|
||||||
const dvId = embeddedStore.dvId || router.currentRoute.value.query.dvId
|
const infoId = wsCache.get(curCanvasType.value === 'dashboard' ? 'db-info-id' : 'dv-info-id')
|
||||||
|
const dvId = embeddedStore.dvId || infoId
|
||||||
|
wsCache.delete(curCanvasType.value === 'dashboard' ? 'db-info-id' : 'dv-info-id')
|
||||||
if (dvId && showPosition.value === 'preview') {
|
if (dvId && showPosition.value === 'preview') {
|
||||||
selectedNodeKey.value = dvId
|
selectedNodeKey.value = dvId
|
||||||
returnMounted.value = true
|
returnMounted.value = true
|
||||||
|
@ -27,6 +27,7 @@ import {
|
|||||||
onMounted,
|
onMounted,
|
||||||
onBeforeUnmount
|
onBeforeUnmount
|
||||||
} from 'vue'
|
} from 'vue'
|
||||||
|
import { useCache } from '@/hooks/web/useCache'
|
||||||
import { useI18n } from '@/hooks/web/useI18n'
|
import { useI18n } from '@/hooks/web/useI18n'
|
||||||
import { useEmitt } from '@/hooks/web/useEmitt'
|
import { useEmitt } from '@/hooks/web/useEmitt'
|
||||||
import { ElIcon, ElMessageBox, ElMessage } from 'element-plus-secondary'
|
import { ElIcon, ElMessageBox, ElMessage } from 'element-plus-secondary'
|
||||||
@ -37,7 +38,7 @@ import EmptyBackground from '@/components/empty-background/src/EmptyBackground.v
|
|||||||
import { Icon } from '@/components/icon-custom'
|
import { Icon } from '@/components/icon-custom'
|
||||||
import { useWindowSize } from '@vueuse/core'
|
import { useWindowSize } from '@vueuse/core'
|
||||||
import CalcFieldEdit from './CalcFieldEdit.vue'
|
import CalcFieldEdit from './CalcFieldEdit.vue'
|
||||||
import { useRoute, useRouter } from 'vue-router'
|
import { useRoute } from 'vue-router'
|
||||||
import UnionEdit from './UnionEdit.vue'
|
import UnionEdit from './UnionEdit.vue'
|
||||||
import type { FormInstance } from 'element-plus-secondary'
|
import type { FormInstance } from 'element-plus-secondary'
|
||||||
import type { BusiTreeNode } from '@/models/tree/TreeNode'
|
import type { BusiTreeNode } from '@/models/tree/TreeNode'
|
||||||
@ -72,11 +73,11 @@ interface Field {
|
|||||||
originName: string
|
originName: string
|
||||||
deType: number
|
deType: number
|
||||||
}
|
}
|
||||||
|
const { wsCache } = useCache()
|
||||||
const appStore = useAppStoreWithOut()
|
const appStore = useAppStoreWithOut()
|
||||||
const embeddedStore = useEmbedded()
|
const embeddedStore = useEmbedded()
|
||||||
const { t } = useI18n()
|
const { t } = useI18n()
|
||||||
const route = useRoute()
|
const route = useRoute()
|
||||||
const { push } = useRouter()
|
|
||||||
const quotaTableHeight = ref(238)
|
const quotaTableHeight = ref(238)
|
||||||
const creatDsFolder = ref()
|
const creatDsFolder = ref()
|
||||||
const editCalcField = ref(false)
|
const editCalcField = ref(false)
|
||||||
@ -249,12 +250,8 @@ const pushDataset = () => {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
const routeName = embeddedStore.getToken && appStore.getIsIframe ? 'dataset-embedded' : 'dataset'
|
const routeName = embeddedStore.getToken && appStore.getIsIframe ? 'dataset-embedded' : 'dataset'
|
||||||
push({
|
wsCache.set(`${routeName}-info-id`, nodeInfo.id)
|
||||||
name: routeName,
|
history.back()
|
||||||
params: {
|
|
||||||
id: nodeInfo.id
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const backToMain = () => {
|
const backToMain = () => {
|
||||||
|
@ -340,7 +340,9 @@ const dfsDatasetTree = (ds, id) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
onBeforeMount(() => {
|
onBeforeMount(() => {
|
||||||
nodeInfo.id = (route.params.id as string) || (route.query.id as string) || ''
|
const paramId = wsCache.get('dataset-info-id')
|
||||||
|
nodeInfo.id = (paramId as string) || (route.query.id as string) || ''
|
||||||
|
wsCache.delete('dataset-info-id')
|
||||||
loadInit()
|
loadInit()
|
||||||
getData()
|
getData()
|
||||||
getLimit()
|
getLimit()
|
||||||
|
Loading…
Reference in New Issue
Block a user