adtec-core-package 3.2.8 → 3.2.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adtec-core-package",
-  "version": "3.2.8",
+  "version": "3.2.9",
   "private": false,
   "type": "module",
   "exports": {

package/src/hooks/useDictHooks.ts

@@ -12,25 +12,28 @@ 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
-      //判断是否存在缓存数据，如果存在则不请求接口
+      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 +75,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,38 +90,43 @@ 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 dictReady = ref(!dictTypes?.length)
   if (dictTypes?.length) {
     getDict(dictTypes, orgId).finally(() => {

package/src/stores/userInfoStore.ts

@@ -6,19 +6,39 @@
  */
 import { defineStore } from 'pinia'
 import type { IUserPermissionVo } from '../interface/IUserPermissionVo'
+import { readUserInfoFromSessionStorage } from '../utils/userSessionStorage'
 
 export const userInfoStore = defineStore({
   id: 'userInfoStore',
   state: () => ({
     //@ts-ignore
-    user: null as IUserPermissionVo
+    user: null as IUserPermissionVo | null,
   }),
   getters: {
     getUserInfo(): IUserPermissionVo {
+      if (!this.user) {
+        const hydrated = readUserInfoFromSessionStorage()
+        if (hydrated) {
+          //@ts-ignore
+          this.user = hydrated
+        }
+      }
       return this.user as IUserPermissionVo
-    }
+    },
   },
   actions: {
+    /** 无界子应用从宿主 sessionStorage 恢复登录态（与 dictStore 同源策略） */
+    hydrateFromRootSession(): IUserPermissionVo | null {
+      if (this.user) {
+        return this.user
+      }
+      const hydrated = readUserInfoFromSessionStorage()
+      if (hydrated) {
+        //@ts-ignore
+        this.user = hydrated
+      }
+      return this.user
+    },
     setUserInfo(userInfo: IUserPermissionVo) {
       //@ts-ignore
       this.user = userInfo
@@ -26,6 +46,6 @@ export const userInfoStore = defineStore({
     clear() {
       //@ts-ignore
       this.user = null
-    }
-  }
+    },
+  },
 })

package/src/utils/userSessionStorage.ts

@@ -0,0 +1,28 @@
+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
+  const store = storage ?? getRootWindow().sessionStorage
+  const raw = store.getItem(USER_INFO_STORAGE_KEY)
+  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
+  }
+}