From dc3563969b886c80e816c9e39c91e9efc065a53a Mon Sep 17 00:00:00 2001
From: chansee97 <chen.dev@foxmail.com>
Date: Mon, 16 Sep 2024 00:00:37 +0800
Subject: [PATCH] fix: import error

---
 src/store/dict.ts                 | 58 ++++++++++++++++++++++++++
 src/store/index.ts                |  1 +
 src/utils/dict.ts                 | 67 -------------------------------
 src/utils/index.ts                |  3 +-
 src/views/demo/cascader/index.vue |  6 +--
 src/views/demo/dict/index.vue     |  6 ++-
 src/views/demo/fetch/index.vue    |  2 +-
 7 files changed, 68 insertions(+), 75 deletions(-)
 create mode 100644 src/store/dict.ts
 delete mode 100644 src/utils/dict.ts

diff --git a/src/store/dict.ts b/src/store/dict.ts
new file mode 100644
index 0000000..89ae185
--- /dev/null
+++ b/src/store/dict.ts
@@ -0,0 +1,58 @@
+import { fetchDictList } from '@/service'
+import { session } from '@/utils'
+
+export const useDictStore = defineStore('dict-store', {
+  state: () => {
+    return {
+      dictMap: {} as DictMap,
+      isInitDict: false,
+    }
+  },
+  actions: {
+    async dict(code: string) {
+      // 调用前初始化
+      if (!this.dictMap) {
+        this.initDict()
+      }
+
+      const targetDict = await this.getDict(code)
+
+      return {
+        data: () => targetDict,
+        enum: () => Object.fromEntries(targetDict.map(({ value, label }) => [value, label])),
+        valueMap: () => Object.fromEntries(targetDict.map(({ value, ...data }) => [value, data])),
+        labelMap: () => Object.fromEntries(targetDict.map(({ label, ...data }) => [label, data])),
+      }
+    },
+    async getDict(code: string) {
+      const isExist = Reflect.has(this.dictMap, code)
+
+      if (isExist) {
+        return this.dictMap[code]
+      }
+      else {
+        return await this.getDictByNet(code)
+      }
+    },
+
+    async getDictByNet(code: string) {
+      const { data, isSuccess } = await fetchDictList(code)
+      if (isSuccess) {
+        Reflect.set(this.dictMap, code, data)
+        // 同步至session
+        session.set('dict', this.dictMap)
+        return data
+      }
+      else {
+        throw new Error(`Failed to get ${code} dictionary from network, check ${code} field or network`)
+      }
+    },
+    initDict() {
+      const dict = session.get('dict')
+      if (dict) {
+        Object.assign(this.dictMap, dict)
+      }
+      this.isInitDict = true
+    },
+  },
+})
diff --git a/src/store/index.ts b/src/store/index.ts
index acb3543..5404bca 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -3,6 +3,7 @@ import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'
 
 export * from './app/index'
 export * from './auth'
+export * from './dict'
 export * from './router'
 export * from './tab'
 
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
deleted file mode 100644
index bc64adf..0000000
--- a/src/utils/dict.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { fetchDictList } from '@/service'
-import { session } from '@/utils'
-
-export const dictMap: DictMap = {}
-
-/**
- * 获取与给定代码对应的字典对象
- *
- * @param code - 字典编码
- * @return 包含字典列表、值映射字典和标签映射字典的对象
- */
-export async function dict(code: string) {
-  const targetDict = await getDict(code)
-
-  return {
-    data: () => targetDict,
-    enum: () => Object.fromEntries(targetDict.map(({ value, label }) => [value, label])),
-    valueMap: () => Object.fromEntries(targetDict.map(({ value, ...data }) => [value, data])),
-    labelMap: () => Object.fromEntries(targetDict.map(({ label, ...data }) => [label, data])),
-  }
-}
-
-/**
- * 根据字典编码获取字典数据
- * 如果本地有缓存，则返回缓存数据，否则通过网络请求获取数据
- *
- * @param code - 字典编码
- * @return 字典数据
- */
-export async function getDict(code: string) {
-  const isExist = Reflect.has(dictMap, code)
-
-  if (isExist) {
-    return dictMap[code]
-  }
-  else {
-    return await getDictByNet(code)
-  }
-}
-
-/**
- * 通过网络请求获取字典数据
- *
- * @param code - 字典编码
- * @return 字典数据
- */
-export async function getDictByNet(code: string) {
-  const { data, isSuccess } = await fetchDictList(code)
-  if (isSuccess) {
-    Reflect.set(dictMap, code, data)
-    // 同步至session
-    session.set('dict', dictMap)
-    return data
-  }
-  else {
-    throw new Error(`Failed to get ${code} dictionary from network, check ${code} field or network`)
-  }
-}
-
-function initDict() {
-  const dict = session.get('dict')
-  if (dict) {
-    Object.assign(dictMap, dict)
-  }
-}
-
-initDict()
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 4c11eda..fe11a47 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,5 +1,4 @@
+export * from './storage'
 export * from './array'
-export * from './dict'
 export * from './i18n'
 export * from './icon'
-export * from './storage'
diff --git a/src/views/demo/cascader/index.vue b/src/views/demo/cascader/index.vue
index abb9919..5abd2fe 100644
--- a/src/views/demo/cascader/index.vue
+++ b/src/views/demo/cascader/index.vue
@@ -33,19 +33,19 @@ function handleValidateClick() {
 
     <div>
       <n-h2>回调value</n-h2>
-      <pre class="bg-#eee">
+      <pre class="bg-#eee:30">
       {{ cbValue }}
     </pre>
     </div>
     <div>
       <n-h2>回调option</n-h2>
-      <pre class="bg-#eee">
+      <pre class="bg-#eee:30">
       {{ cbOption }}
     </pre>
     </div>
     <div>
       <n-h2>回调pathValues</n-h2>
-      <pre class="bg-#eee">
+      <pre class="bg-#eee:30">
       {{ cbPathValues }}
     </pre>
     </div>
diff --git a/src/views/demo/dict/index.vue b/src/views/demo/dict/index.vue
index 68f46c5..5db5c2a 100644
--- a/src/views/demo/dict/index.vue
+++ b/src/views/demo/dict/index.vue
@@ -1,6 +1,8 @@
 <script setup lang="ts">
 import { fetchDictList } from '@/service'
-import { dict } from '@/utils/dict'
+import { useDictStore } from '@/store'
+
+const { dict } = useDictStore()
 
 const dictKey = ref('')
 const options = ref()
@@ -88,7 +90,7 @@ const enumLabel = computed(() => {
         </n-button>
       </n-flex>
 
-      <pre class="bg-#eee">
+      <pre class="bg-#eee:30">
           {{ data }}
         </pre>
 
diff --git a/src/views/demo/fetch/index.vue b/src/views/demo/fetch/index.vue
index 61de95c..543fa42 100644
--- a/src/views/demo/fetch/index.vue
+++ b/src/views/demo/fetch/index.vue
@@ -46,7 +46,7 @@ function handleUpdate(data: any) {
         </div>
       </template>
       <template #2>
-        <pre class="bg-#eee">
+        <pre class="bg-#eee:30">
       {{ msg }}
       </pre>
       </template>