From 4e022ff29a6c815264ab64a1e1f6c524b38e7e46 Mon Sep 17 00:00:00 2001 From: Fine0830 Date: Tue, 19 Jul 2022 12:47:03 +0800 Subject: [PATCH] fix short time range (#121) --- src/components/Graph.vue | 23 +------------------ src/views/dashboard/related/event/Content.vue | 8 ++++++- 2 files changed, 8 insertions(+), 23 deletions(-) diff --git a/src/components/Graph.vue b/src/components/Graph.vue index 0222dca1..24b76650 100644 --- a/src/components/Graph.vue +++ b/src/components/Graph.vue @@ -77,7 +77,7 @@ onMounted(async () => { }); document.addEventListener( "click", - (event: Event) => { + () => { if (instance.isDisposed()) { return; } @@ -88,27 +88,6 @@ onMounted(async () => { type: "updateAxisPointer", currTrigger: "leave", }); - if ( - ["vis-item-overflow", "vis-item-content"].includes( - (event.target as HTMLDivElement).className - ) - ) { - return; - } - const series = (window as any).structuredClone(props.option.series); - for (const temp of series) { - if (temp.markArea) { - delete temp.markArea; - } - } - const options = { - ...props.option, - series, - }; - if (JSON.stringify(options) === JSON.stringify(props.option)) { - return; - } - setOptions(options); }, true ); diff --git a/src/views/dashboard/related/event/Content.vue b/src/views/dashboard/related/event/Content.vue index 4786e7be..dad8e99a 100644 --- a/src/views/dashboard/related/event/Content.vue +++ b/src/views/dashboard/related/event/Content.vue @@ -115,8 +115,14 @@ function visTimeline() { const i = events[index - 1 || 0]; for (const widget of widgets) { + let end = i.end; + if (!isNaN(index)) { + if (!i.end || i.end.getTime() - i.start.getTime() < 60000) { + end = i.start.getTime() + 60000; + } + } const startTime = dateFormatTime(i.start, appStore.duration.step); - const endTime = dateFormatTime(i.end, appStore.duration.step); + const endTime = dateFormatTime(new Date(end), appStore.duration.step); widget.filters = { sourceId: dashboardStore.selectedGrid.id || "", isRange: true,