From 140f851c2dbd8382321ad1796f751afd49f18e10 Mon Sep 17 00:00:00 2001 From: Qiuxia Fan Date: Thu, 19 May 2022 11:08:12 +0800 Subject: [PATCH] remove total from trace --- src/graphql/fragments/trace.ts | 2 +- src/store/modules/log.ts | 2 +- src/store/modules/trace.ts | 6 +----- src/views/dashboard/related/log/Header.vue | 2 +- src/views/dashboard/related/log/List.vue | 2 +- src/views/dashboard/related/trace/Detail.vue | 2 +- src/views/dashboard/related/trace/Filter.vue | 2 +- .../dashboard/related/trace/TraceList.vue | 20 +++++++++++-------- .../trace/components/D3Graph/SpanDetail.vue | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/graphql/fragments/trace.ts b/src/graphql/fragments/trace.ts index 04f718e0..669db8dc 100644 --- a/src/graphql/fragments/trace.ts +++ b/src/graphql/fragments/trace.ts @@ -26,8 +26,8 @@ export const Traces = { start isError traceIds + segmentId } - total }`, }; diff --git a/src/store/modules/log.ts b/src/store/modules/log.ts index a92981cc..9665f117 100644 --- a/src/store/modules/log.ts +++ b/src/store/modules/log.ts @@ -43,7 +43,7 @@ export const logStore = defineStore({ endpoints: [{ value: "0", label: "All" }], conditions: { queryDuration: useAppStoreWithOut().durationTime, - paging: { pageNum: 1, pageSize: 15, needTotal: true }, + paging: { pageNum: 1, pageSize: 15 }, }, supportQueryLogsByKeywords: true, selectorStore: useSelectorStore(), diff --git a/src/store/modules/trace.ts b/src/store/modules/trace.ts index 25eacc6d..50f9e166 100644 --- a/src/store/modules/trace.ts +++ b/src/store/modules/trace.ts @@ -28,7 +28,6 @@ interface TraceState { instances: Instance[]; endpoints: Endpoint[]; traceList: Trace[]; - traceTotal: number; traceSpans: Span[]; currentTrace: Trace | any; conditions: any; @@ -45,13 +44,12 @@ export const traceStore = defineStore({ endpoints: [{ value: "0", label: "All" }], traceList: [], traceSpans: [], - traceTotal: 0, currentTrace: {}, conditions: { queryDuration: useAppStoreWithOut().durationTime, traceState: "ALL", queryOrder: "BY_START_TIME", - paging: { pageNum: 1, pageSize: 15, needTotal: true }, + paging: { pageNum: 1, pageSize: 20 }, }, traceSpanLogs: [], traceSpanLogsTotal: 0, @@ -115,7 +113,6 @@ export const traceStore = defineStore({ return res.data; } if (!res.data.data.data.traces.length) { - this.traceTotal = 0; this.traceList = []; this.setCurrentTrace({}); this.setTraceSpans([]); @@ -128,7 +125,6 @@ export const traceStore = defineStore({ }); return d; }); - this.traceTotal = res.data.data.data.total; this.setCurrentTrace(res.data.data.data.traces[0] || {}); return res.data; }, diff --git a/src/views/dashboard/related/log/Header.vue b/src/views/dashboard/related/log/Header.vue index b03c84e9..023d964e 100644 --- a/src/views/dashboard/related/log/Header.vue +++ b/src/views/dashboard/related/log/Header.vue @@ -229,7 +229,7 @@ function searchLogs() { keywordsOfContent: keywordsOfContent.value, excludingKeywordsOfContent: excludingKeywordsOfContent.value, tags: tagsMap.value.length ? tagsMap.value : undefined, - paging: { pageNum: 1, pageSize: 15, needTotal: true }, + paging: { pageNum: 1, pageSize: 15 }, relatedTrace: traceId.value ? { traceId: traceId.value } : undefined, }); queryLogs(); diff --git a/src/views/dashboard/related/log/List.vue b/src/views/dashboard/related/log/List.vue index acc3cfb5..455158c1 100644 --- a/src/views/dashboard/related/log/List.vue +++ b/src/views/dashboard/related/log/List.vue @@ -51,7 +51,7 @@ const type = ref( const pageSize = ref(15); function updatePage(p: number) { logStore.setLogCondition({ - paging: { pageNum: p, pageSize: pageSize.value, needTotal: true }, + paging: { pageNum: p, pageSize: pageSize.value }, }); queryLogs(); } diff --git a/src/views/dashboard/related/trace/Detail.vue b/src/views/dashboard/related/trace/Detail.vue index d44b01a5..8702a3b1 100644 --- a/src/views/dashboard/related/trace/Detail.vue +++ b/src/views/dashboard/related/trace/Detail.vue @@ -202,7 +202,7 @@ export default defineComponent({ relatedTrace: { traceId: traceId.value || traceStore.currentTrace.traceIds[0].value, }, - paging: { pageNum: pageNum.value, pageSize, needTotal: true }, + paging: { pageNum: pageNum.value, pageSize }, }, }); if (res.errors) { diff --git a/src/views/dashboard/related/trace/Filter.vue b/src/views/dashboard/related/trace/Filter.vue index 5128d807..2240984a 100644 --- a/src/views/dashboard/related/trace/Filter.vue +++ b/src/views/dashboard/related/trace/Filter.vue @@ -178,7 +178,7 @@ function searchTraces() { maxTraceDuration: appStore.maxTraceDuration || undefined, queryOrder: "BY_DURATION", tags: tagsMap.value.length ? tagsMap.value : undefined, - paging: { pageNum: 1, pageSize: 15, needTotal: true }, + paging: { pageNum: 1, pageSize: 20 }, }); queryTraces(); } diff --git a/src/views/dashboard/related/trace/TraceList.vue b/src/views/dashboard/related/trace/TraceList.vue index 9240e5de..fd96f304 100644 --- a/src/views/dashboard/related/trace/TraceList.vue +++ b/src/views/dashboard/related/trace/TraceList.vue @@ -17,9 +17,9 @@ limitations under the License. --> v-model:currentPage="traceStore.conditions.paging.pageNum" v-model:page-size="pageSize" :small="true" - layout="prev, pager, next, jumper" - :total="traceStore.traceTotal" - v-model:pager-count="pageCount" + layout="prev, pager, next" + :pager-count="5" + :total="total" @current-change="updatePage" />
@@ -71,7 +71,7 @@ limitations under the License. -->