From 7fe0a57e493ecaa8b53c6bbf3a2154352e8c3557 Mon Sep 17 00:00:00 2001 From: Fine0830 Date: Mon, 21 Feb 2022 20:17:13 +0800 Subject: [PATCH] fix: update date picker (#17) --- src/components/DateCalendar.vue | 10 ++++++---- src/components/TimePicker.vue | 6 +++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/components/DateCalendar.vue b/src/components/DateCalendar.vue index c4c948f7..91e56751 100755 --- a/src/components/DateCalendar.vue +++ b/src/components/DateCalendar.vue @@ -351,7 +351,7 @@ watch( } ); const parse = (num: number): number => { - return Math.floor(num / 1000); + return num / 100000; }; const start = computed(() => { return parse(Number(props.dates[0])); @@ -547,10 +547,12 @@ const ok = (info: any) => { state.minute, state.second ); - if (props.left && Math.floor(_time.getTime() / 1000) > end.value) { - emit("setDates", _time); + if (props.left && _time.getTime() / 100000 < end.value) { + emit("setDates", _time, "left"); + } + if (props.right && _time.getTime() / 100000 > start.value) { + emit("setDates", _time, "right"); } - emit("input", _time); emit("ok", info === "h"); }; onMounted(() => { diff --git a/src/components/TimePicker.vue b/src/components/TimePicker.vue index f41f9a16..24846c89 100755 --- a/src/components/TimePicker.vue +++ b/src/components/TimePicker.vue @@ -275,7 +275,11 @@ const ok = (leaveOpened: boolean) => { show.value = range.value; }, 1); }; -const setDates = (d: Date) => { +const setDates = (d: Date, pos: string) => { + if (pos === "left") { + dates.value[0] = d; + return; + } dates.value[1] = d; }; const dc = (e: any) => {