diff --git a/src/graphql/fragments/log.ts b/src/graphql/fragments/log.ts index 78738d8e..18e814ec 100644 --- a/src/graphql/fragments/log.ts +++ b/src/graphql/fragments/log.ts @@ -54,7 +54,6 @@ export const QueryServiceLogs = { value } } - total }`, }; diff --git a/src/graphql/fragments/trace.ts b/src/graphql/fragments/trace.ts index 04f718e0..e1e0af9b 100644 --- a/src/graphql/fragments/trace.ts +++ b/src/graphql/fragments/trace.ts @@ -27,7 +27,6 @@ export const Traces = { isError traceIds } - total }`, }; diff --git a/src/store/modules/log.ts b/src/store/modules/log.ts index a92981cc..ce1674d1 100644 --- a/src/store/modules/log.ts +++ b/src/store/modules/log.ts @@ -31,7 +31,6 @@ interface LogState { selectorStore: any; supportQueryLogsByKeywords: boolean; logs: any[]; - logsTotal: number; loadLogs: boolean; } @@ -43,12 +42,11 @@ 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(), logs: [], - logsTotal: 0, loadLogs: false, }), actions: { @@ -131,7 +129,6 @@ export const logStore = defineStore({ } this.logs = res.data.data.queryLogs.logs; - this.logsTotal = res.data.data.queryLogs.total; return res.data; }, async getBrowserLogs() { @@ -145,7 +142,6 @@ export const logStore = defineStore({ return res.data; } this.logs = res.data.data.queryBrowserErrorLogs.logs; - this.logsTotal = res.data.data.queryBrowserErrorLogs.total; return res.data; }, async getLogTagKeys() { diff --git a/src/store/modules/trace.ts b/src/store/modules/trace.ts index 25eacc6d..4e337351 100644 --- a/src/store/modules/trace.ts +++ b/src/store/modules/trace.ts @@ -28,12 +28,10 @@ interface TraceState { instances: Instance[]; endpoints: Endpoint[]; traceList: Trace[]; - traceTotal: number; traceSpans: Span[]; currentTrace: Trace | any; conditions: any; traceSpanLogs: any[]; - traceSpanLogsTotal: number; selectorStore: any; } @@ -45,16 +43,14 @@ 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, selectorStore: useSelectorStore(), }), actions: { @@ -115,7 +111,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 +123,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; }, @@ -148,11 +142,9 @@ export const traceStore = defineStore({ .params(params); if (res.data.errors) { this.traceSpanLogs = []; - this.traceSpanLogsTotal = 0; return res.data; } this.traceSpanLogs = res.data.data.queryLogs.logs || []; - this.traceSpanLogsTotal = res.data.data.queryLogs.total; return res.data; }, async getTagKeys() { diff --git a/src/views/dashboard/related/components/LogTable/Index.vue b/src/views/dashboard/related/components/LogTable/Index.vue index b507b0be..4d4f75e7 100644 --- a/src/views/dashboard/related/components/LogTable/Index.vue +++ b/src/views/dashboard/related/components/LogTable/Index.vue @@ -94,6 +94,8 @@ function setCurrentLog(log: any) { font-size: 12px; height: 100%; border-bottom: 1px solid #eee; + width: 100%; + overflow: auto; } .log-header { 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..583b30a1 100644 --- a/src/views/dashboard/related/log/List.vue +++ b/src/views/dashboard/related/log/List.vue @@ -26,8 +26,10 @@ limitations under the License. --> @@ -35,7 +37,7 @@ limitations under the License. -->