github_mirrors/vue-vben-admin
1
0
Fork 0
mirror of https://github.com/vbenjs/vue-vben-admin.git synced 2025-08-27 06:40:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: locale switching logic correction (#5344)

Browse Source 
* 修复语言切换后的数据更新逻辑

* 表单默认按钮的content属性可提供computed类型的值
This commit is contained in:
Netfan
2025-01-10 14:32:21 +08:00
committed by GitHub
parent 7606b86854
commit 624beb6fa0
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/effects/layouts/src/basic/layout.vue
View File

@@ -6,7 +6,7 @@ import type { MenuRecordRaw } from '@vben/types';
import { computed, useSlots, watch } from 'vue';
import { useRefresh } from '@vben/hooks';
import { $t } from '@vben/locales';
import { $t, i18n } from '@vben/locales';
import {
preferences,
updatePreferences,
@@ -163,7 +163,8 @@ watch(
);
// 语言更新后，刷新页面
watch(() => preferences.app.locale, refresh, { flush: 'post' });
// i18n.global.locale会在preference.app.locale变更之后才会更新，因此watchpreference.app.locale是不合适的，刷新页面时可能语言配置尚未完全加载完成
watch(i18n.global.locale, refresh, { flush: 'post' });
const slots: SetupContext['slots'] = useSlots();
const headerSlots = computed(() => {