From 650a84730f4418ebbcdc58bbadd4d56f5dd3c8fd Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 07 八月 2025 14:01:40 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdmin
---
src/hooks/dic.ts | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/src/hooks/dic.ts b/src/hooks/dic.ts
index 8935320..5d9baff 100644
--- a/src/hooks/dic.ts
+++ b/src/hooks/dic.ts
@@ -11,16 +11,21 @@
fieldNamesMap: x.data.fieldNames ? JSON.parse(x.data.fieldNames) : {},
}));
},
- placeholderData: () =>
- [] as API.SelectQueryResultOptionGuidGetDictionaryCategorySelectQueryOption[],
+ placeholderData: () => [] as API.SelectOptionGuidGetDictionaryCategorySelectQueryOption[],
});
const queryClient = useQueryClient();
function ensureQueryData() {
return queryClient.ensureQueryData<
- API.SelectQueryResultOptionGuidGetDictionaryCategorySelectQueryOption[]
+ API.SelectOptionGuidGetDictionaryCategorySelectQueryOption[]
>({
+ queryKey: ['dictionaryServices/getDictionaryCategorySelect'],
+ });
+ }
+
+ function updateDictionaryCategorySelect() {
+ queryClient.invalidateQueries({
queryKey: ['dictionaryServices/getDictionaryCategorySelect'],
});
}
@@ -43,12 +48,13 @@
getDictionaryCategoryById,
getDictionaryCategoryNameByCode,
getDictionaryCategoryByCode,
+ updateDictionaryCategorySelect,
};
}
type UseDictionaryDataSelectOptions = {
categoryId?: MaybeRef<string>;
- categoryCode?: MaybeRef<string>;
+ categoryCode?: MaybeRef<CategoryCode>;
};
export function useDictionaryDataSelect({
@@ -56,7 +62,7 @@
categoryCode,
}: UseDictionaryDataSelectOptions) {
const { data: dictionaryDataList, refetch } = useQuery({
- queryKey: ['dictionaryServices/getDictionaryDataSelect'],
+ queryKey: ['dictionaryServices/getDictionaryDataSelect', categoryId, categoryCode],
queryFn: async () => {
let res = await dictionaryServices.getDictionaryDataSelect(
{
@@ -70,10 +76,7 @@
code: x.data?.code ?? '',
}));
},
- placeholderData: () =>
- [] as API.SelectQueryResultOptionGuidGetDictionaryDataSelectQueryResultOption[],
-
- enabled: !!unref(categoryId) || !!unref(categoryCode),
+ placeholderData: () => [] as API.SelectOptionGuidGetDictionaryDataSelectQueryResultOption[],
});
function getDictionaryDataNameById(id: string) {
@@ -92,9 +95,15 @@
function ensureQueryData() {
return queryClient.ensureQueryData<
- API.SelectQueryResultOptionGuidGetDictionaryDataSelectQueryResultOption[]
+ API.SelectOptionGuidGetDictionaryDataSelectQueryResultOption[]
>({
queryKey: ['dictionaryServices/getDictionaryDataSelect'],
+ });
+ }
+
+ function updateDictionaryDataSelect(categoryId?: string) {
+ queryClient.invalidateQueries({
+ queryKey: ['dictionaryServices/getDictionaryDataSelect', categoryId],
});
}
@@ -105,5 +114,6 @@
getDictionaryDataNameById,
getDictionaryDataNameByCode,
getDictionaryDataByCode,
+ updateDictionaryDataSelect,
};
}
--
Gitblit v1.9.1