diff --git a/src/components/common-table/index.vue b/src/components/common-table/index.vue index 7882cc4..396af75 100644 --- a/src/components/common-table/index.vue +++ b/src/components/common-table/index.vue @@ -60,14 +60,17 @@ const props = defineProps({ type: Object, default: null }, - pageInfo: { + page: { type: Object, default: null }, pageAttrs: { type: Object, default () { - return {} + return { + layout: 'total, sizes, prev, pager, next', + pageSizes: [10, 20, 50] + } } } }) @@ -89,6 +92,9 @@ const calcColumns = computed(() => { } return _columns }) + +defineEmits(['pageSizeChange', 'currentPageChange']) + - + diff --git a/src/config.js b/src/config.js index 6e2ad4d..750a82b 100644 --- a/src/config.js +++ b/src/config.js @@ -3,13 +3,16 @@ * @type {number} */ export const PAGE_SIZE = 10 + /** - * 分页数量选项 - * @type {number[]} + * 默认分页数据 + * + * @param pageSize + * @return {{pageIndex: number, pageSize: number, totalCount: number, pageNumber:number}} */ -export const PAGE_SIZE_LIST = [10, 20, 50] -/** - * 默认分页跳转 - * @type {string} - */ -export const PAGE_LAYOUT = 'total, prev, pager, next' +export const useDefaultPage = (pageSize = PAGE_SIZE) => { + return { + pageSize, + pageIndex: 1 + } +} diff --git a/src/services/user/UserService.js b/src/services/user/UserService.js new file mode 100644 index 0000000..58e10ed --- /dev/null +++ b/src/services/user/UserService.js @@ -0,0 +1,20 @@ +/** + * @typedef {Object} UserDto + * @property {number} id + * @property {string} nameCn + * @property {string} nameEn + * @property {string} address + * @property {string} gender + * @property {Date} birthday + */ +import { $httpPost } from '@/vendors/axios' + +/** + * 加载用户数据 + * @return {{success:boolean, message:string,userList: [UserDto]}} + */ +export const loadUsersResult = async config => { + const usersResult = await $httpPost('/api/users', config) + console.info('==================', usersResult) + return usersResult +} diff --git a/src/stores/LoginConfigStore.js b/src/stores/LoginConfigStore.js index 4862f2f..f3471ce 100644 --- a/src/stores/LoginConfigStore.js +++ b/src/stores/LoginConfigStore.js @@ -48,4 +48,6 @@ export const useLoginConfigStore = defineStore('loginConfig', () => { return loginResult } } +}, { + persist: true }) diff --git a/src/views/tools/Tables.vue b/src/views/tools/Tables.vue index 6c298aa..6c97ff6 100644 --- a/src/views/tools/Tables.vue +++ b/src/views/tools/Tables.vue @@ -1,42 +1,33 @@