From 226568b3af61daf288e63754946f8eb7a20c1fdb Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Fri, 6 Sep 2024 15:55:35 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E5=AE=8C=E5=96=84=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/business/dict.ts                    | 58 ++++++++++++-------
 src/views/system/menu/index.vue               |  3 +-
 .../menu/modules/menu-operate-drawer.vue      |  8 ++-
 3 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/src/hooks/business/dict.ts b/src/hooks/business/dict.ts
index 4f6cf0d2..5ebc17a0 100644
--- a/src/hooks/business/dict.ts
+++ b/src/hooks/business/dict.ts
@@ -2,41 +2,55 @@ import { ref } from 'vue';
 import { fetchGetDictDataByType } from '@/service/api';
 import { useDictStore } from '@/store/modules/dict';
 
-export function useDict() {
+export function useDict(dictType: string, immediate: boolean = true) {
   const dictStore = useDictStore();
 
-  async function getDictData(dictType: string) {
+  const data = ref<Api.System.DictData[]>([]);
+  const record = ref<Record<string, string>>({});
+  const options = ref<CommonType.Option[]>([]);
+
+  async function getData() {
     const dicts = dictStore.getDict(dictType);
     if (dicts) {
-      return dicts;
+      data.value = dicts;
+      return;
     }
-    const { data, error } = await fetchGetDictDataByType(dictType);
-    if (error) return [];
-    dictStore.setDict(dictType, data);
-    return data;
+    const { data: dictData, error } = await fetchGetDictDataByType(dictType);
+    if (error) return;
+    dictStore.setDict(dictType, dictData);
+    data.value = dictData;
   }
 
-  function getDictRecord(dictType: string) {
-    const dictRecord = ref<{ [key: string]: string }>({});
-    getDictData(dictType).then(dictData => {
-      dictData.forEach(dict => {
-        dictRecord.value[dict.dictValue!] = dict.dictLabel!;
-      });
+  async function getRecord() {
+    if (!data.value.length) {
+      await getData();
+    }
+    data.value.forEach(dict => {
+      record.value[dict.dictValue!] = dict.dictLabel!;
     });
-    return dictRecord;
   }
 
-  function getDictOptions(dictType: string) {
-    const dictOptions = ref<CommonType.Option[]>([]);
-    getDictData(dictType).then(dictData => {
-      dictOptions.value = dictData.map(dict => ({ label: dict.dictLabel!, value: dict.dictValue! }));
+  async function getOptions() {
+    if (!data.value.length) {
+      await getData();
+    }
+
+    options.value = data.value.map(dict => ({ label: dict.dictLabel!, value: dict.dictValue! }));
+  }
+
+  if (immediate) {
+    getData().then(() => {
+      getRecord();
+      getOptions();
     });
-    return dictOptions;
   }
 
   return {
-    getDictData,
-    getDictRecord,
-    getDictOptions
+    data,
+    record,
+    options,
+    getData,
+    getRecord,
+    getOptions
   };
 }
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 84b0df5e..dc0ef3ff 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -259,8 +259,7 @@ const btnColumns: DataTableColumns<Api.System.Menu> = [
   }
 ];
 
-const { getDictRecord } = useDict();
-const showHideRecord = getDictRecord('sys_show_hide');
+const { record: showHideRecord } = useDict('sys_show_hide');
 </script>
 
 <template>
diff --git a/src/views/system/menu/modules/menu-operate-drawer.vue b/src/views/system/menu/modules/menu-operate-drawer.vue
index ce68237e..82f5f6b1 100644
--- a/src/views/system/menu/modules/menu-operate-drawer.vue
+++ b/src/views/system/menu/modules/menu-operate-drawer.vue
@@ -40,9 +40,8 @@ const visible = defineModel<boolean>('visible', {
   default: false
 });
 
-const { getDictOptions } = useDict();
-const showHideOptions = getDictOptions('sys_show_hide');
-const enableStatusOptions = getDictOptions('sys_normal_disable');
+const { options: showHideOptions, getOptions: getShowHideOptions } = useDict('sys_show_hide', false);
+const { options: enableStatusOptions, getOptions: getNormalDisableOptions } = useDict('sys_normal_disable', false);
 
 const iconType = ref<Api.System.IconType>('1');
 const { formRef, validate, restoreValidation } = useNaiveForm();
@@ -221,6 +220,9 @@ watch(visible, () => {
   if (visible.value) {
     handleInitModel();
     restoreValidation();
+    getShowHideOptions();
+    getShowHideOptions();
+    getNormalDisableOptions();
   }
 });