Skip to content

fix: application overview display setting #7556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fit2cloudwxx merged 1 commit into from
Oct 29, 2026
Merged

fix: application overview display setting #7556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions ui/src/views/application-detail/overview/access-restriction/ButtonAccessRestriction.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<script setup lang="ts">
import { ref } from 'vue'
import { computed, ref } from 'vue'
import { useStore } from '@/stores/admin'
import AccessRestrictionDrawer from './AccessRestrictionDrawer.vue'
import XpackAccessRestrictionDrawer from './XpackAccessRestrictionDrawer.vue'

defineOptions({ name: 'ButtonAccessRestriction' })

const { auth } = useStore()
const accessRestrictionDrawer = computed(() => (auth.isCE ? AccessRestrictionDrawer : XpackAccessRestrictionDrawer))
const drawerVisible = ref(false)

function handleOpenAccessRestriction() {
Expand All @@ -20,8 +21,5 @@ function handleOpenAccessRestriction() {
<MkIcon name="icon-lock" />
<span>访问限制</span>
</el-button>
<template v-if="drawerVisible">
<AccessRestrictionDrawer v-if="auth.isCE" @closed="drawerVisible = false" />
<XpackAccessRestrictionDrawer v-else @closed="drawerVisible = false" />
</template>
<component v-if="drawerVisible" :is="accessRestrictionDrawer" @closed="drawerVisible = false" />
</template>
3 changes: 1 addition & 2 deletions ui/src/views/application-detail/overview/display-setting/XpackDisplaySettingDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { MsgError, MsgSuccess } from '@/utils/message'
import { useApplicationDetailContext } from '../../context'
import DisplaySettingPreview from './components/DisplaySettingPreview.vue'
import { APPLICATION_DISPLAY_SETTING_DEFAULT } from '@/constants/application'
import ApplicationApi from '@/api/admin/workspace/application/application'

defineOptions({ name: 'XpackDisplaySettingDialog' })

Expand Down Expand Up @@ -47,7 +46,7 @@ const languageOptions = [
function loadSetting() {
if (loading.value) return
loading.value = true
return ApplicationApi.getDisplaySetting(applicationId.value)
return resourceApi.application.getDisplaySetting(applicationId.value)
.then((config) => {
// 旧版接口可能省略展示字段，嵌套配置分别补齐默认值。
const setting: ApplicationDisplaySetting = cloneDeep(APPLICATION_DISPLAY_SETTING_DEFAULT)
Expand Down
Loading