diff --git a/frontend/src/assets/style/arco-reset.less b/frontend/src/assets/style/arco-reset.less index 24be577520..1410e30e56 100644 --- a/frontend/src/assets/style/arco-reset.less +++ b/frontend/src/assets/style/arco-reset.less @@ -491,6 +491,36 @@ } /** 分页 **/ +.arco-pagination { + display: flex; + justify-content: flex-end; + align-items: center; + gap: 16px; +} +.arco-pagination-list { + display: flex; + flex-direction: row; +} +.arco-pagination-jumper { + padding: 2px 8px; + background: var(--color-text-n9); +} +.arco-pagination-jumper-input { + padding: 3px 8px; + width: 57px; + height: 28px; + border: 1px solid var(--color-text-input-border); + border-radius: 3px; + box-sizing: border-box; +} +.arco-pagination-jumper-total-page { + margin-right: 0; + margin-left: 8px; + color: var(--color-text-2); +} +.arco-pagination-simple .arco-pagination-jumper .arco-pagination-jumper-input { + width: 57px; +} .arco-pagination-total { color: var(--color-text-2) !important; } @@ -504,6 +534,20 @@ margin-left: 14px !important; } .arco-pagination-size-small .arco-pagination-item { + display: flex; + justify-content: center; + align-items: center; + padding: 5px 0; + width: 32px; + height: 32px; + box-sizing: border-box; +} +.arco-pagination-item-ellipsis:hover { + width: 32px; + height: 32px; +} +.arco-pagination-size-small + .arco-pagination-item:not(:last-child):not(:first-child):not(.arco-pagination-item-ellipsis) { border: 1px solid var(--color-text-input-border); } .arco-pagination-item-active { diff --git a/frontend/src/components/pure/ms-pagination/locale/en-US.ts b/frontend/src/components/pure/ms-pagination/locale/en-US.ts index af672074b9..7f8d47a386 100644 --- a/frontend/src/components/pure/ms-pagination/locale/en-US.ts +++ b/frontend/src/components/pure/ms-pagination/locale/en-US.ts @@ -1,10 +1,10 @@ export default { msPagination: { total: 'A total of {total} items', - current: 'Current {current}', + current: 'Current page {current}', + countPerPage: 'items/page', pageSize: 'Page size', goto: 'Goto', - page: 'Page', - countPerPage: ' / Page', + page: '/{page} pages', }, }; diff --git a/frontend/src/components/pure/ms-pagination/locale/zh-CN.ts b/frontend/src/components/pure/ms-pagination/locale/zh-CN.ts index 9eba5eb25b..f775a2a8c0 100644 --- a/frontend/src/components/pure/ms-pagination/locale/zh-CN.ts +++ b/frontend/src/components/pure/ms-pagination/locale/zh-CN.ts @@ -4,7 +4,7 @@ export default { current: '当前页数 {current}', countPerPage: '条/页', pageSize: '每页条数', - goto: '前往', - page: '页', + goto: '跳至', + page: '/{page} 页', }, }; diff --git a/frontend/src/components/pure/ms-pagination/page-jumper.vue b/frontend/src/components/pure/ms-pagination/page-jumper.vue index e3c530752e..b3a0865795 100644 --- a/frontend/src/components/pure/ms-pagination/page-jumper.vue +++ b/frontend/src/components/pure/ms-pagination/page-jumper.vue @@ -1,6 +1,6 @@ - + {{ t('msPagination.goto') }} - - / - {{ pages }} - + {{ t('msPagination.page', { page: pages }) }} - - diff --git a/frontend/src/views/setting/system/usergroup/index.vue b/frontend/src/views/setting/system/usergroup/index.vue index 244fa729db..1bad2aaeac 100644 --- a/frontend/src/views/setting/system/usergroup/index.vue +++ b/frontend/src/views/setting/system/usergroup/index.vue @@ -1,44 +1,47 @@ - - - - - - - - - - - {{ store.userGroupInfo.currentName }} - - - - - - - - {{ t('system.userGroup.auth') }} - {{ t('system.userGroup.user') }} - + + + + + + + - - - + + + {{ store.userGroupInfo.currentName }} + + + + + + + + {{ t('system.userGroup.auth') }} + {{ t('system.userGroup.user') }} + + + + + + + - +