From 5f1cb0d240a880bef68d537dee67f19284fd2f97 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Wed, 5 Apr 2023 13:29:08 +0800 Subject: [PATCH] fix: datepicker presets error #6387 --- components/vc-picker/hooks/usePresets.ts | 18 +++++++++--------- tsconfig.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/components/vc-picker/hooks/usePresets.ts b/components/vc-picker/hooks/usePresets.ts index 9f2c4861c..c655fb932 100644 --- a/components/vc-picker/hooks/usePresets.ts +++ b/components/vc-picker/hooks/usePresets.ts @@ -8,13 +8,13 @@ export default function usePresets( presets?: ComputedRef[]>, legacyRanges?: ComputedRef T)>>, ): ComputedRef[]> { - if (presets.value) { - return presets; - } - if (legacyRanges && legacyRanges.value) { - warning(false, '`ranges` is deprecated. Please use `presets` instead.'); + return computed(() => { + if (presets?.value) { + return presets.value; + } + if (legacyRanges?.value) { + warning(false, '`ranges` is deprecated. Please use `presets` instead.'); - return computed(() => { const rangeLabels = Object.keys(legacyRanges.value); return rangeLabels.map(label => { const range = legacyRanges.value[label]; @@ -24,7 +24,7 @@ export default function usePresets( value: newValues, }; }); - }); - } - return [] as unknown as ComputedRef[]>; + } + return [] as unknown as PresetDate[]; + }); } diff --git a/tsconfig.json b/tsconfig.json index 80ed81973..1a7c08b3b 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,7 +7,7 @@ "ant-design-vue/lib/*": ["components/*"], "ant-design-vue/locale/*": ["components/locale/*"] }, - "lib": ["dom", "es2017"], + "lib": ["DOM", "ESNext"], "strictNullChecks": false, "moduleResolution": "node", "esModuleInterop": true,