fix: set the value(SECOND) of the step filed for queries (#131)

This commit is contained in:
Fine0830 2022-07-29 20:54:57 +08:00 committed by GitHub
parent 3b3e790dd9
commit b01565b2b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 23 deletions

View File

@ -139,7 +139,19 @@ function associateTraceLog(
};
dashboardStore.setWidget(item);
} else {
const { start, end } = setEndTime(i.start, i.end);
let step = appStore.duration.step;
let start = i.start;
let end = i.end;
if (
appStore.duration.step === "MINUTE" &&
i.end.getTime() - i.start.getTime() < 60000
) {
step = "SECOND";
} else {
const times = setEndTime(i.start, i.end);
start = times.start;
end = times.end;
}
const item = {
...widget,
filters: {
@ -147,15 +159,11 @@ function associateTraceLog(
duration: {
start: dateFormatStep(
getLocalTime(appStore.utc, start),
appStore.duration.step,
step,
true
),
end: dateFormatStep(
getLocalTime(appStore.utc, end),
appStore.duration.step,
true
),
step: appStore.duration.step,
end: dateFormatStep(getLocalTime(appStore.utc, end), step, true),
step,
},
},
};

View File

@ -271,7 +271,7 @@ function searchLogs() {
: state.service.id,
endpointId: endpoint || state.endpoint.id || undefined,
serviceInstanceId: instance || state.instance.id || undefined,
queryDuration: appStore.durationTime,
queryDuration: duration.value,
keywordsOfContent: keywordsOfContent.value,
excludingKeywordsOfContent: excludingKeywordsOfContent.value,
tags: tagsMap.value.length ? tagsMap.value : undefined,
@ -344,13 +344,6 @@ function removeExcludeContent(index: number) {
}
onUnmounted(() => {
logStore.resetState();
const item = {
...props.data,
filters: undefined,
};
dashboardStore.setWidget(item);
traceId.value = "";
duration.value = appStore.durationTime;
});
watch(
() => selectorStore.currentService,

View File

@ -236,13 +236,6 @@ async function searchEndpoints(keyword: string) {
}
onUnmounted(() => {
traceStore.resetState();
const item = {
...props.data,
filters: undefined,
};
dashboardStore.setWidget(item);
traceId.value = "";
duration.value = appStore.durationTime;
});
watch(
() => [selectorStore.currentPod],