fix(日志管理): 日志管理默认排序

访问日志和系统日志进入后默认按时间排序 fix #103
jetlinks · Jul 9, 2020 · 0cb31e0 · 0cb31e0
1 parent 599daf2
commit 0cb31e0
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 25 deletions.
diff --git a/src/pages/logger/access/index.tsx b/src/pages/logger/access/index.tsx
@@ -1,12 +1,12 @@
-import React, {Fragment, useEffect, useState} from 'react';
-import {ColumnProps, PaginationConfig, SorterResult} from 'antd/es/table';
-import {Card, Table, Tag} from 'antd';
-import {PageHeaderWrapper} from '@ant-design/pro-layout';
+import React, { Fragment, useEffect, useState } from 'react';
+import { ColumnProps, PaginationConfig, SorterResult } from 'antd/es/table';
+import { Card, Table, Tag } from 'antd';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import styles from '@/utils/table.less';
-import {connect} from 'dva';
+import { connect } from 'dva';
 import moment from 'moment';
-import {AccessLoggerItem} from './data.d';
-import {ConnectState, Dispatch} from '@/models/connect';
+import { AccessLoggerItem } from './data.d';
+import { ConnectState, Dispatch } from '@/models/connect';
 import encodeQueryParam from '@/utils/encodeParam';
 import Save from './save';
 import SearchForm from '@/components/SearchForm';
@@ -26,13 +26,19 @@ interface State {
 }
 
 const AccessLoggerList: React.FC<Props> = props => {
-  const {dispatch} = props;
+  const { dispatch } = props;
 
-  const {result} = props.accessLogger;
+  const { result } = props.accessLogger;
 
   const initState: State = {
     data: result,
-    searchParam: {pageSize: 10},
+    searchParam: {
+      pageSize: 10,
+      sorts: {
+        field: 'requestTime',
+        order: 'desc',
+      },
+    },
     saveVisible: false,
     current: {},
   };
@@ -172,7 +178,7 @@ const AccessLoggerList: React.FC<Props> = props => {
             <SearchForm
               search={(params: any) => {
                 setSearchParam(params);
-                handleSearch({terms: params, pageSize: 10, sorts: searchParam.sorts});
+                handleSearch({ terms: params, pageSize: 10, sorts: searchParam.sorts });
               }}
               formItems={[
                 {
@@ -201,7 +207,7 @@ const AccessLoggerList: React.FC<Props> = props => {
                   key: 'requestTime$btw',
                   type: 'dateTimeRange',
                   props: {
-                    showTime: {format: 'HH:mm'},
+                    showTime: { format: 'HH:mm' },
                     format: "YYYY-MM-DD HH:mm",
                     placeholder: ['开始时间', '结束时间'],
                   }
@@ -246,7 +252,7 @@ const AccessLoggerList: React.FC<Props> = props => {
     </PageHeaderWrapper>
   );
 };
-export default connect(({accessLogger, loading}: ConnectState) => ({
+export default connect(({ accessLogger, loading }: ConnectState) => ({
   accessLogger,
   loading: loading.models.accessLogger,
 }))(AccessLoggerList);
diff --git a/src/pages/logger/system/index.tsx b/src/pages/logger/system/index.tsx
@@ -1,12 +1,12 @@
-import React, {Fragment, useEffect, useState} from 'react';
-import {ColumnProps, PaginationConfig, SorterResult} from 'antd/es/table';
-import {Card, Table, Tag} from 'antd';
-import {PageHeaderWrapper} from '@ant-design/pro-layout';
+import React, { Fragment, useEffect, useState } from 'react';
+import { ColumnProps, PaginationConfig, SorterResult } from 'antd/es/table';
+import { Card, Table, Tag } from 'antd';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import styles from '@/utils/table.less';
-import {connect} from 'dva';
+import { connect } from 'dva';
 import moment from 'moment';
-import {SystemLoggerItem} from './data.d';
-import {ConnectState, Dispatch} from '@/models/connect';
+import { SystemLoggerItem } from './data.d';
+import { ConnectState, Dispatch } from '@/models/connect';
 import encodeQueryParam from '@/utils/encodeParam';
 import Save from './save';
 import SearchForm from '@/components/SearchForm';
@@ -26,13 +26,19 @@ interface State {
 }
 
 const SystemLoggerList: React.FC<Props> = props => {
-  const {dispatch} = props;
+  const { dispatch } = props;
 
-  const {result} = props.systemLogger;
+  const { result } = props.systemLogger;
 
   const initState: State = {
     data: result,
-    searchParam: {pageSize: 10},
+    searchParam: {
+      pageSize: 10,
+      sorts: {
+        field: 'createTime',
+        order: 'desc',
+      },
+    },
     saveVisible: false,
     current: {},
   };
@@ -153,7 +159,7 @@ const SystemLoggerList: React.FC<Props> = props => {
             <SearchForm
               search={(params: any) => {
                 setSearchParam(params);
-                handleSearch({terms: params, pageSize: 10, sorts: searchParam.sorts});
+                handleSearch({ terms: params, pageSize: 10, sorts: searchParam.sorts });
               }}
               formItems={[
                 {
@@ -219,7 +225,7 @@ const SystemLoggerList: React.FC<Props> = props => {
     </PageHeaderWrapper>
   );
 };
-export default connect(({systemLogger, loading}: ConnectState) => ({
+export default connect(({ systemLogger, loading }: ConnectState) => ({
   systemLogger,
   loading: loading.models.systemLogger,
 }))(SystemLoggerList);