Commit 23a09e28c84c600bc4137658940155def1d9b66b
Merge branch 'fix/edge-event-manage' into 'main_dev'
fix: 修复边缘事件排序 See merge request yunteng/thingskit-front!1423
Showing
2 changed files
with
7 additions
and
2 deletions
1 | -import { BaseQueryParams } from '../../base'; | ||
2 | import { | 1 | import { |
3 | Configuration, | 2 | Configuration, |
4 | ProvisionConfiguration, | 3 | ProvisionConfiguration, |
@@ -6,10 +5,14 @@ import { | @@ -6,10 +5,14 @@ import { | ||
6 | } from '../../device/model/deviceModel'; | 5 | } from '../../device/model/deviceModel'; |
7 | import { ModelOfMatterParams } from '../../device/model/modelOfMatterModel'; | 6 | import { ModelOfMatterParams } from '../../device/model/modelOfMatterModel'; |
8 | 7 | ||
9 | -export type QueryEdgeInstancePageParams = BaseQueryParams & { | 8 | +export type QueryEdgeInstancePageParams = { |
10 | name?: string; | 9 | name?: string; |
11 | tenantId?: string; | 10 | tenantId?: string; |
12 | textSearch?: string; | 11 | textSearch?: string; |
12 | + page: number; | ||
13 | + pageSize: number; | ||
14 | + sortOrder?: string; | ||
15 | + sortProperty?: string; | ||
13 | }; | 16 | }; |
14 | 17 | ||
15 | export interface EdgeInstanceItemType { | 18 | export interface EdgeInstanceItemType { |
@@ -24,6 +24,8 @@ | @@ -24,6 +24,8 @@ | ||
24 | page: page - 1 < 0 ? 0 : page - 1, | 24 | page: page - 1 < 0 ? 0 : page - 1, |
25 | pageSize, | 25 | pageSize, |
26 | tenantId: props?.recordData?.tenantId?.id, | 26 | tenantId: props?.recordData?.tenantId?.id, |
27 | + sortOrder: 'DESC', | ||
28 | + sortProperty: 'ts', | ||
27 | }, | 29 | }, |
28 | props?.recordData?.id?.id | 30 | props?.recordData?.id?.id |
29 | ); | 31 | ); |