Fixed: Fix the language window synchronization issue

Author: ZhaoJiSen

ui/components/Modal/modal.vue

@@ -1,30 +1,30 @@
 <script setup lang="ts">
 withDefaults(
   defineProps<{
-    open: boolean
-    title?: string
-    description?: string
+    open: boolean;
+    title?: string;
+    description?: string;
   }>(),
   {
-    title: '',
-    description: ''
+    title: "",
+    description: ""
   }
 );
 
 const emits = defineEmits<{
-  (e: 'update:open', value: boolean): void
-  (e: 'clipboard', value: string): void
-  (e: 'confirm'): void
+  (e: "update:open", value: boolean): void;
+  (e: "clipboard", value: string): void;
+  (e: "confirm"): void;
 }>();
 
 const { t } = useI18n();
 
 const updateOpen = () => {
-  emits('update:open', false);
+  emits("update:open", false);
 };
 
 const handleConfirm = () => {
-  emits('confirm');
+  emits("confirm");
 };
 
 const handleContextMenu = async (e: Event) => {
@@ -33,12 +33,11 @@ const handleContextMenu = async (e: Event) => {
 
   try {
     const clipboardText = await useTauriClipboardManagerReadText();
-    console.log(clipboardText);
 
     if (clipboardText) {
-      emits('clipboard', clipboardText);
+      emits("clipboard", clipboardText);
     } else {
-      emits('clipboard', '');
+      emits("clipboard", "");
     }
   } catch (error) {
     console.error(error);
@@ -56,26 +55,14 @@ const handleContextMenu = async (e: Event) => {
       @update:open="updateOpen"
     >
       <template #body>
-        <div
-          @contextmenu.stop.prevent="handleContextMenu"
-          @keydown.enter="handleConfirm"
-        >
+        <div @contextmenu.stop.prevent="handleContextMenu" @keydown.enter="handleConfirm">
           <slot />
         </div>
       </template>
 
       <template #footer="{ close }">
-        <UButton
-          :label="t('Common.Cancel')"
-          color="neutral"
-          variant="outline"
-          @click="close"
-        />
-        <UButton
-          :label="t('Common.Confirm')"
-          color="neutral"
-          @click="handleConfirm"
-        />
+        <UButton :label="t('Common.Cancel')" color="neutral" variant="outline" @click="close" />
+        <UButton :label="t('Common.Confirm')" color="neutral" @click="handleConfirm" />
       </template>
     </UModal>
   </template>

ui/components/SideBar/profile.vue

@@ -4,6 +4,7 @@ import type { UnlistenFn } from "@tauri-apps/api/event";
 import type { WebviewWindow } from "@tauri-apps/api/webviewWindow";
 import type { PermissionOrgs, PermOrgItem, UserData, UserIntiInfo, RoleType } from "~/types/index";
 
+import { resolveLanguageFromCookies } from "~/utils";
 import { LogicalPosition } from "@tauri-apps/api/dpi";
 import { useUserInfoStore } from "~/store/modules/userInfo";
 
@@ -62,14 +63,11 @@ const profileMenuItems = computed<DropdownMenuItem[][]>(() => [
   ]
 ]);
 
-const userDescription = computed(() => {
-  return currentUser.value?.system_roles.map((role: RoleType) => role.display_name).join(";");
-});
-
 watch(
   () => currentLanguage.value,
   (lang) => {
     const target = lang === "zh" ? "zh" : "en";
+
     setLocale(target as any);
   },
   { immediate: true }
@@ -104,27 +102,6 @@ function initSelectOrganization(permissionOrgData: PermissionOrgs) {
   return uniqueOrgs;
 }
 
-/**
- * @description 处理 cooklies 中的 django_language
- * @param cookies
- */
-function resolveLanguageFromCookies(cookies: string | undefined | null): "zh" | "en" {
-  if (!cookies) return "en";
-
-  const langEntry = cookies
-    .split(";")
-    .map((chunk) => chunk.trim())
-    .find((chunk) => chunk.toLowerCase().startsWith("django_language="));
-
-  if (!langEntry) return "en";
-
-  const value = langEntry.split("=")[1]?.trim().toLowerCase();
-
-  if (!value) return "en";
-
-  return value === "zh-hans" || value.startsWith("zh") ? "zh" : "en";
-}
-
 /**
  * @description 打开登录页面
  */
@@ -351,7 +328,6 @@ onMounted(async () => {
 
       if (status === "success" && profileData) {
         const language = resolveLanguageFromCookies(cookies);
-        await setLocale(language as any);
 
         toast.add({
           title: t("Login.LoginSuccess"),
@@ -436,7 +412,6 @@ onBeforeUnmount(() => {
         :avatar="{
           src: '/user_avatar.png'
         }"
-        :description="userDescription"
         :ui="props.collapse ? { root: 'justify-center gap-0' } : undefined"
       >
         <template #name>

ui/composables/useAssetAction.ts

@@ -363,8 +363,6 @@ export const useAssetAction = () => {
         }
 
         const payload = event.payload as eventPayload;
-
-        console.log("listenFavoriteSuccessEvent", payload);
       });
 
       unlistenFavoriteFailed = await useTauriEventListen("set-favorite-failure", (event) => {
@@ -373,7 +371,6 @@ export const useAssetAction = () => {
         }
 
         const payload = event.payload as eventPayload;
-        console.log("listenFavoriteFailedEvent", payload);
       });
 
       unlistenGetAssetDetailSuccess = await useTauriEventListen(
@@ -389,7 +386,6 @@ export const useAssetAction = () => {
 
           if (payload.status === "success") {
             const assetDetail = JSON.parse(payload.data) as any;
-            console.log("assetDetail", assetDetail);
             const permedAccounts = assetDetail.permed_accounts ?? [];
             const permedProtocols = assetDetail.permed_protocols ?? [];
 

ui/composables/usePlatform.ts

@@ -3,29 +3,26 @@
  * 提供跨平台的平台检测功能
  */
 export const usePlatform = () => {
-  const platform = ref<string>('');
+  const platform = ref<string>("");
   const isLoading = ref(true);
 
   // 计算属性：判断是否为 macOS
-  const isMacOS = computed(() => platform.value === 'darwin' || platform.value === 'macos');
-  
+  const isMacOS = computed(() => platform.value === "darwin" || platform.value === "macos");
+
   // 计算属性：判断是否为 Windows
-  const isWindows = computed(() => platform.value === 'win32' || platform.value === 'windows');
-  
+  const isWindows = computed(() => platform.value === "win32" || platform.value === "windows");
+
   // 计算属性：判断是否为 Linux
-  const isLinux = computed(() => platform.value === 'linux');
+  const isLinux = computed(() => platform.value === "linux");
 
-  // 获取平台信息
+  // 获取平台信息,如果无法获取平台信息，默认为 windows
   const getPlatform = async () => {
     try {
       isLoading.value = true;
       const currentPlatform = await useTauriOsPlatform();
       platform.value = currentPlatform;
-      console.log('Platform detected:', platform.value);
     } catch (error) {
-      console.error('Failed to get platform info:', error);
-      // 如果无法获取平台信息，默认为 windows
-      platform.value = 'win32';
+      platform.value = "win32";
     } finally {
       isLoading.value = false;
     }
@@ -37,12 +34,11 @@ export const usePlatform = () => {
   });
 
   return {
-    platform: readonly(platform),
-    isLoading: readonly(isLoading),
     isMacOS,
-    isWindows,
     isLinux,
+    isWindows,
     getPlatform,
+    platform: readonly(platform),
+    isLoading: readonly(isLoading)
   };
 };
-

ui/composables/useSettingManager.ts

@@ -1,9 +1,7 @@
-import type { SortType, ThemeType, LayoutsType, AppConfigType } from "~/types";
+import type { SortType, ThemeType, LayoutsType, AppConfigType, LangType } from "~/types";
 import { useSettingStorage, type UserSettingPersistedState } from "~/composables/useSettingStorage";
 
-let managerSingleton: ReturnType<typeof createSettingManager> | null = null;
-
-const createSettingManager = () => {
+export const useSettingManager = () => {
   const storage = useSettingStorage();
 
   const isHydrated = ref(false);
@@ -61,16 +59,16 @@ const createSettingManager = () => {
       });
   };
 
-  const setLang = (lang: string) => {
+  const setLang = (lang: LangType) => {
     state.language = lang;
     persist({ language: lang });
   };
 
-  const setLangGlobal = (lang: string) => {
+  const setLangGlobal = (lang: LangType) => {
     state.language = lang;
 
     // 覆盖所有站点：以存储中的 siteLanguages 为准，避免仅依据当前窗口内存键集合
-    void ensureHydration()
+    ensureHydration()
       .then(async () => {
         try {
           const saved = await storage.load();
@@ -81,14 +79,28 @@ const createSettingManager = () => {
             ...Object.keys(state.siteLanguages || {})
           ]);
 
-          const updated: Record<string, string> = {};
+          // 如果持久化与内存的联合集合中全部已是目标语言，则直接跳过，避免重复应用与重复日志
+          const allAlreadyTarget = [...unionSites].every((site) => {
+            const current =
+              (state.siteLanguages && state.siteLanguages[site]) ??
+              (saved.siteLanguages && saved.siteLanguages[site]) ??
+              saved.language ??
+              state.language;
+            return current === lang;
+          });
+
+          if ((saved.language ?? state.language) === lang && allAlreadyTarget) {
+            return;
+          }
+
+          const updated: Record<string, LangType> = {};
           unionSites.forEach((site) => (updated[site] = lang));
 
           state.siteLanguages = updated;
           persist({ language: lang, siteLanguages: updated });
         } catch (err) {
           console.error("setLangGlobal load failed, fallback to memory keys", err);
-          const fallback: Record<string, string> = { ...state.siteLanguages };
+          const fallback: Record<string, LangType> = { ...state.siteLanguages };
           Object.keys(fallback).forEach((site) => (fallback[site] = lang));
           state.siteLanguages = fallback;
           persist({ language: lang, siteLanguages: fallback });
@@ -148,25 +160,27 @@ const createSettingManager = () => {
     persist({ appConfig: state.appConfig });
   };
 
-  void ensureHydration();
+  ensureHydration();
 
   const hasSiteLanguage = (site: string) => site in state.siteLanguages;
 
-  const setSiteLanguage = (site: string, lang: string) => {
+  const setSiteLanguage = (site: string, lang: LangType) => {
     if (state.siteLanguages[site] === lang) return;
+
     state.siteLanguages = { ...state.siteLanguages, [site]: lang };
     persist({ siteLanguages: state.siteLanguages });
   };
 
   const removeSiteLanguage = (site: string) => {
     if (!(site in state.siteLanguages)) return;
+
     const updated = { ...state.siteLanguages };
     delete updated[site];
     state.siteLanguages = updated;
     persist({ siteLanguages: updated });
   };
 
-  const getSiteLanguage = (site: string) => state.siteLanguages[site] || state.language;
+  const getSiteLanguage = (site: string): LangType => state.siteLanguages[site] || state.language;
   const getDefaultLanguage = () => state.language;
 
   return {
@@ -193,11 +207,3 @@ const createSettingManager = () => {
     setPrimaryColorLight
   };
 };
-
-export const useSettingManager = () => {
-  if (!managerSingleton) {
-    managerSingleton = createSettingManager();
-  }
-
-  return managerSingleton;
-};

ui/composables/useSettingStorage.ts

@@ -1,14 +1,14 @@
 import type { UnlistenFn } from "@tauri-apps/api/event";
 import { Store } from "@tauri-apps/plugin-store";
 
-import type { AppConfigType, SortType } from "~/types";
+import type { AppConfigType, SortType, LangType } from "~/types";
 
 export type ThemeType = "light" | "dark" | "withSystem" | "";
 export type LayoutsType = "grid" | "table";
 
 export type UserSettingPersistedState = {
-  language: string;
-  siteLanguages: Record<string, string>;
+  language: LangType;
+  siteLanguages: Record<string, LangType>;
   collapse: boolean;
   sort: SortType;
   theme: ThemeType;