update event associations

This commit is contained in:
Qiuxia Fan 2022-07-28 17:49:30 +08:00
parent b8ff623eb8
commit 1f98d2bfa1
2 changed files with 77 additions and 45 deletions

View File

@ -115,6 +115,10 @@ watch(
} }
if (props.filters) { if (props.filters) {
if (props.filters.isRange) { if (props.filters.isRange) {
if (!props.filters.duration.startTime) {
setOptions(props.option);
return;
}
const list = props.option.series[0].data.map( const list = props.option.series[0].data.map(
(d: (number | string)[]) => d[0] (d: (number | string)[]) => d[0]
); );

View File

@ -125,10 +125,24 @@ function associateTraceLog(
const widgets = dashboard.filter((d: { type: string }) => const widgets = dashboard.filter((d: { type: string }) =>
["Trace", "Log"].includes(d.type) ["Trace", "Log"].includes(d.type)
); );
for (const widget of widgets) {
const index = items[0]; const index = items[0];
const i = events[index - 1 || 0]; const i = events[index - 1 || 0];
const { start, end } = setEndTime(i.start, i.end, index); for (const widget of widgets) {
if (isNaN(index)) {
const item = {
...widget,
filters: {
sourceId: props.data.id || "",
duration: {
startTime: null,
endTime: null,
step: appStore.duration.step,
},
},
};
dashboardStore.setWidget(item);
} else {
const { start, end } = setEndTime(i.start, i.end);
const item = { const item = {
...widget, ...widget,
filters: { filters: {
@ -143,6 +157,7 @@ function associateTraceLog(
dashboardStore.setWidget(item); dashboardStore.setWidget(item);
} }
} }
}
function associateMetrics( function associateMetrics(
items: number[], items: number[],
events: { events: {
@ -167,7 +182,21 @@ function associateMetrics(
const i = events[index - 1 || 0]; const i = events[index - 1 || 0];
for (const widget of widgets) { for (const widget of widgets) {
const { start, end } = setEndTime(i.start, i.end, index); if (isNaN(index)) {
const item = {
...widget,
filters: {
sourceId: dashboardStore.selectedGrid.id || "",
isRange: true,
duration: {
startTime: null,
endTime: null,
},
},
};
dashboardStore.setWidget(item);
} else {
const { start, end } = setEndTime(i.start, i.end);
const startTime = dateFormatTime(start, appStore.duration.step); const startTime = dateFormatTime(start, appStore.duration.step);
const endTime = dateFormatTime(end, appStore.duration.step); const endTime = dateFormatTime(end, appStore.duration.step);
const item = { const item = {
@ -184,9 +213,9 @@ function associateMetrics(
dashboardStore.setWidget(item); dashboardStore.setWidget(item);
} }
} }
function setEndTime(start: Date, end: Date, index: number) { }
function setEndTime(start: Date, end: Date) {
let time: Date | number = end; let time: Date | number = end;
if (!isNaN(index)) {
let diff = 60000; let diff = 60000;
switch (appStore.duration.step) { switch (appStore.duration.step) {
case "MINUTE": case "MINUTE":
@ -202,7 +231,6 @@ function setEndTime(start: Date, end: Date, index: number) {
if (!end || end.getTime() - start.getTime() < diff) { if (!end || end.getTime() - start.getTime() < diff) {
time = start.getTime() + diff; time = start.getTime() + diff;
} }
}
return { start, end: new Date(time) }; return { start, end: new Date(time) };
} }