best-unit 0.0.45 → 0.0.46

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "best-unit",
   "private": false,
-  "version": "0.0.45",
+  "version": "0.0.46",
   "type": "module",
   "main": "dist/best-unit.cjs",
   "module": "dist/best-unit.js",

package/src/api/axiosInstance.ts

@@ -6,6 +6,7 @@ import type {
 } from "axios";
 import { message } from "../components/common/Message";
 import { Locale } from "../types";
+import { waitForInitialization } from "../utils/business";
 
 export interface CreateAxiosOptions {
   baseURL?: string;
@@ -19,20 +20,25 @@ export function createAxiosInstance(options: CreateAxiosOptions = {}) {
   const instance: AxiosInstance = axios.create({ baseURL, timeout });
 
   // 请求拦截：加 token、国际化
-  instance.interceptors.request.use((config: InternalAxiosRequestConfig) => {
-    const fundUnitParams = JSON.parse(
-      sessionStorage.getItem("fund_unit_params") || "{}"
-    );
-    const { token, locale } = fundUnitParams;
-    console.log(fundUnitParams, "fundUnitParams");
-    config.headers = {
-      ...config.headers,
-      Authorization: token,
-      "x-locale": locale === Locale.ZH ? "zh-CN" : "en-US",
-    } as any;
+  instance.interceptors.request.use(
+    async (config: InternalAxiosRequestConfig) => {
+      // 等待初始化完成
+      await waitForInitialization();
 
-    return config;
-  });
+      const fundUnitParams = JSON.parse(
+        sessionStorage.getItem("fund_unit_params") || "{}"
+      );
+      const { token, locale } = fundUnitParams;
+      console.log(fundUnitParams, "fundUnitParams");
+      config.headers = {
+        ...config.headers,
+        Authorization: token,
+        "x-locale": locale === Locale.ZH ? "zh-CN" : "en-US",
+      } as any;
+
+      return config;
+    }
+  );
 
   // 响应拦截：code=0判定成功，其他走 onError
   instance.interceptors.response.use(

package/src/utils/business/index.ts

@@ -1,7 +1,9 @@
-import { getAllDicts } from "../../api";
 import { Locale, Theme } from "../../types";
 
-export function initFundUnit(params: {
+let isInitialized = false;
+let initPromise: Promise<any> | null = null;
+
+export async function initFundUnit(params: {
   token: string;
   merchant_id?: string;
   biz_type?: string;
@@ -9,32 +11,49 @@ export function initFundUnit(params: {
   theme?: Theme;
   locale?: Locale;
 }) {
-  getAllDicts();
-  const {
-    merchant_id,
-    biz_type,
-    fund_balance_id,
-    theme = Theme.WHITE,
-    locale = Locale.ZH,
-  } = params;
-  const token = "Bearer " + params.token;
-  sessionStorage.setItem(
-    "fund_unit_params",
-    JSON.stringify({
+  // 如果已经在初始化中，等待完成
+  if (initPromise) {
+    return initPromise;
+  }
+
+  initPromise = new Promise(async (resolve) => {
+    const {
+      merchant_id,
+      biz_type,
+      fund_balance_id,
+      theme = Theme.WHITE,
+      locale = Locale.ZH,
+    } = params;
+    const token = "Bearer " + params.token;
+
+    const fundUnitParams = {
       merchantId: merchant_id,
       bizType: biz_type,
       fundBalanceId: fund_balance_id,
       token,
       theme,
       locale,
-    })
-  );
-  return {
-    token,
-    merchantId: merchant_id,
-    bizType: biz_type,
-    fundBalanceId: fund_balance_id,
-    theme,
-    locale,
-  };
+    };
+
+    sessionStorage.setItem("fund_unit_params", JSON.stringify(fundUnitParams));
+    isInitialized = true;
+
+    console.log("initFundUnit 更新完成:", fundUnitParams);
+    resolve(fundUnitParams);
+  });
+
+  return initPromise;
+}
+
+// 检查是否已初始化
+export function isFundUnitInitialized(): boolean {
+  return isInitialized;
+}
+
+// 等待初始化完成
+export function waitForInitialization(): Promise<any> {
+  if (isInitialized) {
+    return Promise.resolve();
+  }
+  return initPromise || Promise.resolve();
 }