From ce7ff0effee22807c8d29a31d6f5f2713d3bf95c Mon Sep 17 00:00:00 2001 From: wupengfei <834520024@qq.com> Date: 星期四, 11 九月 2025 17:39:51 +0800 Subject: [PATCH] Merge branch 'master' into dev-v1.1 --- src/hooks/electronSign.ts | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/hooks/electronSign.ts b/src/hooks/electronSign.ts index 8c737b3..832b3d9 100644 --- a/src/hooks/electronSign.ts +++ b/src/hooks/electronSign.ts @@ -3,28 +3,33 @@ type UseEnabledElectronSignSettingsOptions = { enterpriseId?: MaybeRef<string>; + all?: MaybeRef<boolean>; }; export function useEnabledElectronSignSettings( options: UseEnabledElectronSignSettingsOptions = {} ) { - const { enterpriseId } = options; + const { enterpriseId, all } = options; const queryClient = useQueryClient(); const { data } = useQuery({ - queryKey: ['electronSignServices/getEnabledElectronSignSettings', enterpriseId], + queryKey: ['electronSignServices/getEnabledElectronSignSettings', enterpriseId, all], queryFn: async () => { let res = await electronSignServices.getEnabledElectronSignSettings( - { enterpriseId: unref(enterpriseId) }, + { enterpriseId: unref(enterpriseId), all: unref(all) }, { showLoading: false } ); return res; }, select(data) { + const showDisabledName = !!unref(enterpriseId) && unref(all); return data.map((x) => ({ ...x, - accessName: EnumElectronSignAccessText[x.access], + accessName: + showDisabledName && x.isDisabled + ? '璇ラ�氶亾鏃犳硶浣跨敤' + : EnumElectronSignAccessText[x.access], })); }, placeholderData: () => [] as API.GetEnabledElectronSignSettingsQueryResultItem[], @@ -32,7 +37,7 @@ function invalidateQueries() { return queryClient.invalidateQueries({ - queryKey: ['electronSignServices/getEnabledElectronSignSettings', enterpriseId], + queryKey: ['electronSignServices/getEnabledElectronSignSettings'], }); } -- Gitblit v1.9.1