adtec-core-package 3.2.9 → 3.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adtec-core-package",
-  "version": "3.2.9",
+  "version": "3.3.0",
   "private": false,
   "type": "module",
   "exports": {
@@ -102,6 +102,7 @@
     "smooth-signature": "1.0.15",
     "socket.io-client": "^2.3.1",
     "tdesign-vue-next": "1.18.2",
+    "ts-md5": "^1.3.1",
     "uuid": "^11.0.3",
     "vue": "^3.5.13",
     "vue-demi": "^0.14.10",

package/src/hooks/useDictHooks.ts

@@ -22,6 +22,7 @@ export default function useDictHooks(dictTypes?: string[], orgId?: string) {
   const getDict = async (dictTypes?: string[], orgId?: string): Promise<void> => {
     try {
       if (!dictTypes || !dictTypes.length) return
+      await userInfo.ensureUserHydrated()
       const tenantOrgId = resolveOrgId(orgId)
       const dictKeySet = new Set(Object.keys(dictMap.value))
       let uncachedDictTypes: string[] = []
@@ -127,14 +128,19 @@ export default function useDictHooks(dictTypes?: string[], orgId?: string) {
   const clearDict = (dictType?: string[], orgId?: string, all?: Boolean) => {
     clearDictCache(dictType, resolveOrgId(), orgId, all)
   }
+  const userReady = ref(!dictTypes?.length)
   const dictReady = ref(!dictTypes?.length)
   if (dictTypes?.length) {
-    getDict(dictTypes, orgId).finally(() => {
+    void (async () => {
+      await userInfo.ensureUserHydrated()
+      userReady.value = true
+      await getDict(dictTypes, orgId)
       dictReady.value = true
-    })
+    })()
   }
   return {
     getDict,
+    userReady,
     dictReady,
     getDictName,
     getDictData,

package/src/stores/dictStore.ts

@@ -47,7 +47,7 @@ function getRootWindow(): Window {
 }
 
 function hydrateCacheFromSessionStorage(cache: SharedDictCache) {
-  const raw = sessionStorage.getItem(DICT_STORAGE_KEY)
+  const raw = getRootWindow().sessionStorage.getItem(DICT_STORAGE_KEY)
   if (!raw) return
   try {
     const parsed = JSON.parse(Base64.parse(raw).toString(Utf8)) as {
@@ -70,14 +70,15 @@ function hydrateCacheFromSessionStorage(cache: SharedDictCache) {
 }
 
 function persistCacheToSessionStorage(cache: SharedDictCache) {
-  if (typeof sessionStorage === 'undefined') return
+  if (typeof window === 'undefined') return
+  const storage = getRootWindow().sessionStorage
   try {
     const payload = JSON.stringify({
       dictMap: cache.dictMap,
       dictDataMap: cache.dictDataMap,
       dictDefaultValueMap: cache.dictDefaultValueMap,
     })
-    sessionStorage.setItem(DICT_STORAGE_KEY, Base64.stringify(Utf8.parse(payload)))
+    storage.setItem(DICT_STORAGE_KEY, Base64.stringify(Utf8.parse(payload)))
   } catch {
     // ignore quota / privacy errors
   }

package/src/stores/userInfoStore.ts

@@ -8,6 +8,12 @@ import { defineStore } from 'pinia'
 import type { IUserPermissionVo } from '../interface/IUserPermissionVo'
 import { readUserInfoFromSessionStorage } from '../utils/userSessionStorage'
 
+let hydratePromise: Promise<IUserPermissionVo | null> | null = null
+
+function resetHydratePromise() {
+  hydratePromise = null
+}
+
 export const userInfoStore = defineStore({
   id: 'userInfoStore',
   state: () => ({
@@ -16,34 +22,52 @@ export const userInfoStore = defineStore({
   }),
   getters: {
     getUserInfo(): IUserPermissionVo {
-      if (!this.user) {
-        const hydrated = readUserInfoFromSessionStorage()
-        if (hydrated) {
-          //@ts-ignore
-          this.user = hydrated
-        }
-      }
+      this.hydrateFromRootSession()
       return this.user as IUserPermissionVo
     },
   },
   actions: {
     /** 无界子应用从宿主 sessionStorage 恢复登录态（与 dictStore 同源策略） */
     hydrateFromRootSession(): IUserPermissionVo | null {
-      if (this.user) {
+      if (this.user?.orgId) {
         return this.user
       }
       const hydrated = readUserInfoFromSessionStorage()
-      if (hydrated) {
+      if (hydrated?.orgId) {
         //@ts-ignore
         this.user = hydrated
       }
       return this.user
     },
+    /** 等待宿主 sessionStorage 写入 userInfo（无界子应用首次进入菜单页） */
+    async ensureUserHydrated(maxWaitMs = 3000): Promise<IUserPermissionVo | null> {
+      if (this.user?.orgId) {
+        return this.user
+      }
+      if (!hydratePromise) {
+        hydratePromise = (async () => {
+          const deadline = Date.now() + maxWaitMs
+          while (Date.now() < deadline) {
+            const hydrated = this.hydrateFromRootSession()
+            if (hydrated?.orgId) {
+              return hydrated
+            }
+            await new Promise((resolve) => setTimeout(resolve, 50))
+          }
+          return this.user
+        })().finally(() => {
+          hydratePromise = null
+        })
+      }
+      return hydratePromise
+    },
     setUserInfo(userInfo: IUserPermissionVo) {
+      resetHydratePromise()
       //@ts-ignore
       this.user = userInfo
     },
     clear() {
+      resetHydratePromise()
       //@ts-ignore
       this.user = null
     },

package/src/utils/userSessionStorage.ts

@@ -14,8 +14,18 @@ export function getRootWindow(): Window {
 /** 从 pinia-plugin-store 持久化的 sessionStorage 恢复用户信息 */
 export function readUserInfoFromSessionStorage(storage?: Storage): IUserPermissionVo | null {
   if (typeof window === 'undefined') return null
-  const store = storage ?? getRootWindow().sessionStorage
-  const raw = store.getItem(USER_INFO_STORAGE_KEY)
+  let store: Storage
+  try {
+    store = storage ?? getRootWindow().sessionStorage
+  } catch {
+    return null
+  }
+  let raw: string | null
+  try {
+    raw = store.getItem(USER_INFO_STORAGE_KEY)
+  } catch {
+    return null
+  }
   if (!raw) return null
   try {
     const parsed = JSON.parse(Base64.parse(raw).toString(Utf8)) as {