diff --git a/console/packages/components/src/components/pagination/Pagination.vue b/console/packages/components/src/components/pagination/Pagination.vue index ce7b9c016f..293ea0912c 100644 --- a/console/packages/components/src/components/pagination/Pagination.vue +++ b/console/packages/components/src/components/pagination/Pagination.vue @@ -8,16 +8,20 @@ const props = withDefaults( size?: number; total?: number; sizeOptions?: number[]; + showTotal?: boolean; pageLabel?: string; sizeLabel?: string; + totalLabel?: string; }>(), { page: 1, size: 10, total: 0, sizeOptions: () => [10], + showTotal: true, pageLabel: "页", sizeLabel: "条 / 页", + totalLabel: undefined, } ); @@ -33,6 +37,13 @@ const hasNext = computed(() => props.page < totalPages.value); const hasPrevious = computed(() => props.page > 1); +const totalLabelText = computed(() => { + if (props.totalLabel) { + return props.totalLabel; + } + return `共 ${props.total} 项数据`; +}); + const onPageChange = (event: Event) => { const target = event.target as HTMLSelectElement; const page = Number(target.value); @@ -67,64 +78,45 @@ const next = () => { }; + + diff --git a/console/src/locales/en.yaml b/console/src/locales/en.yaml index 728da7ee2c..f48c1f63c2 100644 --- a/console/src/locales/en.yaml +++ b/console/src/locales/en.yaml @@ -1139,6 +1139,7 @@ core: pagination: page_label: page size_label: items per page + total_label: Total {total} items social_auth_providers: title: Third-party login composables: diff --git a/console/src/locales/zh-CN.yaml b/console/src/locales/zh-CN.yaml index ac3d1c4e91..1f6e265437 100644 --- a/console/src/locales/zh-CN.yaml +++ b/console/src/locales/zh-CN.yaml @@ -1139,6 +1139,7 @@ core: pagination: page_label: 页 size_label: 条 / 页 + total_label: 共 {total} 项数据 social_auth_providers: title: 三方登录 composables: diff --git a/console/src/locales/zh-TW.yaml b/console/src/locales/zh-TW.yaml index 1f991360a4..b3e2812a2d 100644 --- a/console/src/locales/zh-TW.yaml +++ b/console/src/locales/zh-TW.yaml @@ -1139,6 +1139,7 @@ core: pagination: page_label: 頁 size_label: 條 / 頁 + total_label: 共 {total} 項資料 social_auth_providers: title: 三方登入 composables: diff --git a/console/src/modules/contents/attachments/AttachmentList.vue b/console/src/modules/contents/attachments/AttachmentList.vue index 7d09b1e1a1..333dc42bcc 100644 --- a/console/src/modules/contents/attachments/AttachmentList.vue +++ b/console/src/modules/contents/attachments/AttachmentList.vue @@ -669,16 +669,17 @@ onMounted(() => { diff --git a/console/src/modules/contents/attachments/components/selector-providers/CoreSelectorProvider.vue b/console/src/modules/contents/attachments/components/selector-providers/CoreSelectorProvider.vue index f5291e72b5..28dd43c19a 100644 --- a/console/src/modules/contents/attachments/components/selector-providers/CoreSelectorProvider.vue +++ b/console/src/modules/contents/attachments/components/selector-providers/CoreSelectorProvider.vue @@ -196,12 +196,15 @@ const isDisabled = (attachment: Attachment) => { -
+
diff --git a/console/src/modules/contents/comments/CommentList.vue b/console/src/modules/contents/comments/CommentList.vue index 5a174292fd..3280af7189 100644 --- a/console/src/modules/contents/comments/CommentList.vue +++ b/console/src/modules/contents/comments/CommentList.vue @@ -388,16 +388,17 @@ const handleApproveInBatch = async () => {
diff --git a/console/src/modules/contents/pages/DeletedSinglePageList.vue b/console/src/modules/contents/pages/DeletedSinglePageList.vue index d59d03a6b1..dc08f2c596 100644 --- a/console/src/modules/contents/pages/DeletedSinglePageList.vue +++ b/console/src/modules/contents/pages/DeletedSinglePageList.vue @@ -409,16 +409,17 @@ watch(
diff --git a/console/src/modules/contents/pages/SinglePageList.vue b/console/src/modules/contents/pages/SinglePageList.vue index 8790bdf26b..4b12228d02 100644 --- a/console/src/modules/contents/pages/SinglePageList.vue +++ b/console/src/modules/contents/pages/SinglePageList.vue @@ -472,16 +472,17 @@ watch(selectedPageNames, (newValue) => { diff --git a/console/src/modules/contents/posts/DeletedPostList.vue b/console/src/modules/contents/posts/DeletedPostList.vue index cc3d25ea12..70c002bac6 100644 --- a/console/src/modules/contents/posts/DeletedPostList.vue +++ b/console/src/modules/contents/posts/DeletedPostList.vue @@ -422,16 +422,17 @@ watch( diff --git a/console/src/modules/contents/posts/PostList.vue b/console/src/modules/contents/posts/PostList.vue index 29ef958e2b..d55989278f 100644 --- a/console/src/modules/contents/posts/PostList.vue +++ b/console/src/modules/contents/posts/PostList.vue @@ -483,16 +483,17 @@ watch(selectedPostNames, (newValue) => { diff --git a/console/src/modules/system/plugins/PluginList.vue b/console/src/modules/system/plugins/PluginList.vue index dcbcd8a701..2af73e914c 100644 --- a/console/src/modules/system/plugins/PluginList.vue +++ b/console/src/modules/system/plugins/PluginList.vue @@ -243,16 +243,17 @@ onMounted(() => { diff --git a/console/src/modules/system/users/UserList.vue b/console/src/modules/system/users/UserList.vue index ca5e62ce6e..2c385fb9c4 100644 --- a/console/src/modules/system/users/UserList.vue +++ b/console/src/modules/system/users/UserList.vue @@ -501,16 +501,17 @@ onMounted(() => {