github
/
ant-design-vue
mirror of https://github.com/vueComponent/ant-design-vue
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: datepicker presets error #6387

pull/6423/head
tangjinzhou 2023-04-05 13:29:08 +08:00
parent f6daa8d28f
commit 5f1cb0d240
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
components/vc-picker/hooks/usePresets.ts
View File

@ -8,13 +8,13 @@ export default function usePresets<T>(
presets?: ComputedRef<PresetDate<T>[]>, presets?: ComputedRef<PresetDate<T>[]>,
legacyRanges?: ComputedRef<Record<string, T | (() => T)>>, legacyRanges?: ComputedRef<Record<string, T | (() => T)>>,
): ComputedRef<PresetDate<T>[]> { ): ComputedRef<PresetDate<T>[]> {
if (presets.value) { return computed(() => {
return presets; if (presets?.value) {
} return presets.value;
if (legacyRanges && legacyRanges.value) { }
warning(false, '`ranges` is deprecated. Please use `presets` instead.'); if (legacyRanges?.value) {
warning(false, '`ranges` is deprecated. Please use `presets` instead.');
return computed(() => {
const rangeLabels = Object.keys(legacyRanges.value); const rangeLabels = Object.keys(legacyRanges.value);
return rangeLabels.map(label => { return rangeLabels.map(label => {
const range = legacyRanges.value[label]; const range = legacyRanges.value[label];
@ -24,7 +24,7 @@ export default function usePresets<T>(
value: newValues, value: newValues,
}; };
}); });
}); }
} return [] as unknown as PresetDate<T>[];
return [] as unknown as ComputedRef<PresetDate<T>[]>; });
} }

2
tsconfig.json
View File

@ -7,7 +7,7 @@
"ant-design-vue/lib/*": ["components/*"], "ant-design-vue/lib/*": ["components/*"],
"ant-design-vue/locale/*": ["components/locale/*"] "ant-design-vue/locale/*": ["components/locale/*"]
}, },
"lib": ["dom", "es2017"], "lib": ["DOM", "ESNext"],
"strictNullChecks": false, "strictNullChecks": false,
"moduleResolution": "node", "moduleResolution": "node",
"esModuleInterop": true, "esModuleInterop": true,