Skip to content

Commit 5f1cb0d

Browse files
committed
fix: datepicker presets error #6387
1 parent f6daa8d commit 5f1cb0d

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

components/vc-picker/hooks/usePresets.ts

+9-9
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ export default function usePresets<T>(
88
presets?: ComputedRef<PresetDate<T>[]>,
99
legacyRanges?: ComputedRef<Record<string, T | (() => T)>>,
1010
): ComputedRef<PresetDate<T>[]> {
11-
if (presets.value) {
12-
return presets;
13-
}
14-
if (legacyRanges && legacyRanges.value) {
15-
warning(false, '`ranges` is deprecated. Please use `presets` instead.');
11+
return computed(() => {
12+
if (presets?.value) {
13+
return presets.value;
14+
}
15+
if (legacyRanges?.value) {
16+
warning(false, '`ranges` is deprecated. Please use `presets` instead.');
1617

17-
return computed(() => {
1818
const rangeLabels = Object.keys(legacyRanges.value);
1919
return rangeLabels.map(label => {
2020
const range = legacyRanges.value[label];
@@ -24,7 +24,7 @@ export default function usePresets<T>(
2424
value: newValues,
2525
};
2626
});
27-
});
28-
}
29-
return [] as unknown as ComputedRef<PresetDate<T>[]>;
27+
}
28+
return [] as unknown as PresetDate<T>[];
29+
});
3030
}

tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"ant-design-vue/lib/*": ["components/*"],
88
"ant-design-vue/locale/*": ["components/locale/*"]
99
},
10-
"lib": ["dom", "es2017"],
10+
"lib": ["DOM", "ESNext"],
1111
"strictNullChecks": false,
1212
"moduleResolution": "node",
1313
"esModuleInterop": true,

0 commit comments

Comments
 (0)