zhuchaowe/maxkb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Display setting bugs

Browse Source
This commit is contained in:
wangdan-fit2cloud 2025-02-12 16:19:15 +08:00 committed by GitHub
parent 4874c0e4b0
commit a22c2e10b0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/src/views/application-overview/component/DisplaySettingDialog.vue
View File

@ -59,7 +59,8 @@ const emit = defineEmits(['refresh'])
const displayFormRef = ref() const displayFormRef = ref()
const form = ref<any>({ const form = ref<any>({
show_source: false show_source: false,
language: '',
}) })
const detail = ref<any>(null) const detail = ref<any>(null)
@ -70,18 +71,15 @@ const loading = ref(false)
watch(dialogVisible, (bool) => { watch(dialogVisible, (bool) => {
if (!bool) { if (!bool) {
form.value = { form.value = {
show_source: false show_source: false,
language: '',
} }
} }
}) })
const open = (data: any, content: any) => { const open = (data: any, content: any) => {
detail.value = content detail.value = content
form.value.show_source = data.show_source form.value.show_source = data.show_source
form.value.language = data.language form.value.language = data.language || getBrowserLang()
if (!form.value.language) {
form.value.language = getBrowserLang()
}
dialogVisible.value = true dialogVisible.value = true
} }

40
ui/src/views/application-overview/component/XPackDisplaySettingDialog.vue
View File

