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

fix(系统设置): 打开桌面版后,修改页面打开方式为打开新页面,编辑大屏打开新页面后,关闭旧的页面,新页面也会随之关闭
This commit is contained in:
xuwei-fit2cloud
2024-12-11 10:23:54 +08:00
committed by GitHub

View File

@@ -53,6 +53,7 @@ import BasicEdit from './BasicEdit.vue'
import request from '@/config/axios'
import { SettingRecord } from '@/views/system/common/SettingTemplate'
import { reactive } from 'vue'
import { isDesktop } from '@/utils/ModelUtil'
import { cloneDeep } from 'lodash-es'
import { useI18n } from '@/hooks/web/useI18n'
const { t } = useI18n()
@@ -61,6 +62,7 @@ const infoTemplate = ref()
const loginTemplate = ref()
const thirdTemplate = ref()
const showDefaultLogin = ref(false)
const desktop = isDesktop()
const pvpOptions = [
{ value: '0', label: t('commons.date.permanent') },
{ value: '1', label: t('commons.date.one_year') },
@@ -147,7 +149,11 @@ const selectedRName = ref<string[]>([])
const selectedPvp = ref('0')
const baseInfoSettings = computed(() =>
state.templateList.filter(item => !loginSettings.concat(thirdSettings).includes(item.pkey))
state.templateList.filter(
item =>
!loginSettings.concat(thirdSettings).includes(item.pkey) &&
(!desktop || item.pkey !== 'setting_basic.defaultOpen')
)
)
const thirdInfoSettings = computed(() =>