This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-booster-ui.git
The following commit(s) were added to refs/heads/main by this push:
new 7fe0a57 fix: update date picker (#17)
7fe0a57 is described below
commit 7fe0a57e493ecaa8b53c6bbf3a2154352e8c3557
Author: Fine0830 <[email protected]>
AuthorDate: Mon Feb 21 20:17:13 2022 +0800
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 c4c948f..91e5675 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 f41f9a1..24846c8 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) => {