@ -146,16 +146,16 @@
</div> </div>
</div> </div>
<el-form ref="displayFormRef" :model="form"> <el-form ref="displayFormRef" :model="xpackForm">
<el-row class="w-full mb-8"> <el-row class="w-full mb-8">
<el-col :span="12"> <el-col :span="12">
<h5 class="mb-8"> <h5 class="mb-8">
{{ $t('views.applicationOverview.appInfo.SettingDisplayDialog.customThemeColor') }} {{ $t('views.applicationOverview.appInfo.SettingDisplayDialog.customThemeColor') }}
</h5> </h5>
<div> <div>
<el-color-picker v-model="form.custom_theme.theme_color" /> <el-color-picker v-model="xpackForm.custom_theme.theme_color" />
{{ {{
!form.custom_theme.theme_color !xpackForm.custom_theme.theme_color
? $t('views.applicationOverview.appInfo.SettingDisplayDialog.default') ? $t('views.applicationOverview.appInfo.SettingDisplayDialog.default')
: '' : ''
}} }}
@ -167,14 +167,14 @@
$t('views.applicationOverview.appInfo.SettingDisplayDialog.headerTitleFontColor') $t('views.applicationOverview.appInfo.SettingDisplayDialog.headerTitleFontColor')
}} }}
</h5> </h5>
<el-color-picker v-model="form.custom_theme.header_font_color" /> <el-color-picker v-model="xpackForm.custom_theme.header_font_color" />
</el-col> </el-col>
</el-row> </el-row>
<el-row class="w-full mb-8"> <el-row class="w-full mb-8">
<h5 class="mb-8"> <h5 class="mb-8">
{{ $t('views.applicationOverview.appInfo.SettingDisplayDialog.languageLabel') }} {{ $t('views.applicationOverview.appInfo.SettingDisplayDialog.languageLabel') }}
</h5> </h5>
<el-select v-model="form.language" clearable> <el-select v-model="xpackForm.language" clearable>
<el-option <el-option
v-for="item in langList" v-for="item in langList"
:key="item.value" :key="item.value"
@ -256,7 +256,7 @@
$t('views.applicationOverview.appInfo.SettingDisplayDialog.iconDefaultPosition') $t('views.applicationOverview.appInfo.SettingDisplayDialog.iconDefaultPosition')
}}</span> }}</span>
<el-checkbox <el-checkbox
v-model="form.draggable" v-model="xpackForm.draggable"
:label=" :label="
$t('views.applicationOverview.appInfo.SettingDisplayDialog.draggablePosition') $t('views.applicationOverview.appInfo.SettingDisplayDialog.draggablePosition')
" "
@ -265,7 +265,7 @@
<el-row :gutter="8" class="w-full mb-8"> <el-row :gutter="8" class="w-full mb-8">
<el-col :span="12"> <el-col :span="12">
<div class="flex align-center"> <div class="flex align-center">
<el-select v-model="form.float_location.x.type" style="width: 80px"> <el-select v-model="xpackForm.float_location.x.type" style="width: 80px">
<el-option <el-option
:label=" :label="
$t( $t(
@ -284,7 +284,7 @@
/> />
</el-select> </el-select>
<el-input-number <el-input-number
v-model="form.float_location.x.value" v-model="xpackForm.float_location.x.value"
:min="0" :min="0"
:step="1" :step="1"
:precision="0" :precision="0"
@ -297,7 +297,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<div class="flex align-center"> <div class="flex align-center">
<el-select v-model="form.float_location.y.type" style="width: 80px"> <el-select v-model="xpackForm.float_location.y.type" style="width: 80px">
<el-option <el-option
:label=" :label="
$t( $t(
@ -316,7 +316,7 @@
/> />
</el-select> </el-select>
<el-input-number <el-input-number
v-model="form.float_location.y.value" v-model="xpackForm.float_location.y.value"
:min="0" :min="0"
:step="1" :step="1"
:precision="0" :precision="0"
@ -333,7 +333,7 @@
<el-space direction="vertical" alignment="start" :size="2"> <el-space direction="vertical" alignment="start" :size="2">
<el-checkbox <el-checkbox
v-model="form.show_source" v-model="xpackForm.show_source"
:label=" :label="
isWorkFlow(detail.type) isWorkFlow(detail.type)
? $t('views.applicationOverview.appInfo.SettingDisplayDialog.showExecutionDetail') ? $t('views.applicationOverview.appInfo.SettingDisplayDialog.showExecutionDetail')
@ -341,22 +341,22 @@
" "
/> />
<el-checkbox <el-checkbox
v-model="form.show_history" v-model="xpackForm.show_history"
:label="$t('views.applicationOverview.appInfo.SettingDisplayDialog.showHistory')" :label="$t('views.applicationOverview.appInfo.SettingDisplayDialog.showHistory')"
/> />
<el-checkbox <el-checkbox
v-model="form.show_guide" v-model="xpackForm.show_guide"
:label="$t('views.applicationOverview.appInfo.SettingDisplayDialog.displayGuide')" :label="$t('views.applicationOverview.appInfo.SettingDisplayDialog.displayGuide')"
/> />
<el-checkbox <el-checkbox
v-model="form.disclaimer" v-model="xpackForm.disclaimer"
:label="$t('views.applicationOverview.appInfo.SettingDisplayDialog.disclaimer')" :label="$t('views.applicationOverview.appInfo.SettingDisplayDialog.disclaimer')"
@change="changeDisclaimer" @change="changeDisclaimer"
/> />
<span v-if="form.disclaimer" <span v-if="xpackForm.disclaimer"
><el-tooltip :content="form.disclaimer_value" placement="top"> ><el-tooltip :content="xpackForm.disclaimer_value" placement="top">
<el-input <el-input
v-model="form.disclaimer_value" v-model="xpackForm.disclaimer_value"
style="width: 422px; margin-bottom: 10px" style="width: 422px; margin-bottom: 10px"
@change="changeValue" @change="changeValue"
:maxlength="128" :maxlength="128"
@ -421,9 +421,6 @@ const defaultSetting = {
} }
const displayFormRef = ref() const displayFormRef = ref()
const form = ref<any>({
show_source: false
})
const xpackForm = ref<any>({ const xpackForm = ref<any>({
show_source: false, show_source: false,
@ -468,7 +465,6 @@ const customStyle = computed(() => {
}) })
function resetForm() { function resetForm() {
form.value = cloneDeep(defaultSetting)
xpackForm.value = cloneDeep(defaultSetting) xpackForm.value = cloneDeep(defaultSetting)
imgUrl.value = { imgUrl.value = {
avatar: '', avatar: '',
@ -503,7 +499,6 @@ const open = (data: any, content: any) => {
imgUrl.value.user_avatar = data.user_avatar imgUrl.value.user_avatar = data.user_avatar
xpackForm.value.disclaimer = data.disclaimer xpackForm.value.disclaimer = data.disclaimer
xpackForm.value.disclaimer_value = data.disclaimer_value xpackForm.value.disclaimer_value = data.disclaimer_value
console.log(xpackForm.value.disclaimer_value)
if ( if (
xpackForm.value.disclaimer_value === xpackForm.value.disclaimer_value ===
t('views.applicationOverview.appInfo.SettingDisplayDialog.disclaimerValue') t('views.applicationOverview.appInfo.SettingDisplayDialog.disclaimerValue')
@ -520,7 +515,6 @@ const open = (data: any, content: any) => {
header_font_color: data.custom_theme?.header_font_color || '#1f2329' header_font_color: data.custom_theme?.header_font_color || '#1f2329'
} }
xpackForm.value.float_location = data.float_location xpackForm.value.float_location = data.float_location
form.value = xpackForm.value
dialogVisible.value = true dialogVisible.value = true
} }