adtec-core-package 0.2.7 → 0.2.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adtec-core-package",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "private": false,
   "type": "module",
   "scripts": {

package/src/hooks/useDictHooks.ts

@@ -1,7 +1,7 @@
 import { ElMessage } from 'element-plus'
 import SysDictCacheApi from '../api/SysDictCacheApi'
 import type { ISysDictDataCacheVo } from '../interface/ISysDictDataCacheVo'
-import { dictStore } from '../stores/dictStore'
+import { type dictDataMapVoType, dictStore } from '../stores/dictStore'
 
 export default function useDictHooks(dictTypes: string[]) {
   const dictStores = dictStore()
@@ -11,28 +11,26 @@ export default function useDictHooks(dictTypes: string[]) {
       //判断是否存在缓存数据，如果存在则不请求接口
       const dictKeySet = new Set(Object.keys(dictStores.dictMap))
       const uncachedDictTypes = dictTypes.filter((dictType) => !dictKeySet.has(dictType))
-      if (!uncachedDictTypes.length) return
-      const data = await SysDictCacheApi.batchGetSysDictDataCacheVo(uncachedDictTypes)
-      dictStores.dictMap = { ...dictStores.dictMap, ...data }
-      // 获取默认值
-      Object.keys(data).forEach((item: string) => {
-        findDefaultValue(data[item], item)
-        const dataMap = new Map<string, ISysDictDataCacheVo>()
-        packageDictDataMap(dataMap, data[item])
-        dictStores.dictDataMap.set(item, dataMap)
-      })
+      if (uncachedDictTypes.length) {
+        const data = await SysDictCacheApi.batchGetSysDictDataCacheVo(dictTypes)
+        dictStores.dictMap = { ...dictStores.dictMap, ...data }
+        // 获取默认值
+        Object.keys(data).forEach((item: string) => {
+          findDefaultValue(data[item], item)
+          const dataMap: dictDataMapVoType = {}
+          packageDictDataMap(dataMap, data[item])
+          dictStores.dictDataMap[item] = dataMap
+        })
+      }
     } catch (error: any) {
       ElMessage.error(error.msg || error.message)
     }
   }
 
-  const packageDictDataMap = async (
-    map: Map<string, ISysDictDataCacheVo>,
-    list?: ISysDictDataCacheVo[],
-  ) => {
+  const packageDictDataMap = async (map: dictDataMapVoType, list?: ISysDictDataCacheVo[]) => {
     if (list && list.length) {
       list.forEach((item: ISysDictDataCacheVo) => {
-        map.set(item.value, { ...item, ...{ children: undefined } })
+        map[item.value] = { ...item, ...{ children: undefined } }
         packageDictDataMap(map, item.children)
       })
     }
@@ -40,7 +38,9 @@ export default function useDictHooks(dictTypes: string[]) {
 
   const findDefaultValue = async (list: ISysDictDataCacheVo[], type: string) => {
     const find = getDefaultValue(list)
-    find && dictStores.dictDefaultValueMap.set(type, find)
+    if (find) {
+      dictStores.dictDefaultValueMap[type] = find
+    }
   }
 
   const getDefaultValue = (list?: ISysDictDataCacheVo[]): ISysDictDataCacheVo | undefined => {
@@ -55,20 +55,24 @@ export default function useDictHooks(dictTypes: string[]) {
   }
 
   const getDictName = (value?: string, dictType?: string) => {
-    return dictStores.dictDataMap.get(dictType!)?.get(value!)?.label || value
+    if (dictStores.dictDataMap[dictType!]) {
+      return dictStores.dictDataMap[dictType!][value!]?.label || value
+    }
+    return value
   }
 
   const getDictData = (value: string, dictType: string) => {
-    return dictStores.dictDataMap.get(dictType)?.get(value)
+    return dictStores.dictDataMap[dictType!][value!]
   }
 
-  getDict(dictTypes).then(() => {})
+  getDict(dictTypes).then(() => {
+  })
 
   return {
     dictMap: dictStores.dictMap,
     dictDefaultValueMap: dictStores.dictDefaultValueMap,
     getDict,
     getDictName,
-    getDictData,
+    getDictData
   }
 }

package/src/stores/dictStore.ts

@@ -7,11 +7,18 @@ export interface dictMapType {
   [key: string]: ISysDictDataCacheVo[]
 }
 
+export interface dictDataMapVoType {
+  [key: string]: ISysDictDataCacheVo
+}
+
+export interface dictDataMapType {
+  [key: string]: { [key: string]: ISysDictDataCacheVo }
+}
+
 export const dictStore = defineStore('dictStore', () => {
   const dictMap = ref<dictMapType>({})
-  const dictDataMap = ref<Map<string, Map<string, ISysDictDataCacheVo>>>(new Map())
-  const dictDefaultValueMap = ref<Map<string, ISysDictDataCacheVo>>(new Map())
-
+  const dictDataMap = ref<dictDataMapType>({})
+  const dictDefaultValueMap = ref<dictDataMapVoType>({})
   return {
     dictMap,
     dictDataMap,