diff --git a/config/routes.ts b/config/routes.ts
index f751a35..063ecd0 100644
--- a/config/routes.ts
+++ b/config/routes.ts
@@ -5,7 +5,10 @@ const routes: IRoute[] = [
exact: false,
path: '/',
component: '@/layouts',
- routes: [{ exact: true, path: '/login', component: '@/pages/login' }],
+ routes: [
+ { exact: true, path: '/login', component: '@/pages/login' },
+ { exact: true, path: '/user', component: '@/pages/user' },
+ ],
},
]
diff --git a/package.json b/package.json
index eee127e..f1e3f95 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,6 @@
"echarts-for-react": "^3.0.0",
"echarts-gl": "^2.0.2",
"echarts-liquidfill": "^3.0.0",
- "enquire-js": "^0.2.1",
"json-format": "^1.0.1",
"lodash": "^4.17.11",
"md5": "^2.2.1",
@@ -25,8 +24,9 @@
"path-to-regexp": "^6.1.0",
"prop-types": "^15.7.0",
"qs": "^6.10.0",
- "react-adsense": "^0.1.0",
+ "react": "^17.0.2",
"react-countup": "^4.2.0",
+ "react-dom": "^17.0.2",
"react-helmet": "^6.0.0",
"react-highcharts": "^16.1.0",
"react-perfect-scrollbar": "^1.5.0",
diff --git a/src/configs/menus/index.ts b/src/configs/menus/index.ts
index e7c1e55..998df94 100644
--- a/src/configs/menus/index.ts
+++ b/src/configs/menus/index.ts
@@ -12,6 +12,11 @@ const menus = [
name: t`Dashboard`,
icon: 'dashboard',
},
+ {
+ path: '/user',
+ name: t`User`,
+ icon: 'user',
+ },
]
export default menus
diff --git a/src/pages/404.tsx b/src/pages/404.tsx
index 36d2f17..e39ce50 100644
--- a/src/pages/404.tsx
+++ b/src/pages/404.tsx
@@ -4,7 +4,6 @@ import styles from './404.less'
const NotFoundPage: React.FC = () => (
-
404 Not Found
)
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 9e87034..5657612 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -1,5 +1,6 @@
+import React from 'react'
import { Redirect } from 'umi'
-const Index = () =>
+const Index: React.FC = () =>
export default Index
diff --git a/src/pages/user/index.less b/src/pages/user/index.less
new file mode 100644
index 0000000..6d35765
--- /dev/null
+++ b/src/pages/user/index.less
@@ -0,0 +1,7 @@
+.table {
+ :global {
+ .ant-table td {
+ white-space: nowrap;
+ }
+ }
+}
diff --git a/src/pages/user/index.tsx b/src/pages/user/index.tsx
new file mode 100644
index 0000000..fb35aa0
--- /dev/null
+++ b/src/pages/user/index.tsx
@@ -0,0 +1,129 @@
+import React, { useState, useEffect } from 'react'
+import { Avatar, Button, Table } from 'antd'
+import { Link } from 'umi'
+import { useRequest } from '@/hooks'
+import { queryUserList } from '@/services'
+import { Trans } from '@lingui/macro'
+import styles from './index.less'
+
+const columns = [
+ {
+ title: Avatar,
+ dataIndex: 'avatar',
+ key: 'avatar',
+ width: '7%',
+ fixed: 'left',
+ render: (text) => ,
+ },
+ {
+ title: Name,
+ dataIndex: 'name',
+ key: 'name',
+ render: (text, record) => {text},
+ },
+ {
+ title: NickName,
+ dataIndex: 'nickName',
+ key: 'nickName',
+ },
+ {
+ title: Age,
+ dataIndex: 'age',
+ width: '6%',
+ key: 'age',
+ },
+ {
+ title: Gender,
+ dataIndex: 'isMale',
+ key: 'isMale',
+ width: '7%',
+ render: (text) => {text ? 'Male' : 'Female'},
+ },
+ {
+ title: Phone,
+ dataIndex: 'phone',
+ key: 'phone',
+ },
+ {
+ title: Email,
+ dataIndex: 'email',
+ key: 'email',
+ },
+ {
+ title: Address,
+ dataIndex: 'address',
+ key: 'address',
+ },
+ {
+ title: CreateTime,
+ dataIndex: 'createTime',
+ key: 'createTime',
+ },
+ {
+ title: Operation,
+ key: 'operation',
+ fixed: 'right',
+ width: '12%',
+ render: (text, record) => {
+ return (
+ <>
+
+
+ >
+ )
+ },
+ },
+]
+
+const UserPage: React.FC = () => {
+ const [current, setCurrent] = useState(1)
+ const [pageSize, setPageSize] = useState(10)
+ const {
+ data: { data, total },
+ loading,
+ run: runQueryUserList,
+ } = useRequest(queryUserList, {
+ initialData: {
+ data: [],
+ total: 0,
+ },
+ manual: true,
+ })
+
+ useEffect(() => {
+ runQueryUserList({
+ page: current,
+ pageSize,
+ })
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [current, pageSize])
+
+ const pagination = {
+ current,
+ pageSize,
+ total,
+ showTotal: (total) => `Total ${total} Items`,
+ }
+
+ return (
+
+
record.id}
+ pagination={pagination}
+ onChange={(page) => {
+ setCurrent(page.current)
+ setPageSize(page.pageSize)
+ }}
+ />
+
+ )
+}
+
+export default UserPage
diff --git a/src/services/index.ts b/src/services/index.ts
index 3709327..56fa58c 100644
--- a/src/services/index.ts
+++ b/src/services/index.ts
@@ -17,7 +17,6 @@ for (const key in APIs) {
export const {
logoutUser,
queryUser,
- queryUserList,
updateUser,
createUser,
removeUser,
@@ -42,3 +41,30 @@ export interface ILoginUserParams {
}
export const loginUser = createService(user.loginUser)
+
+export interface IUserItem {
+ address: string
+ age: number
+ avatar: string
+ createTime: string
+ email: string
+ id: string
+ isMale: boolean
+ name: string
+ nickName: string
+ phone: string
+}
+export interface IUserListReault {
+ data: IUserItem[]
+ total: number
+}
+
+export interface IQueryUserListParams {
+ page?: number
+ pageSize?: number
+}
+
+export const queryUserList = createService<
+ IUserListReault,
+ IQueryUserListParams
+>(user.queryUserList)