diff --git a/app/components/Admin/AdminDatePicker.vue b/app/components/Admin/AdminDatePicker.vue index 95aa9bf..30745f5 100644 --- a/app/components/Admin/AdminDatePicker.vue +++ b/app/components/Admin/AdminDatePicker.vue @@ -169,7 +169,7 @@ const emit = defineEmits(['update:modelValue', 'change']) const dateSelector = ref(null) const isFirstDateVisible = ref(false) const isLastDateVisible = ref(false) -const dateRange = ref({ start: -8, end: 10 }) +const dateRange = ref({ start: -10, end: 15 }) const showCalendar = ref(false) const pad = (n) => n.toString().padStart(2, '0') @@ -248,7 +248,7 @@ const scrollToDateElement = (behavior = 'smooth') => { const handleWheel = (event) => { event.preventDefault() if (!dateSelector.value) return - const scrollAmount = 120 + const scrollAmount = 160 const currentScroll = dateSelector.value.scrollLeft dateSelector.value.scrollTo({ left: event.deltaY > 0 ? currentScroll + scrollAmount : currentScroll - scrollAmount, @@ -258,7 +258,7 @@ const handleWheel = (event) => { const scrollDates = (direction) => { if (!dateSelector.value) return - const scrollAmount = 120 + const scrollAmount = 160 const currentScroll = dateSelector.value.scrollLeft dateSelector.value.scrollTo({ left: direction === 'right' ? currentScroll + scrollAmount : currentScroll - scrollAmount, @@ -269,16 +269,16 @@ const scrollDates = (direction) => { const handleScroll = () => { if (!dateSelector.value) return const { scrollLeft, scrollWidth, clientWidth } = dateSelector.value - if (scrollLeft < 50) { + if (scrollLeft < 100) { const oldScrollWidth = scrollWidth - dateRange.value.start -= 3 + dateRange.value.start -= 5 nextTick(() => { const newScrollWidth = dateSelector.value.scrollWidth dateSelector.value.scrollLeft += newScrollWidth - oldScrollWidth }) } - if (scrollWidth - scrollLeft - clientWidth < 50) { - dateRange.value.end += 3 + if (scrollWidth - scrollLeft - clientWidth < 100) { + dateRange.value.end += 5 } } @@ -286,8 +286,8 @@ const scrollToToday = () => { const todayStr = formatDateStr(today) if (props.modelValue !== todayStr) selectDate(todayStr) if (dateRange.value.start > 0 || dateRange.value.end < 0) { - dateRange.value.start = -8 - dateRange.value.end = 10 + dateRange.value.start = -10 + dateRange.value.end = 15 } nextTick(() => scrollToDateElement('smooth')) } diff --git a/app/components/Admin/AdminMultiDatePicker.vue b/app/components/Admin/AdminMultiDatePicker.vue index 035a711..db9553b 100644 --- a/app/components/Admin/AdminMultiDatePicker.vue +++ b/app/components/Admin/AdminMultiDatePicker.vue @@ -191,7 +191,7 @@ const emit = defineEmits(['update:modelValue', 'change']) const dateSelector = ref(null) const isFirstDateVisible = ref(false) const isLastDateVisible = ref(false) -const dateRange = ref({ start: 0, end: 28 }) +const dateRange = ref({ start: -3, end: 38 }) const showCalendar = ref(false) const lastClickedDate = ref('') @@ -343,7 +343,7 @@ const applyBatchAction = (action) => { const handleWheel = (event) => { event.preventDefault() if (!dateSelector.value) return - const scrollAmount = 120 + const scrollAmount = 160 const currentScroll = dateSelector.value.scrollLeft dateSelector.value.scrollTo({ left: event.deltaY > 0 ? currentScroll + scrollAmount : currentScroll - scrollAmount, @@ -353,7 +353,7 @@ const handleWheel = (event) => { const scrollDates = (direction) => { if (!dateSelector.value) return - const scrollAmount = 120 + const scrollAmount = 160 const currentScroll = dateSelector.value.scrollLeft dateSelector.value.scrollTo({ left: direction === 'right' ? currentScroll + scrollAmount : currentScroll - scrollAmount, @@ -364,23 +364,23 @@ const scrollDates = (direction) => { const handleScroll = () => { if (!dateSelector.value) return const { scrollLeft, scrollWidth, clientWidth } = dateSelector.value - if (scrollLeft < 50 && dateRange.value.start > 0) { + if (scrollLeft < 100) { const oldScrollWidth = scrollWidth - dateRange.value.start = Math.max(0, dateRange.value.start - 3) + dateRange.value.start -= 5 nextTick(() => { const newScrollWidth = dateSelector.value.scrollWidth dateSelector.value.scrollLeft += newScrollWidth - oldScrollWidth }) } - if (scrollWidth - scrollLeft - clientWidth < 50) { - dateRange.value.end += 3 + if (scrollWidth - scrollLeft - clientWidth < 100) { + dateRange.value.end += 5 } } const scrollToToday = () => { if (dateRange.value.start > 0 || dateRange.value.end < 0) { - dateRange.value.start = 0 - dateRange.value.end = 20 + dateRange.value.start = -3 + dateRange.value.end = 25 } nextTick(() => { if (!dateSelector.value) return