未验证 提交 d6f65d47 编写于 作者: L Lowell 提交者: GitHub

fix(Table): 解决设置了分页的情况下,调整表格分页条数后,如果翻页,分页条数会重置的问题。 (#1270)

上级 052eff91
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
- 修复`inset`属性不起作用的问题 - 修复`inset`属性不起作用的问题
- 修复`useTable``BasicTable`实例的`reload`方法`await`表现不一致的问题 - 修复`useTable``BasicTable`实例的`reload`方法`await`表现不一致的问题
- 修复`clickToRowSelect`会无视行选择框 disabled 状态的问题 - 修复`clickToRowSelect`会无视行选择框 disabled 状态的问题
- 修复`BasicTable`在某些情况下,分页会被重置的问题
- **BasicModal** - **BasicModal**
- 修复点击遮罩、按下`Esc`键都不能关闭`Modal`的问题 - 修复点击遮罩、按下`Esc`键都不能关闭`Modal`的问题
- 修复点击关闭按钮、最大化按钮旁边的空白区域也会导致`Modal`关闭的问题 - 修复点击关闭按钮、最大化按钮旁边的空白区域也会导致`Modal`关闭的问题
......
...@@ -12,7 +12,7 @@ function getRandomPics(count = 10): string[] { ...@@ -12,7 +12,7 @@ function getRandomPics(count = 10): string[] {
const demoList = (() => { const demoList = (() => {
const result: any[] = []; const result: any[] = [];
for (let index = 0; index < 60; index++) { for (let index = 0; index < 200; index++) {
result.push({ result.push({
id: `${index}`, id: `${index}`,
beginTime: '@datetime', beginTime: '@datetime',
......
import type { PaginationProps } from '../types/pagination'; import type { PaginationProps } from '../types/pagination';
import type { BasicTableProps } from '../types/table'; import type { BasicTableProps } from '../types/table';
import { computed, unref, ref, ComputedRef, watchEffect } from 'vue'; import { computed, unref, ref, ComputedRef, watch } from 'vue';
import { LeftOutlined, RightOutlined } from '@ant-design/icons-vue'; import { LeftOutlined, RightOutlined } from '@ant-design/icons-vue';
import { isBoolean } from '/@/utils/is'; import { isBoolean } from '/@/utils/is';
import { PAGE_SIZE, PAGE_SIZE_OPTIONS } from '../const'; import { PAGE_SIZE, PAGE_SIZE_OPTIONS } from '../const';
...@@ -27,15 +27,17 @@ export function usePagination(refProps: ComputedRef<BasicTableProps>) { ...@@ -27,15 +27,17 @@ export function usePagination(refProps: ComputedRef<BasicTableProps>) {
const configRef = ref<PaginationProps>({}); const configRef = ref<PaginationProps>({});
const show = ref(true); const show = ref(true);
watchEffect(() => { watch(
const { pagination } = unref(refProps); () => unref(refProps).pagination,
if (!isBoolean(pagination) && pagination) { (pagination) => {
configRef.value = { if (!isBoolean(pagination) && pagination) {
...unref(configRef), configRef.value = {
...(pagination ?? {}), ...unref(configRef),
}; ...(pagination ?? {}),
} };
}); }
},
);
const getPaginationInfo = computed((): PaginationProps | boolean => { const getPaginationInfo = computed((): PaginationProps | boolean => {
const { pagination } = unref(refProps); const { pagination } = unref(refProps);
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
title: '远程加载示例', title: '远程加载示例',
api: demoListApi, api: demoListApi,
columns: getBasicColumns(), columns: getBasicColumns(),
pagination: { pageSize: 10 },
}); });
function handleReloadCurrent() { function handleReloadCurrent() {
reload(); reload();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册