Merge branch 'fix/filter' into 'main'

修复组卡页筛选器不展示文本的问题

See merge request mycard/Neos!329

src/ui/BuildDeck/index.tsx

@@ -70,6 +70,13 @@ export const loader: LoaderFunction = async () => {
     });
   }
 
+  // 最后，等待I18N文案的加载
+  if (!initStore.i18n) {
+    await new Promise<void>((rs) => {
+      subscribeKey(initStore, "i18n", (done) => done && rs());
+    });
+  }
+
   return null;
 };
 

src/ui/Layout/index.tsx

@@ -24,6 +24,7 @@ import {
   handleSSOLogin,
   initDeck,
   initForbidden,
+  initI18N,
   initSqlite,
   initWASM,
 } from "./utils";
@@ -36,6 +37,7 @@ export const loader: LoaderFunction = async () => {
   initSqlite();
   initWASM();
   initForbidden();
+  initI18N();
   return null;
 };
 

src/ui/Layout/utils.ts

 import rustInit from "rust-src";
 
-import { CookieKeys, forbidden, getCookie, setCookie } from "@/api";
+import {
+  CookieKeys,
+  forbidden,
+  getCookie,
+  initStrings,
+  setCookie,
+} from "@/api";
 import { useConfig } from "@/config";
 import { useEnv } from "@/hook";
 import sqliteMiddleWare, { sqliteCmd } from "@/middleware/sqlite";
@@ -49,6 +55,14 @@ export const initForbidden = async () => {
   }
 };
 
+/** 加载I18N文案 */
+export const initI18N = async () => {
+  if (!initStore.i18n) {
+    await initStrings();
+    initStore.i18n = true;
+  }
+};
+
 /** sso登录跳转回来 */
 export const handleSSOLogin = async (search: string) => {
   /** 从SSO跳转回的URL之中，解析用户信息 */