dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13395 from dataease/pr@dev-v2_st

Browse Source 
feat(系统设置): 系统设置的基础设置中添加页面打开方式选项
This commit is contained in:
xuwei-fit2cloud 2024-11-18 18:52:06 +08:00 committed by GitHub
commit ad60afbd7b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
18 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-frontend/src/components/dashboard/DbToolbar.vue
View File

@ -139,7 +139,7 @@ const previewOuter = () => {
}
canvasSave(() => {
const url = '#/preview?dvId=' + dvInfo.value.id + '&ignoreParams=true'
const openType = wsCache.get('open-backend') === '0' ? '_self' : '_blank'
const openType = wsCache.get('open-backend') === '1' ? '_self' : '_blank'
const newWindow = window.open(url, openType)
initOpenHandler(newWindow)
})

2
core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue
View File

@ -317,7 +317,7 @@ const onWrapperClick = e => {
try {
let newWindow
if ('newPop' === jumpType) {
const openType = wsCache.get('open-backend') === '0' ? '_self' : '_blank'
const openType = wsCache.get('open-backend') === '1' ? '_self' : '_blank'
window.open(
url,
openType,

2
core/core-frontend/src/layout/components/Header.vue
View File

@ -65,7 +65,7 @@ const showOverlayCopilot = ref(true)
const handleSelect = (index: string) => {
// 自定义事件
if (isExternal(index)) {
const openType = wsCache.get('open-backend') === '0' ? '_self' : '_blank'
const openType = wsCache.get('open-backend') === '1' ? '_self' : '_blank'
window.open(index, openType)
} else {
push(index)

2
core/core-frontend/src/layout/components/Menu.vue
View File

@ -30,7 +30,7 @@ const activeIndex = computed(() => {
const menuSelect = (index: string, indexPath: string[]) => {
// 自定义事件
if (isExternal(index)) {
const openType = wsCache.get('open-backend') === '0' ? '_self' : '_blank'
const openType = wsCache.get('open-backend') === '1' ? '_self' : '_blank'
window.open(index, openType)
} else {
push(`${path.value}/${indexPath.join('/')}`)

2
core/core-frontend/src/layout/components/TopDocCard.vue
View File

@ -19,7 +19,7 @@ const { cardInfo } = toRefs(props)
const openBlank = () => {
if (cardInfo.value.url) {
const openType = wsCache.get('open-backend') === '0' ? '_self' : '_blank'
const openType = wsCache.get('open-backend') === '1' ? '_self' : '_blank'
window.open(cardInfo.value.url, openType)
}
}

2
core/core-frontend/src/views/about/index.vue
View File

@ -62,7 +62,7 @@ const beforeUpload = file => {
const support = () => {
const url = 'https://support.fit2cloud.com/'
const openType = wsCache.get('open-backend') === '0' ? '_self' : '_blank'
const openType = wsCache.get('open-backend') === '1' ? '_self' : '_blank'
window.open(url, openType)
}

4
core/core-frontend/src/views/chart/components/editor/index.vue
View File

@ -1402,7 +1402,7 @@ const addDsWindow = () => {
const path =
embeddedStore.getToken && appStore.getIsIframe ? 'dataset-embedded-form' : '/dataset-form'
let routeData = router.resolve(path)
const openType = wsCache.get('open-backend') === '0' ? '_self' : '_blank'
const openType = wsCache.get('open-backend') === '1' ? '_self' : '_blank'
const newWindow = window.open(routeData.href, openType)
initOpenHandler(newWindow)
}
@ -1415,7 +1415,7 @@ const editDs = () => {
id: view.value.tableId
}
})
const openType = wsCache.get('open-backend') === '0' ? '_self' : '_blank'
const openType = wsCache.get('open-backend') === '1' ? '_self' : '_blank'
const newWindow = window.open(routeData.href, openType)
initOpenHandler(newWindow)
}

2
core/core-frontend/src/views/chart/components/views/index.vue
View File

@ -410,7 +410,7 @@ const windowsJump = (url, jumpType, size = 'middle') => {
const width = screen.width * sizeX
const left = screen.width * ((1 - sizeX) / 2)
const top = screen.height * ((1 - sizeY) / 2)
const openType = wsCache.get('open-backend') === '0' ? '_self' : '_blank'
const openType = wsCache.get('open-backend') === '1' ? '_self' : '_blank'
newWindow = window.open(
url,
openType,

2
core/core-frontend/src/views/common/DeAppApply.vue
View File

@ -185,7 +185,7 @@ const dvPreName = computed(() =>
)
const addDsWindow = () => {
// do addDsWindow
const openType = wsCache.get('open-backend') === '0' ? '_self' : '_blank'
const openType = wsCache.get('open-backend') === '1' ? '_self' : '_blank'
const url = '#/data/datasource?opt=create'
window.open(url, openType)
}

2
core/core-frontend/src/views/common/DeResourceGroupOpt.vue
View File

@ -287,7 +287,7 @@ const saveResource = () => {
emits('finish')
ElMessage.success('保存成功')
if (cmd.value === 'copy') {
const openType = wsCache.get('open-backend') === '0' ? '_self' : '_blank'
const openType = wsCache.get('open-backend') === '1' ? '_self' : '_blank'
const baseUrl =
curCanvasType.value === 'dataV'
? '#/dvCanvas?opt=copy&dvId='

2
core/core-frontend/src/views/common/DeResourceTree.vue
View File

@ -281,7 +281,7 @@ const afterTreeInit = () => {
}
const copyLoading = ref(false)
const openType = wsCache.get('open-backend') === '0' ? '_self' : '_blank'
const openType = wsCache.get('open-backend') === '1' ? '_self' : '_blank'
const emit = defineEmits(['nodeClick'])
const operation = (cmd: string, data: BusiTreeNode, nodeType: string) => {

2
core/core-frontend/src/views/data-visualization/PreviewHead.vue
View File

@ -29,7 +29,7 @@ const { dvInfo } = storeToRefs(dvMainStore)
const emit = defineEmits(['reload', 'download', 'downloadAsAppTemplate'])
const { t } = useI18n()
const embeddedStore = useEmbedded()
const openType = wsCache.get('open-backend') === '0' ? '_self' : '_blank'
const openType = wsCache.get('open-backend') === '1' ? '_self' : '_blank'
const favorited = ref(false)
const preview = () => {
const baseUrl = isDataEaseBi.value ? embeddedStore.baseUrl : ''

2
core/core-frontend/src/views/share/share/ShareGrid.vue
View File

@ -47,7 +47,7 @@ const triggerFilterPanel = () => {
}
const preview = id => {
const routeUrl = `/#/preview?dvId=${id}`
const openType = wsCache.get('open-backend') === '0' ? '_self' : '_blank'
const openType = wsCache.get('open-backend') === '1' ? '_self' : '_blank'
window.open(routeUrl, openType)
}
const formatterTime = (_, _column, cellValue) => {

2
core/core-frontend/src/views/template-market/index.vue
View File

@ -495,7 +495,7 @@ const apply = template => {
)
return
}
const openType = wsCache.get('open-backend') === '0' ? '_self' : '_blank'
const openType = wsCache.get('open-backend') === '1' ? '_self' : '_blank'
if (state.pid) {
newWindow = window.open(baseUrl + `&pid=${state.pid}`, openType)
} else {

2
core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue
View File

@ -60,7 +60,7 @@ const handleClose = () => {
clearInterval(timer)
}
const { wsCache } = useCache()
const openType = wsCache.get('open-backend') === '0' ? '_self' : '_blank'
const openType = wsCache.get('open-backend') === '1' ? '_self' : '_blank'
const xpack = wsCache.get('xpack-model-distributed')
onUnmounted(() => {

2
core/core-frontend/src/views/visualized/data/dataset/index.vue
View File

@ -140,7 +140,7 @@ const state = reactive({
const resourceGroupOpt = ref()
const curCanvasType = ref('')
const mounted = ref(false)
const openType = wsCache.get('open-backend') === '0' ? '_self' : '_blank'
const openType = wsCache.get('open-backend') === '1' ? '_self' : '_blank'
const isDataEaseBi = computed(() => appStore.getIsDataEaseBi)
const isIframe = computed(() => appStore.getIsIframe)
const exportPermissions = computed(() => exportPermission(nodeInfo.weight, nodeInfo.ext))

2
core/core-frontend/src/views/workbranch/ShortcutTable.vue
View File

@ -97,7 +97,7 @@ const getBusiListWithPermission = () => {
const triggerFilterPanel = () => {
loadTableData()
}
const openType = wsCache.get('open-backend') === '0' ? '_self' : '_blank'
const openType = wsCache.get('open-backend') === '1' ? '_self' : '_blank'
const preview = id => {
const routeUrl = resolve({
path: '/preview',

2
core/core-frontend/src/views/workbranch/index.vue
View File

@ -40,7 +40,7 @@ const router = useRouter()
const resourceCreateOpt = ref(null)
const embeddedStore = useEmbedded()
const appStore = useAppStoreWithOut()
const openType = wsCache.get('open-backend') === '0' ? '_self' : '_blank'
const openType = wsCache.get('open-backend') === '1' ? '_self' : '_blank'
const quickCreationList = shallowRef([
{
icon: icon_dashboard_outlined,