Skip to content

Commit 96e0ce9

Browse files
committed
Table 组件:1)增加 tableMethods 属性,提升代码的可阅读性;2)Table 和 Pagination 组件的逻辑统一
1 parent 714dd66 commit 96e0ce9

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

src/components/Pagination/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
class="float-right mt-15px mb-15px"
66
:background="true"
77
layout="total, sizes, prev, pager, next, jumper"
8-
:page-sizes="[10, 20, 30, 50]"
8+
:page-sizes="[10, 20, 30, 50, 100]"
99
v-model:current-page="currentPage"
1010
v-model:page-size="pageSize"
1111
:pager-count="pagerCount"

src/components/Table/src/Table.vue

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,12 @@ export default defineComponent({
104104
})
105105
106106
const pagination = computed(() => {
107+
// update by 芋艿:保持和 Pagination 组件的逻辑一致
107108
return Object.assign(
108109
{
109110
small: false,
110111
background: true,
111-
pagerCount: 5,
112+
pagerCount: document.body.clientWidth < 992 ? 5 : 7,
112113
layout: 'total, sizes, prev, pager, next, jumper',
113114
pageSizes: [10, 20, 30, 50, 100],
114115
disabled: false,
@@ -283,10 +284,11 @@ export default defineComponent({
283284
}}
284285
</ElTable>
285286
{unref(getProps).pagination ? (
287+
// update by 芋艿:保持和 Pagination 组件一致
286288
<ElPagination
287289
v-model:pageSize={pageSizeRef.value}
288290
v-model:currentPage={currentPageRef.value}
289-
class="mt-10px"
291+
class="float-right mt-15px mb-15px"
290292
{...unref(pagination)}
291293
></ElPagination>
292294
) : undefined}

src/hooks/web/useTable.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,8 @@ export const useTable = <T = any>(config?: UseTableConfig<T>) => {
218218
register,
219219
elTableRef,
220220
tableObject,
221-
methods
221+
methods,
222+
// add by 芋艿:返回 tableMethods 属性,和 tableObject 更统一
223+
tableMethods: methods
222224
}
223225
}

0 commit comments

Comments
 (0)