diff --git a/admin-frontend-vue/src/api/users-dto.ts b/admin-frontend-vue/src/api/users-dto.ts index 827bdafc..8e20a051 100644 --- a/admin-frontend-vue/src/api/users-dto.ts +++ b/admin-frontend-vue/src/api/users-dto.ts @@ -61,6 +61,7 @@ export function normalizeUserPageParams(raw: Partial): UserListP keyword, createdById: typeof raw.createdById === 'number' ? raw.createdById : null, adminId: typeof raw.adminId === 'number' ? raw.adminId : null, + role: typeof raw.role === 'string' ? raw.role.trim() || undefined : undefined, } } diff --git a/admin-frontend-vue/src/components/OldPagination.vue b/admin-frontend-vue/src/components/OldPagination.vue new file mode 100644 index 00000000..56ef68d0 --- /dev/null +++ b/admin-frontend-vue/src/components/OldPagination.vue @@ -0,0 +1,121 @@ + + + + + diff --git a/admin-frontend-vue/src/pages/account/UserMenuAuthTree.vue b/admin-frontend-vue/src/pages/account/UserMenuAuthTree.vue index 7865a8b9..7f6200e0 100644 --- a/admin-frontend-vue/src/pages/account/UserMenuAuthTree.vue +++ b/admin-frontend-vue/src/pages/account/UserMenuAuthTree.vue @@ -59,31 +59,33 @@ watch(