fix(sj_1.1.0_beta1): 修复时间范围查询组件默认值赋值问题

This commit is contained in:
xlsea 2024-06-13 10:41:36 +08:00
parent a07016214f
commit 9e1bc3c9f5

View File

@ -13,48 +13,63 @@ interface Props {
const props = defineProps<Props>(); const props = defineProps<Props>();
interface Emits { interface Emits {
(e: 'update:beginDate', beginDate: number): void; (e: 'update:beginDate', beginDate: number | null): void;
(e: 'update:endDate', endDate: number): void; (e: 'update:endDate', endDate: number | null): void;
} }
const emit = defineEmits<Emits>(); const emit = defineEmits<Emits>();
const dateRange = ref<[number, number]>(getDefaultDate()); const dateRange = ref<[number, number] | undefined>(getDefaultDate());
watch( watch(
() => props.beginDate, () => [props.beginDate, props.endDate],
beginDate => { val => {
if (typeof beginDate === 'number' && beginDate) { if (!val[0] && !val[1]) {
dateRange.value[0] = beginDate; dateRange.value = undefined;
}
} }
},
{ immediate: true }
); );
watch( watch(
() => props.endDate, () => dateRange.value,
endDate => { val => {
if (typeof endDate === 'number' && endDate) { emit('update:beginDate', val ? val[0] : null);
dateRange.value[1] = endDate; emit('update:endDate', val ? val[1] : null);
}
}, },
{ immediate: true } { immediate: true }
); );
function getDefaultDate(): [number, number] { function getDefaultDate(): [number, number] {
const currentDate = new Date(); const today = new Date();
const currentTime = currentDate.getTime(); const endOfDay = new Date(today.getFullYear(), today.getMonth(), today.getDate(), 23, 59, 59);
currentDate.setMonth(currentDate.getMonth() - 1); const oneMonthAgo = new Date(today.getFullYear(), today.getMonth() - 1, today.getDate());
return [currentDate.getTime(), currentTime]; const startOfDayOneMonthAgo = new Date(
oneMonthAgo.getFullYear(),
oneMonthAgo.getMonth(),
oneMonthAgo.getDate(),
0,
0,
0
);
return [startOfDayOneMonthAgo.getTime(), endOfDay.getTime()];
} }
function onChange(value: [number, number]) { function initDefaultDate() {
emit('update:beginDate', value[0]); const beginDate = props.beginDate;
emit('update:endDate', value[1]); if (typeof beginDate === 'number' && beginDate) {
dateRange.value![0] = beginDate;
} }
const endDate = props.endDate;
if (typeof endDate === 'number' && endDate) {
dateRange.value![1] = endDate;
}
}
initDefaultDate();
</script> </script>
<template> <template>
<NDatePicker v-model:value="dateRange" class="w-full" type="datetimerange" clearable @update:value="onChange" /> <NDatePicker v-model:value="dateRange" class="w-full" type="datetimerange" clearable />
</template> </template>
<style scoped lang="scss"></style> <style scoped lang="scss"></style>