From 20260df9a105695eb8a5c86f185e5954a59ac535 Mon Sep 17 00:00:00 2001 From: wxg0103 <727495428@qq.com> Date: Thu, 13 Feb 2025 11:44:52 +0800 Subject: [PATCH] fix: application set language error --- .../serializers/application_serializers.py | 2 ++ .../component/DisplaySettingDialog.vue | 12 ++++-------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/apps/application/serializers/application_serializers.py b/apps/application/serializers/application_serializers.py index d97f4782a..6eb2ea525 100644 --- a/apps/application/serializers/application_serializers.py +++ b/apps/application/serializers/application_serializers.py @@ -374,6 +374,8 @@ class ApplicationSerializer(serializers.Serializer): application_access_token.show_source = instance.get('show_source') if 'language' in instance and instance.get('language') is not None: application_access_token.language = instance.get('language') + if 'language' not in instance or instance.get('language') is None: + application_access_token.language = None application_access_token.save() application_setting_model = DBModelManage.get_model('application_setting') xpack_cache = DBModelManage.get_model('xpack_cache') diff --git a/ui/src/views/application-overview/component/DisplaySettingDialog.vue b/ui/src/views/application-overview/component/DisplaySettingDialog.vue index 6df5828f7..4f35b10ea 100644 --- a/ui/src/views/application-overview/component/DisplaySettingDialog.vue +++ b/ui/src/views/application-overview/component/DisplaySettingDialog.vue @@ -60,7 +60,7 @@ const emit = defineEmits(['refresh']) const displayFormRef = ref() const form = ref({ show_source: false, - language: '', + language: '' }) const detail = ref(null) @@ -72,14 +72,14 @@ watch(dialogVisible, (bool) => { if (!bool) { form.value = { show_source: false, - language: '', + language: '' } } }) const open = (data: any, content: any) => { detail.value = content form.value.show_source = data.show_source - form.value.language = data.language || getBrowserLang() + form.value.language = data.language dialogVisible.value = true } @@ -87,11 +87,7 @@ const submit = async (formEl: FormInstance | undefined) => { if (!formEl) return await formEl.validate((valid, fields) => { if (valid) { - const obj = { - show_source: form.value.show_source, - language: form.value.language - } - applicationApi.putAccessToken(id as string, obj, loading).then((res) => { + applicationApi.putAccessToken(id as string, form.value, loading).then((res) => { emit('refresh') // @ts-ignore MsgSuccess(t('common.settingSuccess'))