diff --git a/apps/daas/src/views/data-server-audit/List.vue b/apps/daas/src/views/data-server-audit/List.vue index 7a938b10c..5f4c6bf6a 100644 --- a/apps/daas/src/views/data-server-audit/List.vue +++ b/apps/daas/src/views/data-server-audit/List.vue @@ -2,7 +2,7 @@ import { fetchAllMethods, fetchApiCalls } from '@tap/api/src/core/api-calls' import { fetchApiClients } from '@tap/api/src/core/api-client' import PageContainer from '@tap/business/src/components/PageContainer.vue' -import TablePage from '@tap/business/src/components/TablePage.vue' +import TableCursor from '@tap/business/src/components/TableCursor.vue' import { FilterBar } from '@tap/component/src/filter-bar' import { useI18n } from '@tap/i18n' import dayjs from 'dayjs' @@ -14,11 +14,12 @@ const { t } = useI18n() const route = useRoute() const router = useRouter() -const tableRef = ref>() +const tableRef = ref>() const searchParams = reactive({ keyword: '', clientName: '', + clientId: '', method: '', code: '', start: '' as string | number, @@ -58,6 +59,12 @@ function initFromQuery(query: Record) { if (query.end) { searchParams.end = Number(query.end) } + if (query.method) { + searchParams.method = query.method + } + if (query.clientId) { + searchParams.clientId = query.clientId + } if (query.sortBy && query.sortOrder) { order.value = `${query.sortBy} ${query.sortOrder}` defaultSort.value = { @@ -75,8 +82,14 @@ function toDetails(item: any) { } // 获取数据 -function getData({ page }: { page: { current: number; size: number } }) { - const { current, size } = page +function getData({ + page, +}: { + page: { current: number; size: number; skip: number } + tags: any[] + isSelectedNoTag: boolean +}) { + const { size, skip } = page const { method, code, start, end, clientId, keyword, options } = searchParams as any const where: Record = {} @@ -106,7 +119,7 @@ function getData({ page }: { page: { current: number; size: number } }) { const filter = { order: order.value, limit: size, - skip: (current - 1) * size, + skip, where, } return fetchApiCalls(filter).then((data: any) => { @@ -233,7 +246,7 @@ initFromQuery(route.query) - + diff --git a/packages/api/src/core/api-calls.ts b/packages/api/src/core/api-calls.ts index b0d1656b1..8ae1e8bbe 100644 --- a/packages/api/src/core/api-calls.ts +++ b/packages/api/src/core/api-calls.ts @@ -33,7 +33,7 @@ export function fetchAllResponseCodes(params?: unknown) { // Base Http methods that are used in the codebase export function fetchApiCalls(filter?: Filter) { - return requestClient.get>(BASE_URL, { + return requestClient.get>(`${BASE_URL}/cursor`, { params: { filter: filter ? JSON.stringify(filter) : undefined }, }) } diff --git a/packages/business/src/components/TableCursor.vue b/packages/business/src/components/TableCursor.vue new file mode 100644 index 000000000..bb689e4e9 --- /dev/null +++ b/packages/business/src/components/TableCursor.vue @@ -0,0 +1,792 @@ + + + + + +