adtec-core-package 3.2.8 → 3.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adtec-core-package",
-  "version": "3.2.8",
+  "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

@@ -12,25 +12,29 @@ export default function useDictHooks(dictTypes?: string[], orgId?: string) {
   const dictStores = dictStore()
   const { clearDictCache } = dictStores
   const { dictMap, dictDefaultValueMap, dictDataMap } = storeToRefs(dictStores)
+
+  const resolveOrgId = (explicitOrgId?: string): string | undefined => {
+    if (explicitOrgId) return explicitOrgId
+    userInfo.hydrateFromRootSession()
+    return userInfo.user?.orgId
+  }
+
   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 = []
-      if (orgId) {
-        uncachedDictTypes = dictTypes.filter((dictType) => !dictKeySet.has(`${orgId}:${dictType}`))
+      let uncachedDictTypes: string[] = []
+      if (orgId || tenantOrgId) {
+        const oid = orgId ?? tenantOrgId!
+        uncachedDictTypes = dictTypes.filter((dictType) => !dictKeySet.has(`${oid}:${dictType}`))
       } else {
-        uncachedDictTypes = dictTypes.filter(
-          (dictType) =>
-            !dictKeySet.has(`${userInfo.getUserInfo.orgId}:${dictType}`) &&
-            !dictKeySet.has(dictType)
-        )
+        uncachedDictTypes = dictTypes.filter((dictType) => !dictKeySet.has(dictType))
       }
       if (!uncachedDictTypes.length) return
-      const data = await SysDictCacheApi.batchGetSysDictDataCacheVo(uncachedDictTypes, orgId)
+      const data = await SysDictCacheApi.batchGetSysDictDataCacheVo(uncachedDictTypes, orgId ?? tenantOrgId)
       dictMap.value = { ...dictMap.value, ...data }
-      // 获取默认值
       const promises = Object.keys(data).map(async (item: string) => {
         const dataMap: dictDataMapVoType = {}
         const defaultList: ISysDictDataCacheVo[] = []
@@ -72,11 +76,13 @@ export default function useDictHooks(dictTypes?: string[], orgId?: string) {
   }
 
   const getDictName = (value?: string, dictType?: string, orgId?: string): string | undefined => {
-    //此处需要支持多租户
     let key = orgId ? `${orgId}:${dictType}` : dictType
     if (dictDataMap.value[key!]) return dictDataMap.value[key!][value!]?.label || value
-    key = `${userInfo.getUserInfo.orgId}:${dictType}`
-    if (dictDataMap.value[key!]) return dictDataMap.value[key!][value!]?.label || value
+    const tenantOrgId = resolveOrgId()
+    if (tenantOrgId) {
+      key = `${tenantOrgId}:${dictType}`
+      if (dictDataMap.value[key!]) return dictDataMap.value[key!][value!]?.label || value
+    }
     return value
   }
 
@@ -85,46 +91,56 @@ export default function useDictHooks(dictTypes?: string[], orgId?: string) {
     dictType: string,
     orgId?: string,
   ): ISysDictDataCacheVo | {} => {
-    //此处需要支持多租户
     let key = orgId ? `${orgId}:${dictType}` : dictType
     if (dictDataMap.value[key!] && dictDataMap.value[key!][value!])
       return dictDataMap.value[key!][value!]
-    key = `${userInfo.getUserInfo.orgId}:${dictType}`
-    if (dictDataMap.value[key!] && dictDataMap.value[key!][value!])
-      return dictDataMap.value[key!][value!]
+    const tenantOrgId = resolveOrgId()
+    if (tenantOrgId) {
+      key = `${tenantOrgId}:${dictType}`
+      if (dictDataMap.value[key!] && dictDataMap.value[key!][value!])
+        return dictDataMap.value[key!][value!]
+    }
     return {}
   }
   const getDictDefaultValue = (
     dictType: string,
     orgId?: string
   ): ISysDictDataCacheVo[] => {
-    //此处需要支持多租户
     let key = orgId ? `${orgId}:${dictType}` : dictType
     if (dictDefaultValueMap.value[key!]) return dictDefaultValueMap.value[key!]
-    key = `${userInfo.getUserInfo.orgId}:${dictType}`
-    if (dictDefaultValueMap.value[key!]) return dictDefaultValueMap.value[key!]
+    const tenantOrgId = resolveOrgId()
+    if (tenantOrgId) {
+      key = `${tenantOrgId}:${dictType}`
+      if (dictDefaultValueMap.value[key!]) return dictDefaultValueMap.value[key!]
+    }
     return []
   }
   const getDictTypeData = (dictType: string, orgId?: string): ISysDictDataCacheVo[] => {
-    //此处需要支持多租户
     let key = orgId ? `${orgId}:${dictType}` : dictType
     if (dictMap.value[key!]) return dictMap.value[key!]
-    key = `${userInfo.getUserInfo.orgId}:${dictType}`
-    if (dictMap.value[key!]) return dictMap.value[key!]
+    const tenantOrgId = resolveOrgId()
+    if (tenantOrgId) {
+      key = `${tenantOrgId}:${dictType}`
+      if (dictMap.value[key!]) return dictMap.value[key!]
+    }
     return []
   }
   const clearDict = (dictType?: string[], orgId?: string, all?: Boolean) => {
-    clearDictCache(dictType, userInfo.getUserInfo.orgId, orgId, all)
+    clearDictCache(dictType, resolveOrgId(), orgId, all)
   }
-  /** 构造函数传入的 dictTypes 是否已全部加载（缓存命中也会立即置 true） */
+  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

@@ -6,26 +6,70 @@
  */
 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: () => ({
     //@ts-ignore
-    user: null as IUserPermissionVo
+    user: null as IUserPermissionVo | null,
   }),
   getters: {
     getUserInfo(): IUserPermissionVo {
+      this.hydrateFromRootSession()
       return this.user as IUserPermissionVo
-    }
+    },
   },
   actions: {
+    /** 无界子应用从宿主 sessionStorage 恢复登录态（与 dictStore 同源策略） */
+    hydrateFromRootSession(): IUserPermissionVo | null {
+      if (this.user?.orgId) {
+        return this.user
+      }
+      const hydrated = readUserInfoFromSessionStorage()
+      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

@@ -0,0 +1,38 @@
+import Base64 from 'crypto-js/enc-base64'
+import Utf8 from 'crypto-js/enc-utf8'
+import type { IUserPermissionVo } from '../interface/IUserPermissionVo'
+
+const USER_INFO_STORAGE_KEY = 'userInfoStore'
+
+/** wujie 子应用读宿主 sessionStorage，独立运行读自身 */
+export function getRootWindow(): Window {
+  if (typeof window === 'undefined') return window
+  const w = window as Window & { __POWERED_BY_WUJIE__?: boolean }
+  return w.__POWERED_BY_WUJIE__ ? window.parent : window
+}
+
+/** 从 pinia-plugin-store 持久化的 sessionStorage 恢复用户信息 */
+export function readUserInfoFromSessionStorage(storage?: Storage): IUserPermissionVo | null {
+  if (typeof window === 'undefined') return null
+  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 {
+      user?: IUserPermissionVo | null
+    }
+    return parsed?.user ?? null
+  } catch {
+    return null
+  }
+}