From 06650f438f09a131f678d6af849f1b414c1ee6d7 Mon Sep 17 00:00:00 2001 From: liujiangyong Date: Wed, 17 May 2023 09:38:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=80=E8=A1=A8=E6=A0=BCPagination?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/layout/containers/layout/index.less | 24 +++++++++---------- .../issueHandle/containers/patrolRecord.js | 1 + .../sections/organization/containers/user.js | 1 + .../patrolManage/containers/checkItems.js | 2 +- .../patrolManage/containers/patrolPlan.js | 2 +- .../patrolManage/containers/patrolRecord.js | 1 + .../patrolManage/containers/patrolReport.js | 2 +- .../patrolManage/containers/patrolTemplate.js | 2 +- 8 files changed, 19 insertions(+), 16 deletions(-) diff --git a/web/client/src/layout/containers/layout/index.less b/web/client/src/layout/containers/layout/index.less index ce990b9..5cfe74f 100644 --- a/web/client/src/layout/containers/layout/index.less +++ b/web/client/src/layout/containers/layout/index.less @@ -16,15 +16,15 @@ background: #FAFCFF; } -// .global-pagination { -// .ant-pagination-item { -// border-color: #fff; -// } -// .ant-pagination-item-active { -// border-color: #EAF2FF; -// background: #EAF2FF; -// } -// .ant-pagination-item-link { -// border-color: #fff !important; -// } -// } \ No newline at end of file +.global-pagination { + .ant-pagination-item { + border-color: #fff; + } + .ant-pagination-item-active { + border-color: #EAF2FF; + background: #EAF2FF; + } + .ant-pagination-item-link { + border-color: #fff !important; + } +} \ No newline at end of file diff --git a/web/client/src/sections/issueHandle/containers/patrolRecord.js b/web/client/src/sections/issueHandle/containers/patrolRecord.js index 70023c8..c8d6779 100644 --- a/web/client/src/sections/issueHandle/containers/patrolRecord.js +++ b/web/client/src/sections/issueHandle/containers/patrolRecord.js @@ -228,6 +228,7 @@ const PatrolRecord = (props) => { pagination={{ showSizeChanger: true, pageSizeOptions: [10, 20, 50], + className: 'global-pagination', }} rowClassName={(record, index) => { let className = 'global-light-row'; diff --git a/web/client/src/sections/organization/containers/user.js b/web/client/src/sections/organization/containers/user.js index fc1c24a..6fa310b 100644 --- a/web/client/src/sections/organization/containers/user.js +++ b/web/client/src/sections/organization/containers/user.js @@ -307,6 +307,7 @@ const UserManage = (props) => { if (index % 2 === 1) className = 'global-dark-row'; return className; }} + pagination={{ size: 'default', className: 'global-pagination' }} /> { diff --git a/web/client/src/sections/patrolManage/containers/checkItems.js b/web/client/src/sections/patrolManage/containers/checkItems.js index 8703077..9871ef7 100644 --- a/web/client/src/sections/patrolManage/containers/checkItems.js +++ b/web/client/src/sections/patrolManage/containers/checkItems.js @@ -100,7 +100,7 @@ function CheckItems(props) { options={false} dataSource={dataSource || []} rowKey='id' - pagination={{ pageSize: 10 }} + pagination={{ pageSize: 10, size: 'default', className: 'global-pagination' }} request={async (params = {}) => { const res = await dispatch(getCheckItems({ limit: params.pageSize, diff --git a/web/client/src/sections/patrolManage/containers/patrolPlan.js b/web/client/src/sections/patrolManage/containers/patrolPlan.js index 3a990e4..68d68c6 100644 --- a/web/client/src/sections/patrolManage/containers/patrolPlan.js +++ b/web/client/src/sections/patrolManage/containers/patrolPlan.js @@ -131,7 +131,7 @@ function PatrolPlan(props) { options={false} dataSource={dataSource || []} rowKey='id' - pagination={{ pageSize: 10 }} + pagination={{ pageSize: 10, size: 'default', className: 'global-pagination' }} search={{ defaultCollapsed: false, labelWidth: 'auto', diff --git a/web/client/src/sections/patrolManage/containers/patrolRecord.js b/web/client/src/sections/patrolManage/containers/patrolRecord.js index cb63f06..e1fd554 100644 --- a/web/client/src/sections/patrolManage/containers/patrolRecord.js +++ b/web/client/src/sections/patrolManage/containers/patrolRecord.js @@ -173,6 +173,7 @@ const PatrolRecord = (props) => { columns={columns} dataSource={tableList} pagination={{ + className: 'global-pagination', current: query.page + 1, total: limits, showSizeChanger: true, diff --git a/web/client/src/sections/patrolManage/containers/patrolReport.js b/web/client/src/sections/patrolManage/containers/patrolReport.js index 573de2a..01e6d35 100644 --- a/web/client/src/sections/patrolManage/containers/patrolReport.js +++ b/web/client/src/sections/patrolManage/containers/patrolReport.js @@ -88,7 +88,7 @@ function patrolReport(props) { options={false} dataSource={dataSource || []} rowKey='id' - pagination={{ pageSize: 10 }} + pagination={{ pageSize: 10, size: 'default', className: 'global-pagination' }} request={async (params = {}) => { const res = await dispatch(getPatrolReport({ limit: params?.pageSize, diff --git a/web/client/src/sections/patrolManage/containers/patrolTemplate.js b/web/client/src/sections/patrolManage/containers/patrolTemplate.js index 1e1336e..22b45a4 100644 --- a/web/client/src/sections/patrolManage/containers/patrolTemplate.js +++ b/web/client/src/sections/patrolManage/containers/patrolTemplate.js @@ -83,7 +83,7 @@ function PatrolTemplate(props) { options={false} dataSource={dataSource || []} rowKey='id' - pagination={{ pageSize: 10 }} + pagination={{ pageSize: 10, size: 'default', className: 'global-pagination' }} search={{ defaultCollapsed: false, optionRender: (searchConfig, formProps, dom) => [